From 3245c0a139bd0b6df24bd805b10d23936d6808b9 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 8 Aug 2018 11:21:34 +0800 Subject: [PATCH 01/27] minor update to python generator usage (#762) --- .../org/openapitools/codegen/languages/PythonClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 0789d6260d57..eed683f061c4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -165,7 +165,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig supportedLibraries.put("urllib3", "urllib3-based client"); supportedLibraries.put("asyncio", "Asyncio-based client (python 3.5+)"); supportedLibraries.put("tornado", "tornado-based client"); - CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); + CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use: asyncio, tornado, urllib3"); libraryOption.setDefault(DEFAULT_LIBRARY); cliOptions.add(libraryOption); setLibrary(DEFAULT_LIBRARY); From 06263d76064040118e5dffef67660901890aea7b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 8 Aug 2018 11:50:33 +0800 Subject: [PATCH 02/27] [JAX-RS][Spec] Add samples to CircleCI (#759) * test jaxrs spec server petstore in circleci * remove duplicated entries in pom * trigger build failure * Revert "trigger build failure" This reverts commit 35ac96ed4abc54bd605cd5a95bc9280dc032b147. --- CI/pom.xml.circleci | 40 ++++++++++++++++++++++++++++++++++++++- CI/pom.xml.circleci.java7 | 40 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci index dc0b392e186f..b5dd34e4c9c3 100644 --- a/CI/pom.xml.circleci +++ b/CI/pom.xml.circleci @@ -607,6 +607,42 @@ samples/server/petstore/jaxrs/jersey1 + + jaxrs-spec + + + env + java + + + + samples/server/petstore/jaxrs-spec + + + + jaxrs-spec-interface + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface + + + + jaxrs-spec-interface-response + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface-response + + typescript-fetch-client-tests-default @@ -862,6 +898,9 @@ samples/client/petstore/kotlin-threetenbp/ samples/client/petstore/kotlin-string/ + samples/server/petstore/jaxrs-spec + samples/server/petstore/jaxrs-spec-interface + samples/server/petstore/jaxrs-spec-interface-response samples/server/petstore/java-vertx/rx samples/server/petstore/java-vertx/async samples/server/petstore/java-inflector @@ -901,7 +940,6 @@ samples/server/petstore/jaxrs-cxf-cdi samples/server/petstore/jaxrs-cxf-non-spring-app samples/server/petstore/java-msf4j - samples/server/petstore/jaxrs-spec-interface samples/server/petstore/scala-lagom-server samples/server/petstore/scalatra samples/server/petstore/finch diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7 index c17a50e36253..ef34a78f420d 100644 --- a/CI/pom.xml.circleci.java7 +++ b/CI/pom.xml.circleci.java7 @@ -607,6 +607,42 @@ samples/server/petstore/jaxrs/jersey1 + + jaxrs-spec + + + env + java + + + + samples/server/petstore/jaxrs-spec + + + + jaxrs-spec-interface + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface + + + + jaxrs-spec-interface-response + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface-response + + typescript-fetch-client-tests-default @@ -853,6 +889,9 @@ samples/client/petstore/java/google-api-client samples/client/petstore/kotlin/ + samples/server/petstore/jaxrs-spec + samples/server/petstore/jaxrs-spec-interface + samples/server/petstore/jaxrs-spec-interface-response samples/server/petstore/java-vertx/rx samples/server/petstore/java-vertx/async samples/server/petstore/java-inflector @@ -876,7 +915,6 @@ samples/server/petstore/jaxrs-cxf-cdi samples/server/petstore/jaxrs-cxf-non-spring-app samples/server/petstore/java-msf4j - samples/server/petstore/jaxrs-spec-interface From d0ccac566397f23757dedb4a8f99c013221fc29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Mart=C3=ADnez?= Date: Wed, 8 Aug 2018 19:06:42 +0200 Subject: [PATCH 03/27] Fixed the generation of model properties whose data type is a composed (allOf) schema (#704) * #582 Fixed the generation of model properties whose data type is a composed (allOf) schema. Before this fix, the data type name of the generated property was that of the first model participating in the allOf clause. After this fix the property data type is again as expected: the one of the composed schema and not one of its parents. * Added unit test in order to have regression testing in the fix for the #582 issue (references to composed schemas should not get unaliased for them to get a proper data type name in the generation of model properties). * Run ./bin/utils/ensure-up-to-date to re-generate samples run in the CI. * Removed tabs from ModelUtilsTest.java --- .../codegen/utils/ModelUtils.java | 2 +- .../codegen/utils/ModelUtilsTest.java | 28 ++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 2bb6481c49cb..c5afa2dd8b18 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -648,7 +648,7 @@ public class ModelUtils { } else if (isStringSchema(ref) && (ref.getEnum() != null && !ref.getEnum().isEmpty())) { // top-level enum class return schema; - } else if (isMapSchema(ref) || isArraySchema(ref)) { // map/array def should be created as models + } else if (isMapSchema(ref) || isArraySchema(ref) || isComposedSchema(ref)) { // map/array def should be created as models return schema; } else { return unaliasSchema(allSchemas, allSchemas.get(ModelUtils.getSimpleRef(schema.get$ref()))); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java index ac9648e0243e..e09d27dbb950 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java @@ -19,10 +19,7 @@ package org.openapitools.codegen.utils; import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.IntegerSchema; -import io.swagger.v3.oas.models.media.ObjectSchema; -import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.media.StringSchema; +import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; @@ -32,7 +29,10 @@ import org.openapitools.codegen.TestUtils; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class ModelUtilsTest { @@ -173,4 +173,24 @@ public class ModelUtilsTest { Parameter result2 = ModelUtils.getReferencedParameter(openAPI, new Parameter().$ref("#/components/parameters/OtherParameter")); Assert.assertEquals(result2, otherParameter); } + + /** + * Issue https://github.com/OpenAPITools/openapi-generator/issues/582. + * Composed schemas should not get unaliased when generating model properties, in order to properly + * generate the property data type name. + */ + @Test + public void testComposedSchemasAreNotUnaliased() { + ComposedSchema composedSchema = new ComposedSchema().allOf(Arrays.asList( + new Schema<>().$ref("#/components/schemas/SomeSchema"), + new ObjectSchema() + )); + Schema refToComposedSchema = new Schema().$ref("#/components/schemas/SomeComposedSchema"); + + + Map allSchemas = new HashMap<>(); + allSchemas.put("SomeComposedSchema", composedSchema); + + Assert.assertEquals(refToComposedSchema, ModelUtils.unaliasSchema(allSchemas, refToComposedSchema)); + } } From 4060fcbb8bee149ddbe63470edfd8c13f85a7619 Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 9 Aug 2018 12:42:11 +1000 Subject: [PATCH 04/27] Correct URL for openapi-generator.cli.sh in README.md (#770) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09ceabc2ecce..0ca16c6f12ed 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ An example of setting this up (NOTE: Always evaluate scripts curled from externa ``` mkdir -p ~/bin/openapitools -curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator.cli.sh > ~/bin/openapitools/openapi-generator-cli +curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli chmod u+x ~/bin/openapitools/openapi-generator-cli export PATH=$PATH:~/bin/openapitools/ ``` From 9920c435cab3d861417446a86fa72725ae632c4a Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Thu, 9 Aug 2018 03:56:15 -0400 Subject: [PATCH 05/27] [gradle] Support nullable system property values (#764) The gradle plugin sets all System properties before generation, then reverts them back to their original state. System.getProperty/setProperty return null if the property was not previously set. The Kotlin map was defined with non-nullable key/value constraints, so setting something not commonly set (modelDocs: "false") would result in an runtime exception. This changes the map to support nullable values, and rather than setting a null System property at the end, it clears those which previously had no value. --- .../samples/local-spec/build.gradle | 3 +++ .../generator/gradle/plugin/tasks/GenerateTask.kt | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle index e9a5bb42e0ea..e5cde4680324 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle @@ -41,6 +41,9 @@ openApiGenerate { configOptions = [ dateLibrary: "java8" ] + systemProperties = [ + modelDocs: "false" + ] } task buildGoSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){ diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt index db901f021c76..7c6ecd099da6 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt @@ -323,7 +323,7 @@ open class GenerateTask : DefaultTask() { @get:Internal val configOptions = project.objects.property>() - private val originalEnvironmentVariables = mutableMapOf() + private val originalEnvironmentVariables = mutableMapOf() private fun Property.ifNotEmpty(block: Property.(T) -> Unit) { if (isPresent) { @@ -352,8 +352,9 @@ open class GenerateTask : DefaultTask() { try { if (systemProperties.isPresent) { systemProperties.get().forEach { (key, value) -> - originalEnvironmentVariables[key] = System.getProperty(key) - System.setProperty(key, value) + // System.setProperty returns the original value for a key, or null. + // Cache the original value or null…we will late put the properties back in their original state. + originalEnvironmentVariables[key] = System.setProperty(key, value) configurator.addSystemProperty(key, value) } } @@ -540,8 +541,12 @@ open class GenerateTask : DefaultTask() { throw GradleException("Code generation failed.", e) } } finally { - originalEnvironmentVariables.forEach { entry -> - System.setProperty(entry.key, entry.value) + // Reset all modified system properties back to their original state + originalEnvironmentVariables.forEach { + when { + it.value == null -> System.clearProperty(it.key) + else -> System.setProperty(it.key, it.value) + } } originalEnvironmentVariables.clear() } From a0984a9be8076048c936f67209efe1003bf3cc7e Mon Sep 17 00:00:00 2001 From: antihax Date: Thu, 9 Aug 2018 10:27:51 -0500 Subject: [PATCH 06/27] [Core] Resolve Inline Models (#736) * Add InlineModelResolver.java * fix inline schema for OAS2 body parameter * skip warning, fix MapSchema cast error --- .../codegen/DefaultGenerator.java | 4 +- .../codegen/InlineModelResolver.java | 533 +++++++++ .../codegen/InlineModelResolverTest.java | 1012 +++++++++++++++++ 3 files changed, 1547 insertions(+), 2 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 54455f49c897..6d4264f48c1e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -787,8 +787,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { configureOpenAPIInfo(); // resolve inline models - //InlineModelResolver inlineModelResolver = new InlineModelResolver(); - //inlineModelResolver.flatten(openAPI); + InlineModelResolver inlineModelResolver = new InlineModelResolver(); + inlineModelResolver.flatten(openAPI); List files = new ArrayList(); // models diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java new file mode 100644 index 000000000000..057939f680b4 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -0,0 +1,533 @@ +package org.openapitools.codegen; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.media.Schema; +import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.ObjectSchema; +import io.swagger.v3.oas.models.media.*; +import io.swagger.v3.oas.models.responses.ApiResponse; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.parameters.Parameter; +import io.swagger.v3.oas.models.parameters.RequestBody; +import io.swagger.v3.oas.models.Paths; +import io.swagger.v3.core.util.Json; +import org.openapitools.codegen.utils.ModelUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.swagger.v3.oas.models.media.Content; +import io.swagger.v3.oas.models.media.MediaType; +import java.util.ArrayList; +import io.swagger.v3.oas.models.media.XML; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class InlineModelResolver { + private OpenAPI openapi; + private boolean skipMatches; + static Logger LOGGER = LoggerFactory.getLogger(InlineModelResolver.class); + Map addedModels = new HashMap(); + Map generatedSignature = new HashMap(); + + public void flatten(OpenAPI openapi) { + this.openapi = openapi; + + if (openapi.getComponents() == null) { + return; // There's nothing here + } + + if (openapi.getComponents().getSchemas() == null) { + openapi.getComponents().setSchemas(new HashMap()); + } + // operations + Map paths = openapi.getPaths(); + Map models = openapi.getComponents().getSchemas(); + if (paths != null) { + for (String pathname : paths.keySet()) { + PathItem path = paths.get(pathname); + for (Operation operation : path.readOperations()) { + RequestBody requestBody = operation.getRequestBody(); + if (requestBody != null) { + Schema model = ModelUtils.getSchemaFromRequestBody(requestBody); + if (model instanceof ObjectSchema) { + Schema obj = (Schema) model; + if (obj.getType() == null || "object".equals(obj.getType())) { + if (obj.getProperties() != null && obj.getProperties().size() > 0) { + flattenProperties(obj.getProperties(), pathname); + // for model name, use "title" if defined, otherwise default to 'inline_object' + String modelName = resolveModelName(obj.getTitle(), "inline_object"); + addGenerated(modelName, model); + openapi.getComponents().addSchemas(modelName, model); + + // create request body + RequestBody rb = new RequestBody(); + Content content = new Content(); + MediaType mt = new MediaType(); + Schema schema = new Schema(); + schema.set$ref(modelName); + mt.setSchema(schema); + // TODO assume JSON, need to support other payload later + content.addMediaType("application/json", mt); + rb.setContent(content); + // add to openapi "components" + if (openapi.getComponents().getRequestBodies() == null) { + Map requestBodies = new HashMap(); + requestBodies.put(modelName, rb); + openapi.getComponents().setRequestBodies(requestBodies); + } else { + openapi.getComponents().getRequestBodies().put(modelName, rb); + } + + // update requestBody to use $ref instead of inline def + requestBody.set$ref(modelName); + + } + } + } else if (model instanceof ArraySchema) { + ArraySchema am = (ArraySchema) model; + Schema inner = am.getItems(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), pathname); + String modelName = resolveModelName(op.getTitle(), null); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + am.setItems(schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + am.setItems(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } + } + + List parameters = operation.getParameters(); + if (parameters != null) { + for (Parameter parameter : parameters) { + if (parameter.getSchema() != null) { + Schema model = parameter.getSchema(); + if (model instanceof ObjectSchema) { + Schema obj = (Schema) model; + if (obj.getType() == null || "object".equals(obj.getType())) { + if (obj.getProperties() != null && obj.getProperties().size() > 0) { + flattenProperties(obj.getProperties(), pathname); + String modelName = resolveModelName(obj.getTitle(), parameter.getName()); + + parameter.$ref(modelName); + addGenerated(modelName, model); + openapi.getComponents().addSchemas(modelName, model); + } + } + } else if (model instanceof ArraySchema) { + ArraySchema am = (ArraySchema) model; + Schema inner = am.getItems(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), pathname); + String modelName = resolveModelName(op.getTitle(), parameter.getName()); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + am.setItems(schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + am.setItems(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } + } + } + } + Map responses = operation.getResponses(); + if (responses != null) { + for (String key : responses.keySet()) { + ApiResponse response = responses.get(key); + if (ModelUtils.getSchemaFromResponse(response) != null) { + Schema property = ModelUtils.getSchemaFromResponse(response); + if (property instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) property; + if (op.getProperties() != null && op.getProperties().size() > 0) { + String modelName = resolveModelName(op.getTitle(), "inline_response_" + key); + Schema model = modelFromProperty(op, modelName); + String existing = matchGenerated(model); + Content content = response.getContent(); + for (MediaType mediaType : content.values()) { + if (existing != null) { + Schema schema = this.makeSchema(existing, property); + schema.setRequired(op.getRequired()); + mediaType.setSchema(schema); + } else { + Schema schema = this.makeSchema(modelName, property); + schema.setRequired(op.getRequired()); + mediaType.setSchema(schema); + addGenerated(modelName, model); + openapi.getComponents().addSchemas(modelName, model); + } + } + } + } else if (property instanceof ArraySchema) { + ArraySchema ap = (ArraySchema) property; + Schema inner = ap.getItems(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), pathname); + String modelName = resolveModelName(op.getTitle(), + "inline_response_" + key); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = this.makeSchema(existing, op); + schema.setRequired(op.getRequired()); + ap.setItems(schema); + } else { + Schema schema = this.makeSchema(modelName, op); + schema.setRequired(op.getRequired()); + ap.setItems(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } else if (property instanceof MapSchema) { + MapSchema mp = (MapSchema) property; + Schema innerProperty = (Schema) mp.getAdditionalProperties(); + if (innerProperty instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) innerProperty; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), pathname); + String modelName = resolveModelName(op.getTitle(), + "inline_response_" + key); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + mp.setAdditionalProperties(schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + mp.setAdditionalProperties(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } + } + } + } + } + } + } + // definitions + if (models != null) { + List modelNames = new ArrayList(models.keySet()); + for (String modelName : modelNames) { + Schema model = models.get(modelName); + if (model instanceof Schema) { + Schema m = (Schema) model; + Map properties = m.getProperties(); + flattenProperties(properties, modelName); + fixStringModel(m); + } else if (ModelUtils.isArraySchema(model)) { + ArraySchema m = (ArraySchema) model; + Schema inner = m.getItems(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + String innerModelName = resolveModelName(op.getTitle(), modelName + "_inner"); + Schema innerModel = modelFromProperty(op, innerModelName); + String existing = matchGenerated(innerModel); + if (existing == null) { + openapi.getComponents().addSchemas(innerModelName, innerModel); + addGenerated(innerModelName, innerModel); + Schema schema = new Schema().$ref(innerModelName); + schema.setRequired(op.getRequired()); + m.setItems(schema); + } else { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + m.setItems(schema); + } + } + } + } else if (ModelUtils.isComposedSchema(model)) { + ComposedSchema m = (ComposedSchema) model; + if (m.getAllOf() != null && !m.getAllOf().isEmpty()) { + Schema child = null; + for (Schema component : m.getAllOf()) { + if (component.get$ref() == null) { + child = component; + } + } + if (child != null) { + Map properties = child.getProperties(); + flattenProperties(properties, modelName); + } + } + } + } + } + } + + /** + * This function fix models that are string (mostly enum). Before this fix, the + * example would look something like that in the doc: "\"example from def\"" + * + * @param m Schema implementation + */ + private void fixStringModel(Schema m) { + if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) { + String example = m.getExample().toString(); + if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) { + m.setExample(example.substring(1, example.length() - 1)); + } + } + } + + private String resolveModelName(String title, String key) { + if (title == null) { + return uniqueName(key); + } else { + return uniqueName(title); + } + } + + public String matchGenerated(Schema model) { + if (this.skipMatches) { + return null; + } + String json = Json.pretty(model); + if (generatedSignature.containsKey(json)) { + return generatedSignature.get(json); + } + return null; + } + + public void addGenerated(String name, Schema model) { + generatedSignature.put(Json.pretty(model), name); + } + + public String uniqueName(String key) { + if (key == null) { + key = "NULL_UNIQUE_NAME"; + LOGGER.warn("null key found. Default to NULL_UNIQUE_NAME"); + } + int count = 0; + boolean done = false; + key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", ""); // FIXME: a parameter + // should not be + // assigned. Also declare + // the methods parameters + // as 'final'. + while (!done) { + String name = key; + if (count > 0) { + name = key + "_" + count; + } + if (openapi.getComponents().getSchemas() == null) { + return name; + } else if (!openapi.getComponents().getSchemas().containsKey(name)) { + return name; + } + count += 1; + } + return key; + } + + public void flattenProperties(Map properties, String path) { + if (properties == null) { + return; + } + Map propsToUpdate = new HashMap(); + Map modelsToAdd = new HashMap(); + for (String key : properties.keySet()) { + Schema property = properties.get(key); + if (property instanceof ObjectSchema && ((ObjectSchema) property).getProperties() != null + && ((ObjectSchema) property).getProperties().size() > 0) { + ObjectSchema op = (ObjectSchema) property; + String modelName = resolveModelName(op.getTitle(), path + "_" + key); + Schema model = modelFromProperty(op, modelName); + String existing = matchGenerated(model); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + propsToUpdate.put(key, schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + propsToUpdate.put(key, schema); + modelsToAdd.put(modelName, model); + addGenerated(modelName, model); + openapi.getComponents().addSchemas(modelName, model); + } + } else if (property instanceof ArraySchema) { + ArraySchema ap = (ArraySchema) property; + Schema inner = ap.getItems(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), path); + String modelName = resolveModelName(op.getTitle(), path + "_" + key); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + ap.setItems(schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + ap.setItems(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } + if (ModelUtils.isMapSchema(property)) { + Schema inner = (Schema) property.getAdditionalProperties(); + if (inner instanceof ObjectSchema) { + ObjectSchema op = (ObjectSchema) inner; + if (op.getProperties() != null && op.getProperties().size() > 0) { + flattenProperties(op.getProperties(), path); + String modelName = resolveModelName(op.getTitle(), path + "_" + key); + Schema innerModel = modelFromProperty(op, modelName); + String existing = matchGenerated(innerModel); + if (existing != null) { + Schema schema = new Schema().$ref(existing); + schema.setRequired(op.getRequired()); + property.setAdditionalProperties(schema); + } else { + Schema schema = new Schema().$ref(modelName); + schema.setRequired(op.getRequired()); + property.setAdditionalProperties(schema); + addGenerated(modelName, innerModel); + openapi.getComponents().addSchemas(modelName, innerModel); + } + } + } + } + } + if (propsToUpdate.size() > 0) { + for (String key : propsToUpdate.keySet()) { + properties.put(key, propsToUpdate.get(key)); + } + } + for (String key : modelsToAdd.keySet()) { + openapi.getComponents().addSchemas(key, modelsToAdd.get(key)); + this.addedModels.put(key, modelsToAdd.get(key)); + } + } + + @SuppressWarnings("static-method") + public Schema modelFromProperty(ArraySchema object, @SuppressWarnings("unused") String path) { + String description = object.getDescription(); + String example = null; + Object obj = object.getExample(); + + if (obj != null) { + example = obj.toString(); + } + Schema inner = object.getItems(); + if (inner instanceof ObjectSchema) { + ArraySchema model = new ArraySchema(); + model.setDescription(description); + model.setExample(example); + model.setItems(object.getItems()); + model.setName(object.getName()); + return model; + } + return null; + } + + public Schema modelFromProperty(ObjectSchema object, String path) { + String description = object.getDescription(); + String example = null; + Object obj = object.getExample(); + if (obj != null) { + example = obj.toString(); + } + XML xml = object.getXml(); + Map properties = object.getProperties(); + Schema model = new Schema(); + model.setDescription(description); + model.setExample(example); + model.setName(object.getName()); + model.setXml(xml); + if (properties != null) { + flattenProperties(properties, path); + model.setProperties(properties); + } + return model; + } + + @SuppressWarnings("static-method") + public Schema modelFromProperty(MapSchema object, @SuppressWarnings("unused") String path) { + String description = object.getDescription(); + String example = null; + Object obj = object.getExample(); + if (obj != null) { + example = obj.toString(); + } + ArraySchema model = new ArraySchema(); + model.setDescription(description); + model.setName(object.getName()); + model.setExample(example); + model.setItems((Schema) object.getAdditionalProperties()); + return model; + } + + /** + * Make a Schema + * + * @param ref new property name + * @param property Schema + * @return {@link Schema} A constructed OpenAPI property + */ + public Schema makeSchema(String ref, Schema property) { + Schema newProperty = new Schema().$ref(ref); + this.copyVendorExtensions(property, newProperty); + return newProperty; + } + + /** + * Copy vendor extensions from Model to another Model + * + * @param source source property + * @param target target property + */ + + public void copyVendorExtensions(Schema source, Schema target) { + Map vendorExtensions = source.getExtensions(); + for (String extName : vendorExtensions.keySet()) { + target.addExtension(extName, vendorExtensions.get(extName)); + } + } + + public boolean isSkipMatches() { + return skipMatches; + } + + public void setSkipMatches(boolean skipMatches) { + this.skipMatches = skipMatches; + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java new file mode 100644 index 000000000000..8ec2ee8ef1dd --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -0,0 +1,1012 @@ +package org.openapitools.codegen; + +import io.swagger.v3.oas.models.*; +import io.swagger.v3.oas.models.parameters.Parameter; +import io.swagger.v3.core.util.Json; +import org.apache.commons.lang3.StringUtils; +import org.testng.annotations.Test; + +import java.util.HashMap; +import java.util.Map; + +import static org.testng.AssertJUnit.*; +/* +@SuppressWarnings("static-method") +public class InlineModelResolverTest { + @Test + public void resolveInlineModelTestWithoutTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("address", new ObjectProperty() + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User"); + + assertNotNull(user); + assertTrue(user.getProperties().get("address") instanceof RefProperty); + + ModelImpl address = (ModelImpl)openapi.getDefinitions().get("User_address"); + assertNotNull(address); + assertNotNull(address.getProperties().get("city")); + assertNotNull(address.getProperties().get("street")); + } + + @Test + public void resolveInlineModelTestWithTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("address", new ObjectProperty() + .title("UserAddressTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User"); + + assertNotNull(user); + assertTrue(user.getProperties().get("address") instanceof RefProperty); + + ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle"); + assertNotNull(address); + assertNotNull(address.getProperties().get("city")); + assertNotNull(address.getProperties().get("street")); + } + + @Test + public void resolveInlineModel2EqualInnerModels() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("address", new ObjectProperty() + .title("UserAddressTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + openapi.addDefinition("AnotherUser", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("lastName", new StringProperty()) + .property("address", new ObjectProperty() + .title("UserAddressTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User"); + + assertNotNull(user); + assertTrue(user.getProperties().get("address") instanceof RefProperty); + + ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle"); + assertNotNull(address); + assertNotNull(address.getProperties().get("city")); + assertNotNull(address.getProperties().get("street")); + ModelImpl duplicateAddress = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle_0"); + assertNull(duplicateAddress); + } + + @Test + public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("address", new ObjectProperty() + .title("UserAddressTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + openapi.addDefinition("AnotherUser", new ModelImpl() + .name("AnotherUser") + .description("a common user") + .property("name", new StringProperty()) + .property("lastName", new StringProperty()) + .property("address", new ObjectProperty() + .title("UserAddressTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()) + .property("apartment", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User"); + + assertNotNull(user); + assertTrue(user.getProperties().get("address") instanceof RefProperty); + + ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle"); + assertNotNull(address); + assertNotNull(address.getProperties().get("city")); + assertNotNull(address.getProperties().get("street")); + ModelImpl duplicateAddress = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle_1"); + assertNotNull(duplicateAddress); + assertNotNull(duplicateAddress.getProperties().get("city")); + assertNotNull(duplicateAddress.getProperties().get("street")); + assertNotNull(duplicateAddress.getProperties().get("apartment")); + } + + + @Test + public void testInlineResponseModel() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/foo/bar", new Path() + .get(new Operation() + .response(200, new Response() + .description("it works!") + .schema(new ObjectProperty() + .property("name", new StringProperty()).vendorExtension("x-ext", "ext-prop"))))) + .path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(new ObjectProperty() + .property("name", new StringProperty()).vendorExtension("x-ext", "ext-prop"))))); + new InlineModelResolver().flatten(openapi); + + Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses(); + + Response response = responses.get("200"); + assertNotNull(response); + Property schema = response.getSchema(); + assertTrue(schema instanceof RefProperty); + assertEquals(1, schema.getVendorExtensions().size()); + assertEquals("ext-prop", schema.getVendorExtensions().get("x-ext")); + + ModelImpl model = (ModelImpl)openapi.getDefinitions().get("inline_response_200"); + assertTrue(model.getProperties().size() == 1); + assertNotNull(model.getProperties().get("name")); + assertTrue(model.getProperties().get("name") instanceof StringProperty); + } + + + @Test + public void testInlineResponseModelWithTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + String responseTitle = "GetBarResponse"; + openapi.path("/foo/bar", new Path() + .get(new Operation() + .response(200, new Response() + .description("it works!") + .schema(new ObjectProperty().title(responseTitle) + .property("name", new StringProperty()))))) + .path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(new ObjectProperty() + .property("name", new StringProperty()))))); + new InlineModelResolver().flatten(openapi); + + Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses(); + + Response response = responses.get("200"); + assertNotNull(response); + assertTrue(response.getSchema() instanceof RefProperty); + + ModelImpl model = (ModelImpl)openapi.getDefinitions().get(responseTitle); + assertTrue(model.getProperties().size() == 1); + assertNotNull(model.getProperties().get("name")); + assertTrue(model.getProperties().get("name") instanceof StringProperty); + } + + + @Test + public void resolveInlineArrayModelWithTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ArrayModel() + .items(new ObjectProperty() + .title("InnerUserTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + Model model = openapi.getDefinitions().get("User"); + assertTrue(model instanceof ArrayModel); + + Model user = openapi.getDefinitions().get("InnerUserTitle"); + assertNotNull(user); + assertEquals("description", user.getDescription()); + } + + @Test + public void resolveInlineArrayModelWithoutTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ArrayModel() + .items(new ObjectProperty() + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("street", new StringProperty()) + .property("city", new StringProperty()))); + + new InlineModelResolver().flatten(openapi); + + Model model = openapi.getDefinitions().get("User"); + assertTrue(model instanceof ArrayModel); + + Model user = openapi.getDefinitions().get("User_inner"); + assertNotNull(user); + assertEquals("description", user.getDescription()); + } + + + + + @Test + public void resolveInlineBodyParameter() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ModelImpl() + .property("address", new ObjectProperty() + .property("street", new StringProperty())) + .property("name", new StringProperty()))))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof RefModel); + + Model body = openapi.getDefinitions().get("body"); + assertTrue(body instanceof ModelImpl); + + ModelImpl impl = (ModelImpl) body; + assertNotNull(impl.getProperties().get("address")); + } + + @Test + public void resolveInlineBodyParameterWithRequired() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ModelImpl() + .property("address", new ObjectProperty() + .property("street", new StringProperty() + .required(true)) + .required(true)) + .property("name", new StringProperty()))))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof RefModel); + + Model body = openapi.getDefinitions().get("body"); + assertTrue(body instanceof ModelImpl); + + ModelImpl impl = (ModelImpl) body; + assertNotNull(impl.getProperties().get("address")); + + Property addressProperty = impl.getProperties().get("address"); + assertTrue(addressProperty instanceof RefProperty); + assertTrue(addressProperty.getRequired()); + + Model helloAddress = openapi.getDefinitions().get("hello_address"); + assertTrue(helloAddress instanceof ModelImpl); + + ModelImpl addressImpl = (ModelImpl) helloAddress; + assertNotNull(addressImpl); + + Property streetProperty = addressImpl.getProperties().get("street"); + assertTrue(streetProperty instanceof StringProperty); + assertTrue(streetProperty.getRequired()); + } + + @Test + public void resolveInlineBodyParameterWithTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + ModelImpl addressModelItem = new ModelImpl(); + String addressModelName = "DetailedAddress"; + addressModelItem.setTitle(addressModelName); + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(addressModelItem + .property("address", new ObjectProperty() + .property("street", new StringProperty())) + .property("name", new StringProperty()))))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof RefModel); + + Model body = openapi.getDefinitions().get(addressModelName); + assertTrue(body instanceof ModelImpl); + + ModelImpl impl = (ModelImpl) body; + assertNotNull(impl.getProperties().get("address")); + } + + @Test + public void notResolveNonModelBodyParameter() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ModelImpl() + .type("string") + .format("binary"))))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof ModelImpl); + ModelImpl m = (ModelImpl) bp.getSchema(); + assertEquals("string", m.getType()); + assertEquals("binary", m.getFormat()); + } + + @Test + public void resolveInlineArrayBodyParameter() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ArrayModel() + .items(new ObjectProperty() + .property("address", new ObjectProperty() + .property("street", new StringProperty()))))))); + + new InlineModelResolver().flatten(openapi); + + Parameter param = openapi.getPaths().get("/hello").getGet().getParameters().get(0); + assertTrue(param instanceof BodyParameter); + + BodyParameter bp = (BodyParameter) param; + Model schema = bp.getSchema(); + + assertTrue(schema instanceof ArrayModel); + + ArrayModel am = (ArrayModel) schema; + Property inner = am.getItems(); + assertTrue(inner instanceof RefProperty); + + RefProperty rp = (RefProperty) inner; + + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/body"); + assertEquals(rp.getSimpleRef(), "body"); + + Model inline = openapi.getDefinitions().get("body"); + assertNotNull(inline); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + RefProperty rpAddress = (RefProperty) impl.getProperties().get("address"); + assertNotNull(rpAddress); + assertEquals(rpAddress.getType(), "ref"); + assertEquals(rpAddress.get$ref(), "#/definitions/hello_address"); + assertEquals(rpAddress.getSimpleRef(), "hello_address"); + + Model inlineProp = openapi.getDefinitions().get("hello_address"); + assertNotNull(inlineProp); + assertTrue(inlineProp instanceof ModelImpl); + ModelImpl implProp = (ModelImpl) inlineProp; + assertNotNull(implProp.getProperties().get("street")); + assertTrue(implProp.getProperties().get("street") instanceof StringProperty); + } + + @Test + public void resolveInlineArrayResponse() throws Exception { + OpenAPI openapi = new OpenAPI(); + + ArrayProperty schema = new ArrayProperty() + .items(new ObjectProperty() + .property("name", new StringProperty()) + .vendorExtension("x-ext", "ext-items")) + .vendorExtension("x-ext", "ext-prop"); + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(schema)))); + + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + assertNotNull(response); + + assertNotNull(response.getSchema()); + Property responseProperty = response.getSchema(); + + // no need to flatten more + assertTrue(responseProperty instanceof ArrayProperty); + + ArrayProperty ap = (ArrayProperty) responseProperty; + assertEquals(1, ap.getVendorExtensions().size()); + assertEquals("ext-prop", ap.getVendorExtensions().get("x-ext")); + + Property p = ap.getItems(); + + assertNotNull(p); + + RefProperty rp = (RefProperty) p; + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/inline_response_200"); + assertEquals(rp.getSimpleRef(), "inline_response_200"); + assertEquals(1, rp.getVendorExtensions().size()); + assertEquals("ext-items", rp.getVendorExtensions().get("x-ext")); + + Model inline = openapi.getDefinitions().get("inline_response_200"); + assertNotNull(inline); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + assertNotNull(impl.getProperties().get("name")); + assertTrue(impl.getProperties().get("name") instanceof StringProperty); + } + + @Test + public void resolveInlineArrayResponseWithTitle() throws Exception { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(new ArrayProperty() + .items(new ObjectProperty() + .title("FooBar") + .property("name", new StringProperty())))))); + + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + assertNotNull(response); + + assertNotNull(response.getSchema()); + Property responseProperty = response.getSchema(); + + // no need to flatten more + assertTrue(responseProperty instanceof ArrayProperty); + + ArrayProperty ap = (ArrayProperty) responseProperty; + Property p = ap.getItems(); + + assertNotNull(p); + + RefProperty rp = (RefProperty) p; + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/"+ "FooBar"); + assertEquals(rp.getSimpleRef(), "FooBar"); + + Model inline = openapi.getDefinitions().get("FooBar"); + assertNotNull(inline); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + assertNotNull(impl.getProperties().get("name")); + assertTrue(impl.getProperties().get("name") instanceof StringProperty); + } + + @Test + public void testInlineMapResponse() throws Exception { + OpenAPI openapi = new OpenAPI(); + + MapProperty schema = new MapProperty(); + schema.setAdditionalProperties(new StringProperty()); + schema.setVendorExtension("x-ext", "ext-prop"); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(schema)))); + new InlineModelResolver().flatten(openapi); + Json.prettyPrint(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + + Property property = response.getSchema(); + assertTrue(property instanceof MapProperty); + assertTrue(openapi.getDefinitions().size() == 0); + assertEquals(1, property.getVendorExtensions().size()); + assertEquals("ext-prop", property.getVendorExtensions().get("x-ext")); + } + + @Test + public void testInlineMapResponseWithObjectProperty() throws Exception { + OpenAPI openapi = new OpenAPI(); + + MapProperty schema = new MapProperty(); + schema.setAdditionalProperties(new ObjectProperty() + .property("name", new StringProperty())); + schema.setVendorExtension("x-ext", "ext-prop"); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(schema)))); + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + Property property = response.getSchema(); + assertTrue(property instanceof MapProperty); + assertEquals(1, property.getVendorExtensions().size()); + assertEquals("ext-prop", property.getVendorExtensions().get("x-ext")); + assertTrue(openapi.getDefinitions().size() == 1); + + Model inline = openapi.getDefinitions().get("inline_response_200"); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + assertNotNull(impl.getProperties().get("name")); + assertTrue(impl.getProperties().get("name") instanceof StringProperty); + } + + @Test + public void testArrayResponse() { + OpenAPI openapi = new OpenAPI(); + + ArrayProperty schema = new ArrayProperty(); + schema.setItems(new ObjectProperty() + .property("name", new StringProperty())); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(schema)))); + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + assertTrue(response.getSchema() instanceof ArrayProperty); + + ArrayProperty am = (ArrayProperty) response.getSchema(); + Property items = am.getItems(); + assertTrue(items instanceof RefProperty); + RefProperty rp = (RefProperty) items; + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/inline_response_200"); + assertEquals(rp.getSimpleRef(), "inline_response_200"); + + Model inline = openapi.getDefinitions().get("inline_response_200"); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + assertNotNull(impl.getProperties().get("name")); + assertTrue(impl.getProperties().get("name") instanceof StringProperty); + } + + @Test + public void testBasicInput() { + OpenAPI openapi = new OpenAPI(); + + ModelImpl user = new ModelImpl() + .property("name", new StringProperty()); + + openapi.path("/foo/baz", new Path() + .post(new Operation() + .parameter(new BodyParameter() + .name("myBody") + .schema(new RefModel("User"))))); + + openapi.addDefinition("User", user); + + new InlineModelResolver().flatten(openapi); + + Json.prettyPrint(openapi); + } + + @Test + public void testArbitraryObjectBodyParam() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ModelImpl())))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof ModelImpl); + ModelImpl m = (ModelImpl) bp.getSchema(); + assertNull(m.getType()); + } + + @Test + public void testArbitraryObjectBodyParamInline() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ModelImpl() + .property("arbitrary", new ObjectProperty()))))); + + new InlineModelResolver().flatten(openapi); + + Operation operation = openapi.getPaths().get("/hello").getGet(); + BodyParameter bp = (BodyParameter)operation.getParameters().get(0); + assertTrue(bp.getSchema() instanceof RefModel); + + Model body = openapi.getDefinitions().get("body"); + assertTrue(body instanceof ModelImpl); + + ModelImpl impl = (ModelImpl) body; + Property p = impl.getProperties().get("arbitrary"); + assertNotNull(p); + assertTrue(p instanceof ObjectProperty); + } + + @Test + public void testArbitraryObjectBodyParamWithArray() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ArrayModel() + .items(new ObjectProperty()))))); + + new InlineModelResolver().flatten(openapi); + + Parameter param = openapi.getPaths().get("/hello").getGet().getParameters().get(0); + assertTrue(param instanceof BodyParameter); + + BodyParameter bp = (BodyParameter) param; + Model schema = bp.getSchema(); + + assertTrue(schema instanceof ArrayModel); + + ArrayModel am = (ArrayModel) schema; + Property inner = am.getItems(); + assertTrue(inner instanceof ObjectProperty); + + ObjectProperty op = (ObjectProperty) inner; + assertNotNull(op); + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectBodyParamArrayInline() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/hello", new Path() + .get(new Operation() + .parameter(new BodyParameter() + .name("body") + .schema(new ArrayModel() + .items(new ObjectProperty() + .property("arbitrary", new ObjectProperty())))))); + + new InlineModelResolver().flatten(openapi); + + Parameter param = openapi.getPaths().get("/hello").getGet().getParameters().get(0); + assertTrue(param instanceof BodyParameter); + + BodyParameter bp = (BodyParameter) param; + Model schema = bp.getSchema(); + + assertTrue(schema instanceof ArrayModel); + + ArrayModel am = (ArrayModel) schema; + Property inner = am.getItems(); + assertTrue(inner instanceof RefProperty); + + RefProperty rp = (RefProperty) inner; + + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/body"); + assertEquals(rp.getSimpleRef(), "body"); + + Model inline = openapi.getDefinitions().get("body"); + assertNotNull(inline); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + Property p = impl.getProperties().get("arbitrary"); + assertNotNull(p); + assertTrue(p instanceof ObjectProperty); + } + + @Test + public void testArbitraryObjectResponse() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/foo/bar", new Path() + .get(new Operation() + .response(200, new Response() + .description("it works!") + .schema(new ObjectProperty())))); + new InlineModelResolver().flatten(openapi); + + Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses(); + + Response response = responses.get("200"); + assertNotNull(response); + assertTrue(response.getSchema() instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) response.getSchema(); + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectResponseArray() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .description("it works!") + .schema(new ArrayProperty() + .items(new ObjectProperty()))))); + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + assertTrue(response.getSchema() instanceof ArrayProperty); + + ArrayProperty am = (ArrayProperty) response.getSchema(); + Property items = am.getItems(); + assertTrue(items instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) items; + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectResponseArrayInline() { + OpenAPI openapi = new OpenAPI(); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .vendorExtension("x-foo", "bar") + .description("it works!") + .schema(new ArrayProperty() + .items(new ObjectProperty() + .property("arbitrary", new ObjectProperty())))))); + + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + assertNotNull(response); + + assertNotNull(response.getSchema()); + Property responseProperty = response.getSchema(); + assertTrue(responseProperty instanceof ArrayProperty); + + ArrayProperty ap = (ArrayProperty) responseProperty; + Property p = ap.getItems(); + assertNotNull(p); + + RefProperty rp = (RefProperty) p; + assertEquals(rp.getType(), "ref"); + assertEquals(rp.get$ref(), "#/definitions/inline_response_200"); + assertEquals(rp.getSimpleRef(), "inline_response_200"); + + Model inline = openapi.getDefinitions().get("inline_response_200"); + assertNotNull(inline); + assertTrue(inline instanceof ModelImpl); + ModelImpl impl = (ModelImpl) inline; + Property inlineProp = impl.getProperties().get("arbitrary"); + assertNotNull(inlineProp); + assertTrue(inlineProp instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) inlineProp; + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectResponseMapInline() { + OpenAPI openapi = new OpenAPI(); + + MapProperty schema = new MapProperty(); + schema.setAdditionalProperties(new ObjectProperty()); + + openapi.path("/foo/baz", new Path() + .get(new Operation() + .response(200, new Response() + .description("it works!") + .schema(schema)))); + new InlineModelResolver().flatten(openapi); + + Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200"); + + Property property = response.getSchema(); + assertTrue(property instanceof MapProperty); + assertTrue(openapi.getDefinitions().size() == 0); + Property inlineProp = ((MapProperty) property).getAdditionalProperties(); + assertTrue(inlineProp instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) inlineProp; + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectModelInline() { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ModelImpl() + .name("user") + .description("a common user") + .property("name", new StringProperty()) + .property("arbitrary", new ObjectProperty() + .title("title") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name"))); + + new InlineModelResolver().flatten(openapi); + + ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User"); + assertNotNull(user); + Property inlineProp = user.getProperties().get("arbitrary"); + assertTrue(inlineProp instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) inlineProp; + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectModelWithArrayInlineWithoutTitle() { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ArrayModel() + .items(new ObjectProperty() + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("arbitrary", new ObjectProperty()))); + + new InlineModelResolver().flatten(openapi); + + Model model = openapi.getDefinitions().get("User"); + assertTrue(model instanceof ArrayModel); + ArrayModel am = (ArrayModel) model; + Property inner = am.getItems(); + assertTrue(inner instanceof RefProperty); + + ModelImpl userInner = (ModelImpl)openapi.getDefinitions().get("User_inner"); + assertNotNull(userInner); + Property inlineProp = userInner.getProperties().get("arbitrary"); + assertTrue(inlineProp instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) inlineProp; + assertNull(op.getProperties()); + } + + @Test + public void testArbitraryObjectModelWithArrayInlineWithTitle() { + OpenAPI openapi = new OpenAPI(); + + openapi.addDefinition("User", new ArrayModel() + .items(new ObjectProperty() + .title("InnerUserTitle") + ._default("default") + .access("access") + .readOnly(false) + .required(true) + .description("description") + .name("name") + .property("arbitrary", new ObjectProperty()))); + + new InlineModelResolver().flatten(openapi); + + Model model = openapi.getDefinitions().get("User"); + assertTrue(model instanceof ArrayModel); + ArrayModel am = (ArrayModel) model; + Property inner = am.getItems(); + assertTrue(inner instanceof RefProperty); + + ModelImpl userInner = (ModelImpl)openapi.getDefinitions().get("InnerUserTitle"); + assertNotNull(userInner); + Property inlineProp = userInner.getProperties().get("arbitrary"); + assertTrue(inlineProp instanceof ObjectProperty); + ObjectProperty op = (ObjectProperty) inlineProp; + assertNull(op.getProperties()); + } + + @Test + public void testEmptyExampleOnStrinngTypeModels() { + OpenAPI openapi = new OpenAPI(); + + RefProperty refProperty = new RefProperty(); + refProperty.set$ref("#/definitions/Test"); + + openapi.path("/hello", new Path() + .get(new Operation() + .response(200, new Response() + .schema(new ArrayProperty() + .items(refProperty))))); + + openapi.addDefinition("Test", new ModelImpl() + .example(StringUtils.EMPTY) + .type("string")); + new InlineModelResolver().flatten(openapi); + } +} +*/ \ No newline at end of file From 987fd7704237c305a41934964352e2d5b50a879d Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Thu, 9 Aug 2018 16:01:15 -0700 Subject: [PATCH 07/27] [cpp-restsdk] Support multi-line descriptions (#753) * Update IndentedLambda to take optional prefix * Add `multiline_comment_4` to CppRestSdkClient * Update cpp-restsdk example --- .../codegen/languages/AbstractCppCodegen.java | 23 ++++++++++++++ .../codegen/mustache/IndentedLambda.java | 30 +++++++++++++++++-- .../cpp-rest-sdk-client/api-header.mustache | 2 +- .../cpp-restsdk/.openapi-generator/VERSION | 2 +- .../client/petstore/cpp-restsdk/ApiClient.cpp | 2 +- .../client/petstore/cpp-restsdk/ApiClient.h | 2 +- .../petstore/cpp-restsdk/ApiConfiguration.cpp | 2 +- .../petstore/cpp-restsdk/ApiConfiguration.h | 2 +- .../petstore/cpp-restsdk/ApiException.cpp | 2 +- .../petstore/cpp-restsdk/ApiException.h | 2 +- .../petstore/cpp-restsdk/HttpContent.cpp | 2 +- .../client/petstore/cpp-restsdk/HttpContent.h | 2 +- .../client/petstore/cpp-restsdk/IHttpBody.h | 2 +- .../client/petstore/cpp-restsdk/JsonBody.cpp | 2 +- .../client/petstore/cpp-restsdk/JsonBody.h | 2 +- .../client/petstore/cpp-restsdk/ModelBase.cpp | 2 +- .../client/petstore/cpp-restsdk/ModelBase.h | 2 +- .../cpp-restsdk/MultipartFormData.cpp | 2 +- .../petstore/cpp-restsdk/MultipartFormData.h | 2 +- .../client/petstore/cpp-restsdk/Object.cpp | 2 +- samples/client/petstore/cpp-restsdk/Object.h | 2 +- .../petstore/cpp-restsdk/api/PetApi.cpp | 2 +- .../client/petstore/cpp-restsdk/api/PetApi.h | 2 +- .../petstore/cpp-restsdk/api/StoreApi.cpp | 2 +- .../petstore/cpp-restsdk/api/StoreApi.h | 2 +- .../petstore/cpp-restsdk/api/UserApi.cpp | 2 +- .../client/petstore/cpp-restsdk/api/UserApi.h | 2 +- .../cpp-restsdk/model/ApiResponse.cpp | 2 +- .../petstore/cpp-restsdk/model/ApiResponse.h | 2 +- .../petstore/cpp-restsdk/model/Category.cpp | 2 +- .../petstore/cpp-restsdk/model/Category.h | 2 +- .../petstore/cpp-restsdk/model/Order.cpp | 2 +- .../client/petstore/cpp-restsdk/model/Order.h | 2 +- .../client/petstore/cpp-restsdk/model/Pet.cpp | 2 +- .../client/petstore/cpp-restsdk/model/Pet.h | 2 +- .../client/petstore/cpp-restsdk/model/Tag.cpp | 2 +- .../client/petstore/cpp-restsdk/model/Tag.h | 2 +- .../petstore/cpp-restsdk/model/User.cpp | 2 +- .../client/petstore/cpp-restsdk/model/User.h | 2 +- 39 files changed, 88 insertions(+), 39 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index c53021a7534b..22f49a37e143 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -19,13 +19,17 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; +import com.google.common.collect.ImmutableMap; +import com.samskivert.mustache.Mustache; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.DefaultCodegen; +import org.openapitools.codegen.mustache.IndentedLambda; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Arrays; +import java.util.Map; abstract public class AbstractCppCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCppCodegen.class); @@ -242,4 +246,23 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg public String getTypeDeclaration(String str) { return "std::shared_ptr<" + toModelName(str) + ">"; } + + public void processOpts() { + super.processOpts(); + addMustacheLambdas(additionalProperties); + } + + private void addMustacheLambdas(Map objs) { + + Map lambdas = new ImmutableMap.Builder() + .put("multiline_comment_4", new IndentedLambda(4, " ", "///")) + .build(); + + if (objs.containsKey("lambda")) { + LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'."); + objs.put("_lambda", lambdas); + } else { + objs.put("lambda", lambdas); + } + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/IndentedLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/IndentedLambda.java index d1b0b38266f5..66873c311c1b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/IndentedLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/IndentedLambda.java @@ -43,13 +43,14 @@ import java.io.Writer; */ public class IndentedLambda implements Mustache.Lambda { private final int prefixSpaceCount; + private final String prefix; private int spaceCode; /** * Constructs a new instance of {@link IndentedLambda}, with an indent count of 4 spaces */ public IndentedLambda() { - this(4, " "); + this(4, " ", null); } /** @@ -59,15 +60,38 @@ public class IndentedLambda implements Mustache.Lambda { * @param indentionCharacter String representation of the character used in the indent (e.g. " ", "\t", "."). */ public IndentedLambda(int prefixSpaceCount, String indentionCharacter) { - this(prefixSpaceCount, Character.codePointAt(indentionCharacter, 0)); + this(prefixSpaceCount, Character.codePointAt(indentionCharacter, 0), null); + } + + /** + * Constructs a new instance of {@link IndentedLambda}, with customized indent count and intention character + * + * @param prefixSpaceCount The number of indented characters to apply as a prefix to a fragment. + * @param indentionCharacter String representation of the character used in the indent (e.g. " ", "\t", "."). + * @param prefix An optional prefix to prepend before the line (useful for multi-line comments). + */ + public IndentedLambda(int prefixSpaceCount, String indentionCharacter, String prefix) { + this(prefixSpaceCount, Character.codePointAt(indentionCharacter, 0), prefix); } /** * Constructs a new instance of {@link IndentedLambda} * * @param prefixSpaceCount The number of indented characters to apply as a prefix to a fragment. + * @param indentionCodePoint Code point of the single character used for indentation. */ private IndentedLambda(int prefixSpaceCount, int indentionCodePoint) { + this(prefixSpaceCount, indentionCodePoint, null); + } + + /** + * Constructs a new instance of {@link IndentedLambda} + * + * @param prefixSpaceCount The number of indented characters to apply as a prefix to a fragment. + * @param indentionCodePoint Code point of the single character used for indentation. + * @param prefix An optional prefix to prepend before the line (useful for multi-line comments). + */ + private IndentedLambda(int prefixSpaceCount, int indentionCodePoint, String prefix) { if (prefixSpaceCount <= 0) { throw new IllegalArgumentException("prefixSpaceCount must be greater than 0"); } @@ -78,6 +102,7 @@ public class IndentedLambda implements Mustache.Lambda { this.prefixSpaceCount = prefixSpaceCount; this.spaceCode = indentionCodePoint; + this.prefix = prefix; } @Override @@ -96,6 +121,7 @@ public class IndentedLambda implements Mustache.Lambda { // So, we want to skip the first line. if (i > 0) { sb.append(prefixedIndention); + if (prefix != null) sb.append(prefix); } sb.append(line); diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache index ec97511314fc..8f7aad025476 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache @@ -62,7 +62,7 @@ public: /// {{notes}} /// {{#allParams}} - /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} + /// {{#lambda.multiline_comment_4}}{{description}}{{/lambda.multiline_comment_4}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} {{/allParams}} pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {{operationId}}( {{#allParams}} diff --git a/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION index 0f58aa041419..14900cee60e8 100644 --- a/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION @@ -1 +1 @@ -3.1.2-SNAPSHOT \ No newline at end of file +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp index dab66e0e6e1c..a9bb151f9e84 100644 --- a/samples/client/petstore/cpp-restsdk/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/ApiClient.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h index 58d8e78ac07d..f39ca55d1074 100644 --- a/samples/client/petstore/cpp-restsdk/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/ApiClient.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp index 0f91d7c2cba8..5ed86c2fe9dc 100644 --- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp +++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h index 54dc39c26cfa..8ff2be702909 100644 --- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h +++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ApiException.cpp b/samples/client/petstore/cpp-restsdk/ApiException.cpp index 1cceca2e6de5..1def094d90a3 100644 --- a/samples/client/petstore/cpp-restsdk/ApiException.cpp +++ b/samples/client/petstore/cpp-restsdk/ApiException.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ApiException.h b/samples/client/petstore/cpp-restsdk/ApiException.h index ffd7877f3a5f..00ab158d8a2b 100644 --- a/samples/client/petstore/cpp-restsdk/ApiException.h +++ b/samples/client/petstore/cpp-restsdk/ApiException.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/HttpContent.cpp index a5823e01eff4..ef9cbaaa0fe4 100644 --- a/samples/client/petstore/cpp-restsdk/HttpContent.cpp +++ b/samples/client/petstore/cpp-restsdk/HttpContent.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.h b/samples/client/petstore/cpp-restsdk/HttpContent.h index d3950dbd7835..e73cacb9f7e6 100644 --- a/samples/client/petstore/cpp-restsdk/HttpContent.h +++ b/samples/client/petstore/cpp-restsdk/HttpContent.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/IHttpBody.h b/samples/client/petstore/cpp-restsdk/IHttpBody.h index 26a846e5f75c..2462d4ed5703 100644 --- a/samples/client/petstore/cpp-restsdk/IHttpBody.h +++ b/samples/client/petstore/cpp-restsdk/IHttpBody.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/JsonBody.cpp index 1958337d03de..bf8101adfa73 100644 --- a/samples/client/petstore/cpp-restsdk/JsonBody.cpp +++ b/samples/client/petstore/cpp-restsdk/JsonBody.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.h b/samples/client/petstore/cpp-restsdk/JsonBody.h index 3159dfa94d00..47eee72244b7 100644 --- a/samples/client/petstore/cpp-restsdk/JsonBody.h +++ b/samples/client/petstore/cpp-restsdk/JsonBody.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/ModelBase.cpp index a4dc77d750c9..f451f594b6c5 100644 --- a/samples/client/petstore/cpp-restsdk/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/ModelBase.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.h b/samples/client/petstore/cpp-restsdk/ModelBase.h index 4d804a460137..dff9405b649b 100644 --- a/samples/client/petstore/cpp-restsdk/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/ModelBase.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp index 7879d7afe441..271f9cb16147 100644 --- a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp +++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/MultipartFormData.h index 8f03432efa8a..6a081df69f10 100644 --- a/samples/client/petstore/cpp-restsdk/MultipartFormData.h +++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/Object.cpp b/samples/client/petstore/cpp-restsdk/Object.cpp index a0d392f89951..6702388f1b02 100644 --- a/samples/client/petstore/cpp-restsdk/Object.cpp +++ b/samples/client/petstore/cpp-restsdk/Object.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/Object.h b/samples/client/petstore/cpp-restsdk/Object.h index a6ce69a13ad8..6d731d337a67 100644 --- a/samples/client/petstore/cpp-restsdk/Object.h +++ b/samples/client/petstore/cpp-restsdk/Object.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp index 1e3f68f82291..d90f5119a07c 100644 --- a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h index 477738c30b2e..2f5c70e77e6b 100644 --- a/samples/client/petstore/cpp-restsdk/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/api/PetApi.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp index c73c34e395c0..267c8d700965 100644 --- a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h index 0f3e53e3d3bc..4d78791de44c 100644 --- a/samples/client/petstore/cpp-restsdk/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp index 9f97981f9284..91980ca0069c 100644 --- a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h index e02bc2df54bb..d4218faa6a9c 100644 --- a/samples/client/petstore/cpp-restsdk/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/api/UserApi.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp index b8a7e58a3b71..a6655ee08e0f 100644 --- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp +++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h index bad104156764..6a569200a774 100644 --- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h +++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Category.cpp b/samples/client/petstore/cpp-restsdk/model/Category.cpp index e765cdccd081..202d10217383 100644 --- a/samples/client/petstore/cpp-restsdk/model/Category.cpp +++ b/samples/client/petstore/cpp-restsdk/model/Category.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Category.h b/samples/client/petstore/cpp-restsdk/model/Category.h index 93c2e24a51f3..c0d2845d49f9 100644 --- a/samples/client/petstore/cpp-restsdk/model/Category.h +++ b/samples/client/petstore/cpp-restsdk/model/Category.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Order.cpp b/samples/client/petstore/cpp-restsdk/model/Order.cpp index fdad2a0ef4ea..18a68d8f34d2 100644 --- a/samples/client/petstore/cpp-restsdk/model/Order.cpp +++ b/samples/client/petstore/cpp-restsdk/model/Order.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Order.h b/samples/client/petstore/cpp-restsdk/model/Order.h index b83944fc7e25..a53ddd22cc1a 100644 --- a/samples/client/petstore/cpp-restsdk/model/Order.h +++ b/samples/client/petstore/cpp-restsdk/model/Order.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/model/Pet.cpp index 23b929497215..bb346dfd76c1 100644 --- a/samples/client/petstore/cpp-restsdk/model/Pet.cpp +++ b/samples/client/petstore/cpp-restsdk/model/Pet.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.h b/samples/client/petstore/cpp-restsdk/model/Pet.h index 6746c826ca81..c2617e844c30 100644 --- a/samples/client/petstore/cpp-restsdk/model/Pet.h +++ b/samples/client/petstore/cpp-restsdk/model/Pet.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/model/Tag.cpp index 91e608bec9e2..d931065e8059 100644 --- a/samples/client/petstore/cpp-restsdk/model/Tag.cpp +++ b/samples/client/petstore/cpp-restsdk/model/Tag.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.h b/samples/client/petstore/cpp-restsdk/model/Tag.h index 11c00f1bfe27..3523c66e02e0 100644 --- a/samples/client/petstore/cpp-restsdk/model/Tag.h +++ b/samples/client/petstore/cpp-restsdk/model/Tag.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/User.cpp b/samples/client/petstore/cpp-restsdk/model/User.cpp index 8484091ae8c3..faca6ef4c96d 100644 --- a/samples/client/petstore/cpp-restsdk/model/User.cpp +++ b/samples/client/petstore/cpp-restsdk/model/User.cpp @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/model/User.h b/samples/client/petstore/cpp-restsdk/model/User.h index 1a8271f26e62..318d3723831f 100644 --- a/samples/client/petstore/cpp-restsdk/model/User.h +++ b/samples/client/petstore/cpp-restsdk/model/User.h @@ -4,7 +4,7 @@ * * OpenAPI spec version: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ From 748d1d70cbc868d1bba47418cf76d7c988ee56ab Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 10 Aug 2018 15:48:19 +0800 Subject: [PATCH 08/27] update groupId in pom (#779) --- samples/client/petstore/go/pom.xml | 2 +- samples/client/petstore/perl/pom.xml | 2 +- samples/client/petstore/ruby/pom.xml | 2 +- samples/client/petstore/scala-akka/pom.xml | 2 +- samples/client/petstore/typescript-angular-v2/npm/pom.xml | 2 +- samples/client/petstore/typescript-angular-v4.3/npm/pom.xml | 2 +- samples/client/petstore/typescript-angular-v4/npm/pom.xml | 2 +- .../petstore/typescript-angular-v6-provided-in-root/pom.xml | 2 +- samples/client/petstore/typescript-angularjs/pom.xml | 2 +- samples/client/petstore/typescript-fetch/builds/default/pom.xml | 2 +- .../client/petstore/typescript-fetch/builds/es6-target/pom.xml | 2 +- .../petstore/typescript-fetch/builds/with-npm-version/pom.xml | 2 +- samples/client/petstore/typescript-fetch/tests/default/pom.xml | 2 +- samples/client/petstore/typescript-node/npm/pom.xml | 2 +- samples/server/petstore/java-vertx/async/pom.xml | 2 +- samples/server/petstore/java-vertx/rx/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/client/petstore/go/pom.xml b/samples/client/petstore/go/pom.xml index 9350f9881d92..082720066314 100644 --- a/samples/client/petstore/go/pom.xml +++ b/samples/client/petstore/go/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools Goswagger pom 1.0.0 diff --git a/samples/client/petstore/perl/pom.xml b/samples/client/petstore/perl/pom.xml index d761d022cd61..e4ad8fbf6009 100644 --- a/samples/client/petstore/perl/pom.xml +++ b/samples/client/petstore/perl/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools PerlPetstoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/ruby/pom.xml b/samples/client/petstore/ruby/pom.xml index 2e720e226b22..f4c621fca53f 100644 --- a/samples/client/petstore/ruby/pom.xml +++ b/samples/client/petstore/ruby/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools RubyPetstoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/scala-akka/pom.xml b/samples/client/petstore/scala-akka/pom.xml index 264dad8d1a58..20bf1d9209f4 100644 --- a/samples/client/petstore/scala-akka/pom.xml +++ b/samples/client/petstore/scala-akka/pom.xml @@ -240,4 +240,4 @@ - \ No newline at end of file + diff --git a/samples/client/petstore/typescript-angular-v2/npm/pom.xml b/samples/client/petstore/typescript-angular-v2/npm/pom.xml index bbdce5d5da9b..813fbfca88ea 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/pom.xml +++ b/samples/client/petstore/typescript-angular-v2/npm/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TSAngular2PestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml b/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml index fdc35dd82912..5d48e6a3e731 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml +++ b/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TSAngular43PestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-angular-v4/npm/pom.xml b/samples/client/petstore/typescript-angular-v4/npm/pom.xml index 7a610e08f6ef..6fb9db534599 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/pom.xml +++ b/samples/client/petstore/typescript-angular-v4/npm/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TSAngular4PestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/pom.xml b/samples/client/petstore/typescript-angular-v6-provided-in-root/pom.xml index 3848ddf87c01..ee3bb1ecffd0 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/pom.xml +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptAngular6PestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-angularjs/pom.xml b/samples/client/petstore/typescript-angularjs/pom.xml index 6072fc71140f..e334e2d5cadc 100644 --- a/samples/client/petstore/typescript-angularjs/pom.xml +++ b/samples/client/petstore/typescript-angularjs/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptAngularPestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-fetch/builds/default/pom.xml b/samples/client/petstore/typescript-fetch/builds/default/pom.xml index 6b36b1d83c46..b40b83a0c751 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/pom.xml +++ b/samples/client/petstore/typescript-fetch/builds/default/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptAngularBuildPestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml b/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml index 8b8e6052761e..db6dfdfeb6aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptAngularBuildES6PestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml b/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml index b7725ec2309e..339fe7665186 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptAngularBuildWithNPMVersionPestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-fetch/tests/default/pom.xml b/samples/client/petstore/typescript-fetch/tests/default/pom.xml index 5e76c65dfede..92063ea7bcc5 100644 --- a/samples/client/petstore/typescript-fetch/tests/default/pom.xml +++ b/samples/client/petstore/typescript-fetch/tests/default/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptFetchPestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/client/petstore/typescript-node/npm/pom.xml b/samples/client/petstore/typescript-node/npm/pom.xml index 1e4796b6b231..a69d53db3173 100644 --- a/samples/client/petstore/typescript-node/npm/pom.xml +++ b/samples/client/petstore/typescript-node/npm/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + org.openapitools TypeScriptNodeNPMPestoreClientTests pom 1.0-SNAPSHOT diff --git a/samples/server/petstore/java-vertx/async/pom.xml b/samples/server/petstore/java-vertx/async/pom.xml index 7485723d5ef8..0d89408e84d0 100644 --- a/samples/server/petstore/java-vertx/async/pom.xml +++ b/samples/server/petstore/java-vertx/async/pom.xml @@ -88,4 +88,4 @@ - \ No newline at end of file + diff --git a/samples/server/petstore/java-vertx/rx/pom.xml b/samples/server/petstore/java-vertx/rx/pom.xml index 2a914afc4ec3..bc586ffa263c 100644 --- a/samples/server/petstore/java-vertx/rx/pom.xml +++ b/samples/server/petstore/java-vertx/rx/pom.xml @@ -88,4 +88,4 @@ - \ No newline at end of file + From d019bbd2c71645d3322e0109256b1a1200717dcd Mon Sep 17 00:00:00 2001 From: Dec12 | Fujigon Date: Fri, 10 Aug 2018 18:24:24 +0900 Subject: [PATCH 09/27] [Java][jaxrs-jersey] add sample with jaxrs-jersey + openapi v3 (#778) * create sample with "jaxrs-jersey" language & openapi v3 * circle ci setting * fix typo. also add "jaxrs-jersey" to all samples profile * artifactId conflicts. rename. * generate samples with "./bin/openapi3/jaxrs-jersey-petstore.sh" --- CI/pom.xml.circleci | 14 + CI/pom.xml.circleci.java7 | 14 + bin/openapi3/jaxrs-jersey-petstore.sh | 32 +++ pom.xml | 13 + .../jaxrs-jersey/.openapi-generator-ignore | 23 ++ .../jaxrs-jersey/.openapi-generator/VERSION | 1 + .../server/petstore/jaxrs-jersey/README.md | 23 ++ samples/server/petstore/jaxrs-jersey/pom.xml | 193 +++++++++++++ .../org/openapitools/api/ApiException.java | 10 + .../org/openapitools/api/ApiOriginFilter.java | 22 ++ .../openapitools/api/ApiResponseMessage.java | 69 +++++ .../openapitools/api/JacksonJsonProvider.java | 29 ++ .../openapitools/api/NotFoundException.java | 10 + .../gen/java/org/openapitools/api/PetApi.java | 211 ++++++++++++++ .../org/openapitools/api/PetApiService.java | 30 ++ .../openapitools/api/RFC3339DateFormat.java | 19 ++ .../java/org/openapitools/api/StoreApi.java | 115 ++++++++ .../org/openapitools/api/StoreApiService.java | 25 ++ .../java/org/openapitools/api/StringUtil.java | 42 +++ .../java/org/openapitools/api/UserApi.java | 165 +++++++++++ .../org/openapitools/api/UserApiService.java | 29 ++ .../java/org/openapitools/model/Category.java | 115 ++++++++ .../openapitools/model/ModelApiResponse.java | 139 +++++++++ .../java/org/openapitools/model/Order.java | 246 ++++++++++++++++ .../gen/java/org/openapitools/model/Pet.java | 264 ++++++++++++++++++ .../gen/java/org/openapitools/model/Tag.java | 115 ++++++++ .../gen/java/org/openapitools/model/User.java | 259 +++++++++++++++++ .../java/org/openapitools/api/Bootstrap.java | 31 ++ .../api/factories/PetApiServiceFactory.java | 13 + .../api/factories/StoreApiServiceFactory.java | 13 + .../api/factories/UserApiServiceFactory.java | 13 + .../api/impl/PetApiServiceImpl.java | 62 ++++ .../api/impl/StoreApiServiceImpl.java | 41 +++ .../api/impl/UserApiServiceImpl.java | 61 ++++ .../src/main/webapp/WEB-INF/web.xml | 63 +++++ 35 files changed, 2524 insertions(+) create mode 100644 bin/openapi3/jaxrs-jersey-petstore.sh create mode 100644 samples/server/petstore/jaxrs-jersey/.openapi-generator-ignore create mode 100644 samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION create mode 100644 samples/server/petstore/jaxrs-jersey/README.md create mode 100644 samples/server/petstore/jaxrs-jersey/pom.xml create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/JacksonJsonProvider.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/RFC3339DateFormat.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci index b5dd34e4c9c3..26296c47b1db 100644 --- a/CI/pom.xml.circleci +++ b/CI/pom.xml.circleci @@ -607,6 +607,19 @@ samples/server/petstore/jaxrs/jersey1 + + + jaxrs-jersey + + + env + java + + + + samples/server/petstore/jaxrs-jersey + + jaxrs-spec @@ -898,6 +911,7 @@ samples/client/petstore/kotlin-threetenbp/ samples/client/petstore/kotlin-string/ + samples/server/petstore/jaxrs-jersey samples/server/petstore/jaxrs-spec samples/server/petstore/jaxrs-spec-interface samples/server/petstore/jaxrs-spec-interface-response diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7 index ef34a78f420d..56e6688a965e 100644 --- a/CI/pom.xml.circleci.java7 +++ b/CI/pom.xml.circleci.java7 @@ -607,6 +607,19 @@ samples/server/petstore/jaxrs/jersey1 + + + jaxrs-jersey + + + env + java + + + + samples/server/petstore/jaxrs-jersey + + jaxrs-spec @@ -889,6 +902,7 @@ samples/client/petstore/java/google-api-client samples/client/petstore/kotlin/ + samples/server/petstore/jaxrs-jersey samples/server/petstore/jaxrs-spec samples/server/petstore/jaxrs-spec-interface samples/server/petstore/jaxrs-spec-interface-response diff --git a/bin/openapi3/jaxrs-jersey-petstore.sh b/bin/openapi3/jaxrs-jersey-petstore.sh new file mode 100644 index 000000000000..86487d172cca --- /dev/null +++ b/bin/openapi3/jaxrs-jersey-petstore.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +SCRIPT="$0" +echo "# START SCRIPT: $SCRIPT" + +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" +ags="generate --artifact-id "openapiv3-jaxrs-jersey-petstore-server" -t modules/openapi-generator/src/main/resources/JavaJaxRS/ -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g jaxrs-jersey -o samples/server/petstore/jaxrs-jersey $@" + +java $JAVA_OPTS -jar $executable $ags diff --git a/pom.xml b/pom.xml index e30cd436b891..6756c1923d4a 100644 --- a/pom.xml +++ b/pom.xml @@ -715,6 +715,19 @@ samples/server/petstore/jaxrs/jersey1 + + + jaxrs-jersey + + + env + java + + + + samples/server/petstore/jaxrs-jersey + + jaxrs-spec diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator-ignore b/samples/server/petstore/jaxrs-jersey/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION new file mode 100644 index 000000000000..14900cee60e8 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -0,0 +1 @@ +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/README.md b/samples/server/petstore/jaxrs-jersey/README.md new file mode 100644 index 000000000000..ed0042044917 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/README.md @@ -0,0 +1,23 @@ +# Swagger Jersey generated server + +## Overview +This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the +[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub. This +is an example of building a OpenAPI-enabled JAX-RS server. + +This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework. + +To run the server, please execute the following: + +``` +mvn clean package jetty:run +``` + +You can then view the swagger listing here: + +``` +http://localhost:8080/v2/openapi.json +``` + +Note that if you have configured the `host` to be something other than localhost, the calls through +swagger-ui will be directed to that host and not localhost! \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml new file mode 100644 index 000000000000..973329638f0f --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/pom.xml @@ -0,0 +1,193 @@ + + 4.0.0 + org.openapitools + openapiv3-jaxrs-jersey-petstore-server + jar + openapiv3-jaxrs-jersey-petstore-server + 1.0.0 + + + + Unlicense + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + + src/main/java + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-version} + + + / + + target/${project.artifactId}-${project.version} + 8079 + stopit + 10 + + 8080 + 60000 + + + + + javax.validation + validation-api + ${beanvalidation-version} + + + + + start-jetty + pre-integration-test + + start + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + + + + + + io.swagger + swagger-jersey2-jaxrs + compile + ${swagger-core-version} + + + ch.qos.logback + logback-classic + ${logback-version} + compile + + + ch.qos.logback + logback-core + ${logback-version} + compile + + + junit + junit + ${junit-version} + test + + + javax.servlet + servlet-api + ${servlet-api-version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2-version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2-version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-version} + + + + com.brsanthu + migbase64 + 2.2 + + + + + + javax.validation + validation-api + ${beanvalidation-version} + provided + + + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + + + 1.7 + ${java.version} + ${java.version} + 1.5.18 + 1.1.0.Final + 9.2.9.v20150224 + 2.22.2 + 2.8.9 + 4.12 + 1.1.7 + 2.5 + UTF-8 + + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java new file mode 100644 index 000000000000..2d2990bc7f02 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java @@ -0,0 +1,10 @@ +package org.openapitools.api; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class ApiException extends Exception{ + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java new file mode 100644 index 000000000000..96f2e3483005 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java @@ -0,0 +1,22 @@ +package org.openapitools.api; + +import java.io.IOException; + +import javax.servlet.*; +import javax.servlet.http.HttpServletResponse; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class ApiOriginFilter implements javax.servlet.Filter { + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } + + public void destroy() {} + + public void init(FilterConfig filterConfig) throws ServletException {} +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java new file mode 100644 index 000000000000..d25a2f4d834e --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java @@ -0,0 +1,69 @@ +package org.openapitools.api; + +import javax.xml.bind.annotation.XmlTransient; + +@javax.xml.bind.annotation.XmlRootElement +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class ApiResponseMessage { + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; + + int code; + String type; + String message; + + public ApiResponseMessage(){} + + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } + + @XmlTransient + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/JacksonJsonProvider.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/JacksonJsonProvider.java new file mode 100644 index 000000000000..d41d7a1e255d --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/JacksonJsonProvider.java @@ -0,0 +1,29 @@ +package org.openapitools.api; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + +import com.fasterxml.jackson.datatype.joda.*; + +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.ext.Provider; + +@Provider +@Produces({MediaType.APPLICATION_JSON}) +public class JacksonJsonProvider extends JacksonJaxbJsonProvider { + + public JacksonJsonProvider() { + + ObjectMapper objectMapper = new ObjectMapper() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .registerModule(new JodaModule()) + .setDateFormat(new RFC3339DateFormat()); + + setMapper(objectMapper); + } +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java new file mode 100644 index 000000000000..edfc4e392a82 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java @@ -0,0 +1,10 @@ +package org.openapitools.api; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class NotFoundException extends ApiException { + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java new file mode 100644 index 000000000000..c65b8d422e2d --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -0,0 +1,211 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.PetApiService; +import org.openapitools.api.factories.PetApiServiceFactory; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.glassfish.jersey.media.multipart.FormDataParam; + +import javax.servlet.ServletConfig; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.validation.constraints.*; + +@Path("/pet") + + +@io.swagger.annotations.Api(description = "the pet API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class PetApi { + private final PetApiService delegate; + + public PetApi(@Context ServletConfig servletContext) { + PetApiService delegate = null; + + if (servletContext != null) { + String implClass = servletContext.getInitParameter("PetApi.implementation"); + if (implClass != null && !"".equals(implClass.trim())) { + try { + delegate = (PetApiService) Class.forName(implClass).newInstance(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + if (delegate == null) { + delegate = PetApiServiceFactory.getPetApi(); + } + + this.delegate = delegate; + } + + @POST + + @Consumes({ "application/json", "application/xml" }) + + @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.addPet(pet,securityContext); + } + @DELETE + @Path("/{petId}") + + + @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) + public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId +,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.deletePet(petId,apiKey,securityContext); + } + @GET + @Path("/findByStatus") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) + public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter",required=true, allowableValues="available, pending, sold") @QueryParam("status") List status +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.findPetsByStatus(status,securityContext); + } + @GET + @Path("/findByTags") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) + public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List tags +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.findPetsByTags(tags,securityContext); + } + @GET + @Path("/{petId}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { + @io.swagger.annotations.Authorization(value = "api_key") + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) }) + public Response getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.getPetById(petId,securityContext); + } + @PUT + + @Consumes({ "application/json", "application/xml" }) + + @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.updatePet(pet,securityContext); + } + @POST + @Path("/{petId}") + @Consumes({ "application/x-www-form-urlencoded" }) + + @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) + public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId +,@ApiParam(value = "Updated name of the pet", defaultValue="null") @DefaultValue("null") @FormParam("name") String name +,@ApiParam(value = "Updated status of the pet", defaultValue="null") @DefaultValue("null") @FormParam("status") String status +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.updatePetWithForm(petId,name,status,securityContext); + } + @POST + @Path("/{petId}/uploadImage") + @Consumes({ "multipart/form-data" }) + @Produces({ "application/json" }) + @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { + @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { + @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) + public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId +,@ApiParam(value = "Additional data to pass to server", defaultValue="null")@FormDataParam("additionalMetadata") String additionalMetadata +, + @FormDataParam("file") InputStream fileInputStream, + @FormDataParam("file") FormDataContentDisposition fileDetail +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.uploadFile(petId,additionalMetadata,fileInputStream, fileDetail,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java new file mode 100644 index 000000000000..95bf11d9b092 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java @@ -0,0 +1,30 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public abstract class PetApiService { + public abstract Response addPet(Pet pet,SecurityContext securityContext) throws NotFoundException; + public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; + public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; + public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) throws NotFoundException; + public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; + public abstract Response updatePet(Pet pet,SecurityContext securityContext) throws NotFoundException; + public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; + public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/RFC3339DateFormat.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/RFC3339DateFormat.java new file mode 100644 index 000000000000..b471837701d9 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/RFC3339DateFormat.java @@ -0,0 +1,19 @@ +package org.openapitools.api; + +import com.fasterxml.jackson.databind.util.ISO8601DateFormat; +import com.fasterxml.jackson.databind.util.ISO8601Utils; + +import java.text.FieldPosition; +import java.util.Date; + +public class RFC3339DateFormat extends ISO8601DateFormat { + + // Same as ISO8601DateFormat but serializing milliseconds. + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + String value = ISO8601Utils.format(date, true); + toAppendTo.append(value); + return toAppendTo; + } + +} \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java new file mode 100644 index 000000000000..d0f12395db8f --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -0,0 +1,115 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.StoreApiService; +import org.openapitools.api.factories.StoreApiServiceFactory; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.glassfish.jersey.media.multipart.FormDataParam; + +import javax.servlet.ServletConfig; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.validation.constraints.*; + +@Path("/store") + + +@io.swagger.annotations.Api(description = "the store API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class StoreApi { + private final StoreApiService delegate; + + public StoreApi(@Context ServletConfig servletContext) { + StoreApiService delegate = null; + + if (servletContext != null) { + String implClass = servletContext.getInitParameter("StoreApi.implementation"); + if (implClass != null && !"".equals(implClass.trim())) { + try { + delegate = (StoreApiService) Class.forName(implClass).newInstance(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + if (delegate == null) { + delegate = StoreApiServiceFactory.getStoreApi(); + } + + this.delegate = delegate; + } + + @DELETE + @Path("/order/{orderId}") + + + @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) + public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") String orderId +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.deleteOrder(orderId,securityContext); + } + @GET + @Path("/inventory") + + @Produces({ "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { + @io.swagger.annotations.Authorization(value = "api_key") + }, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) + public Response getInventory(@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.getInventory(securityContext); + } + @GET + @Path("/order/{orderId}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) + public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.getOrderById(orderId,securityContext); + } + @POST + @Path("/order") + @Consumes({ "application/json" }) + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.placeOrder(order,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java new file mode 100644 index 000000000000..13698d783a90 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java @@ -0,0 +1,25 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public abstract class StoreApiService { + public abstract Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException; + public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException; + public abstract Response getOrderById( @Min(1L) @Max(5L)Long orderId,SecurityContext securityContext) throws NotFoundException; + public abstract Response placeOrder(Order order,SecurityContext securityContext) throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java new file mode 100644 index 000000000000..8810d4383bdd --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java @@ -0,0 +1,42 @@ +package org.openapitools.api; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) return true; + if (value != null && value.equalsIgnoreCase(str)) return true; + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

+ * Note: This might be replaced by utility method from commons-lang or guava someday + * if one of those libraries is added as dependency. + *

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) return ""; + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java new file mode 100644 index 000000000000..2c5625c2fe44 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java @@ -0,0 +1,165 @@ +package org.openapitools.api; + +import org.openapitools.model.*; +import org.openapitools.api.UserApiService; +import org.openapitools.api.factories.UserApiServiceFactory; + +import io.swagger.annotations.ApiParam; +import io.swagger.jaxrs.*; + +import java.util.List; +import org.openapitools.model.User; + +import java.util.Map; +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.glassfish.jersey.media.multipart.FormDataParam; + +import javax.servlet.ServletConfig; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.*; +import javax.validation.constraints.*; + +@Path("/user") + + +@io.swagger.annotations.Api(description = "the user API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class UserApi { + private final UserApiService delegate; + + public UserApi(@Context ServletConfig servletContext) { + UserApiService delegate = null; + + if (servletContext != null) { + String implClass = servletContext.getInitParameter("UserApi.implementation"); + if (implClass != null && !"".equals(implClass.trim())) { + try { + delegate = (UserApiService) Class.forName(implClass).newInstance(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + if (delegate == null) { + delegate = UserApiServiceFactory.getUserApi(); + } + + this.delegate = delegate; + } + + @POST + + @Consumes({ "application/json" }) + + @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.createUser(user,securityContext); + } + @POST + @Path("/createWithArray") + @Consumes({ "application/json" }) + + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List user +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.createUsersWithArrayInput(user,securityContext); + } + @POST + @Path("/createWithList") + @Consumes({ "application/json" }) + + @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List user +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.createUsersWithListInput(user,securityContext); + } + @DELETE + @Path("/{username}") + + + @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.deleteUser(username,securityContext); + } + @GET + @Path("/{username}") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.getUserByName(username,securityContext); + } + @GET + @Path("/login") + + @Produces({ "application/xml", "application/json" }) + @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class), + + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) }) + public Response loginUser(@ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username +,@ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.loginUser(username,password,securityContext); + } + @GET + @Path("/logout") + + + @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) + public Response logoutUser(@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.logoutUser(securityContext); + } + @PUT + @Path("/{username}") + @Consumes({ "application/json" }) + + @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), + + @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) + public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username +,@ApiParam(value = "Updated user object" ,required=true) User user +,@Context SecurityContext securityContext) + throws NotFoundException { + return delegate.updateUser(username,user,securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java new file mode 100644 index 000000000000..e5919ae31cb8 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java @@ -0,0 +1,29 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import java.util.List; +import org.openapitools.model.User; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public abstract class UserApiService { + public abstract Response createUser(User user,SecurityContext securityContext) throws NotFoundException; + public abstract Response createUsersWithArrayInput(List user,SecurityContext securityContext) throws NotFoundException; + public abstract Response createUsersWithListInput(List user,SecurityContext securityContext) throws NotFoundException; + public abstract Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException; + public abstract Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException; + public abstract Response loginUser( @NotNull String username, @NotNull String password,SecurityContext securityContext) throws NotFoundException; + public abstract Response logoutUser(SecurityContext securityContext) throws NotFoundException; + public abstract Response updateUser(String username,User user,SecurityContext securityContext) throws NotFoundException; +} diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java new file mode 100644 index 000000000000..76cf0f87956c --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java @@ -0,0 +1,115 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * A category for a pet + */ +@ApiModel(description = "A category for a pet") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class Category { + @JsonProperty("id") + private Long id = null; + + @JsonProperty("name") + private String name = null; + + public Category id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @JsonProperty("id") + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Category name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @JsonProperty("name") + @ApiModelProperty(value = "") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Category category = (Category) o; + return Objects.equals(this.id, category.id) && + Objects.equals(this.name, category.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java new file mode 100644 index 000000000000..450694479018 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -0,0 +1,139 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * Describes the result of uploading an image resource + */ +@ApiModel(description = "Describes the result of uploading an image resource") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class ModelApiResponse { + @JsonProperty("code") + private Integer code = null; + + @JsonProperty("type") + private String type = null; + + @JsonProperty("message") + private String message = null; + + public ModelApiResponse code(Integer code) { + this.code = code; + return this; + } + + /** + * Get code + * @return code + **/ + @JsonProperty("code") + @ApiModelProperty(value = "") + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public ModelApiResponse type(String type) { + this.type = type; + return this; + } + + /** + * Get type + * @return type + **/ + @JsonProperty("type") + @ApiModelProperty(value = "") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public ModelApiResponse message(String message) { + this.message = message; + return this; + } + + /** + * Get message + * @return message + **/ + @JsonProperty("message") + @ApiModelProperty(value = "") + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelApiResponse _apiResponse = (ModelApiResponse) o; + return Objects.equals(this.code, _apiResponse.code) && + Objects.equals(this.type, _apiResponse.type) && + Objects.equals(this.message, _apiResponse.message); + } + + @Override + public int hashCode() { + return Objects.hash(code, type, message); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelApiResponse {\n"); + + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java new file mode 100644 index 000000000000..1f1c23188d18 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java @@ -0,0 +1,246 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import javax.validation.constraints.*; + +/** + * An order for a pets from the pet store + */ +@ApiModel(description = "An order for a pets from the pet store") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class Order { + @JsonProperty("id") + private Long id = null; + + @JsonProperty("petId") + private Long petId = null; + + @JsonProperty("quantity") + private Integer quantity = null; + + @JsonProperty("shipDate") + private Date shipDate = null; + + /** + * Order Status + */ + public enum StatusEnum { + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String text) { + for (StatusEnum b : StatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + @JsonProperty("status") + private StatusEnum status = null; + + @JsonProperty("complete") + private Boolean complete = false; + + public Order id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @JsonProperty("id") + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Order petId(Long petId) { + this.petId = petId; + return this; + } + + /** + * Get petId + * @return petId + **/ + @JsonProperty("petId") + @ApiModelProperty(value = "") + public Long getPetId() { + return petId; + } + + public void setPetId(Long petId) { + this.petId = petId; + } + + public Order quantity(Integer quantity) { + this.quantity = quantity; + return this; + } + + /** + * Get quantity + * @return quantity + **/ + @JsonProperty("quantity") + @ApiModelProperty(value = "") + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + public Order shipDate(Date shipDate) { + this.shipDate = shipDate; + return this; + } + + /** + * Get shipDate + * @return shipDate + **/ + @JsonProperty("shipDate") + @ApiModelProperty(value = "") + public Date getShipDate() { + return shipDate; + } + + public void setShipDate(Date shipDate) { + this.shipDate = shipDate; + } + + public Order status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * Order Status + * @return status + **/ + @JsonProperty("status") + @ApiModelProperty(value = "Order Status") + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + public Order complete(Boolean complete) { + this.complete = complete; + return this; + } + + /** + * Get complete + * @return complete + **/ + @JsonProperty("complete") + @ApiModelProperty(value = "") + public Boolean getComplete() { + return complete; + } + + public void setComplete(Boolean complete) { + this.complete = complete; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Order order = (Order) o; + return Objects.equals(this.id, order.id) && + Objects.equals(this.petId, order.petId) && + Objects.equals(this.quantity, order.quantity) && + Objects.equals(this.shipDate, order.shipDate) && + Objects.equals(this.status, order.status) && + Objects.equals(this.complete, order.complete); + } + + @Override + public int hashCode() { + return Objects.hash(id, petId, quantity, shipDate, status, complete); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java new file mode 100644 index 000000000000..96271292913d --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -0,0 +1,264 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.model.Category; +import org.openapitools.model.Tag; +import javax.validation.constraints.*; + +/** + * A pet for sale in the pet store + */ +@ApiModel(description = "A pet for sale in the pet store") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class Pet { + @JsonProperty("id") + private Long id = null; + + @JsonProperty("category") + private Category category = null; + + @JsonProperty("name") + private String name = null; + + @JsonProperty("photoUrls") + private List photoUrls = new ArrayList(); + + @JsonProperty("tags") + private List tags = null; + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String text) { + for (StatusEnum b : StatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + @JsonProperty("status") + private StatusEnum status = null; + + public Pet id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @JsonProperty("id") + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Pet category(Category category) { + this.category = category; + return this; + } + + /** + * Get category + * @return category + **/ + @JsonProperty("category") + @ApiModelProperty(value = "") + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public Pet name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @JsonProperty("name") + @ApiModelProperty(example = "doggie", required = true, value = "") + @NotNull + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Pet photoUrls(List photoUrls) { + this.photoUrls = photoUrls; + return this; + } + + public Pet addPhotoUrlsItem(String photoUrlsItem) { + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + **/ + @JsonProperty("photoUrls") + @ApiModelProperty(required = true, value = "") + @NotNull + public List getPhotoUrls() { + return photoUrls; + } + + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + public Pet tags(List tags) { + this.tags = tags; + return this; + } + + public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList(); + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + **/ + @JsonProperty("tags") + @ApiModelProperty(value = "") + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public Pet status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + **/ + @JsonProperty("status") + @ApiModelProperty(value = "pet status in the store") + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(this.id, pet.id) && + Objects.equals(this.category, pet.category) && + Objects.equals(this.name, pet.name) && + Objects.equals(this.photoUrls, pet.photoUrls) && + Objects.equals(this.tags, pet.tags) && + Objects.equals(this.status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java new file mode 100644 index 000000000000..5d78706d8f49 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java @@ -0,0 +1,115 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * A tag for a pet + */ +@ApiModel(description = "A tag for a pet") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class Tag { + @JsonProperty("id") + private Long id = null; + + @JsonProperty("name") + private String name = null; + + public Tag id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @JsonProperty("id") + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Tag name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @JsonProperty("name") + @ApiModelProperty(value = "") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Tag tag = (Tag) o; + return Objects.equals(this.id, tag.id) && + Objects.equals(this.name, tag.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java new file mode 100644 index 000000000000..3709c0505088 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java @@ -0,0 +1,259 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * A User who is purchasing from the pet store + */ +@ApiModel(description = "A User who is purchasing from the pet store") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class User { + @JsonProperty("id") + private Long id = null; + + @JsonProperty("username") + private String username = null; + + @JsonProperty("firstName") + private String firstName = null; + + @JsonProperty("lastName") + private String lastName = null; + + @JsonProperty("email") + private String email = null; + + @JsonProperty("password") + private String password = null; + + @JsonProperty("phone") + private String phone = null; + + @JsonProperty("userStatus") + private Integer userStatus = null; + + public User id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @JsonProperty("id") + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public User username(String username) { + this.username = username; + return this; + } + + /** + * Get username + * @return username + **/ + @JsonProperty("username") + @ApiModelProperty(value = "") + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public User firstName(String firstName) { + this.firstName = firstName; + return this; + } + + /** + * Get firstName + * @return firstName + **/ + @JsonProperty("firstName") + @ApiModelProperty(value = "") + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public User lastName(String lastName) { + this.lastName = lastName; + return this; + } + + /** + * Get lastName + * @return lastName + **/ + @JsonProperty("lastName") + @ApiModelProperty(value = "") + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public User email(String email) { + this.email = email; + return this; + } + + /** + * Get email + * @return email + **/ + @JsonProperty("email") + @ApiModelProperty(value = "") + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public User password(String password) { + this.password = password; + return this; + } + + /** + * Get password + * @return password + **/ + @JsonProperty("password") + @ApiModelProperty(value = "") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public User phone(String phone) { + this.phone = phone; + return this; + } + + /** + * Get phone + * @return phone + **/ + @JsonProperty("phone") + @ApiModelProperty(value = "") + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public User userStatus(Integer userStatus) { + this.userStatus = userStatus; + return this; + } + + /** + * User Status + * @return userStatus + **/ + @JsonProperty("userStatus") + @ApiModelProperty(value = "User Status") + public Integer getUserStatus() { + return userStatus; + } + + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(this.id, user.id) && + Objects.equals(this.username, user.username) && + Objects.equals(this.firstName, user.firstName) && + Objects.equals(this.lastName, user.lastName) && + Objects.equals(this.email, user.email) && + Objects.equals(this.password, user.password) && + Objects.equals(this.phone, user.phone) && + Objects.equals(this.userStatus, user.userStatus); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java new file mode 100644 index 000000000000..2856cda2f37a --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java @@ -0,0 +1,31 @@ +package org.openapitools.api; + +import io.swagger.jaxrs.config.SwaggerContextService; +import io.swagger.models.*; + +import io.swagger.models.auth.*; + +import javax.servlet.http.HttpServlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +public class Bootstrap extends HttpServlet { + @Override + public void init(ServletConfig config) throws ServletException { + Info info = new Info() + .title("OpenAPI Server") + .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.") + .termsOfService("") + .contact(new Contact() + .email("")) + .license(new License() + .name("Apache-2.0") + .url("http://www.apache.org/licenses/LICENSE-2.0.html")); + + ServletContext context = config.getServletContext(); + Swagger swagger = new Swagger().info(info); + + new SwaggerContextService().withServletConfig(config).updateSwagger(swagger); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java new file mode 100644 index 000000000000..5bd95e5f1c09 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java @@ -0,0 +1,13 @@ +package org.openapitools.api.factories; + +import org.openapitools.api.PetApiService; +import org.openapitools.api.impl.PetApiServiceImpl; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class PetApiServiceFactory { + private final static PetApiService service = new PetApiServiceImpl(); + + public static PetApiService getPetApi() { + return service; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java new file mode 100644 index 000000000000..3a9ab3531aff --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java @@ -0,0 +1,13 @@ +package org.openapitools.api.factories; + +import org.openapitools.api.StoreApiService; +import org.openapitools.api.impl.StoreApiServiceImpl; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class StoreApiServiceFactory { + private final static StoreApiService service = new StoreApiServiceImpl(); + + public static StoreApiService getStoreApi() { + return service; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java new file mode 100644 index 000000000000..12540d9364c1 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java @@ -0,0 +1,13 @@ +package org.openapitools.api.factories; + +import org.openapitools.api.UserApiService; +import org.openapitools.api.impl.UserApiServiceImpl; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class UserApiServiceFactory { + private final static UserApiService service = new UserApiServiceImpl(); + + public static UserApiService getUserApi() { + return service; + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java new file mode 100644 index 000000000000..3ef3488fe8ff --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -0,0 +1,62 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class PetApiServiceImpl extends PetApiService { + @Override + public Response addPet(Pet pet, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response deletePet(Long petId, String apiKey, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response findPetsByStatus( @NotNull List status, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response getPetById(Long petId, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response updatePet(Pet pet, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java new file mode 100644 index 000000000000..b4be886cf0cb --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -0,0 +1,41 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import java.util.Map; +import org.openapitools.model.Order; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class StoreApiServiceImpl extends StoreApiService { + @Override + public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response getInventory(SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response getOrderById( @Min(1L) @Max(5L)Long orderId, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response placeOrder(Order order, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java new file mode 100644 index 000000000000..fb2e323efc6f --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java @@ -0,0 +1,61 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import java.util.List; +import org.openapitools.model.User; + +import java.util.List; +import org.openapitools.api.NotFoundException; + +import java.io.InputStream; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.validation.constraints.*; +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", date = "2018-08-10T15:02:11.723+09:00[Asia/Tokyo]") +public class UserApiServiceImpl extends UserApiService { + @Override + public Response createUser(User user, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response createUsersWithArrayInput(List user, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response createUsersWithListInput(List user, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response deleteUser(String username, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response getUserByName(String username, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response loginUser( @NotNull String username, @NotNull String password, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response logoutUser(SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } + @Override + public Response updateUser(String username, User user, SecurityContext securityContext) throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } +} diff --git a/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000000..78aae0f44248 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,63 @@ + + + + + jersey + org.glassfish.jersey.servlet.ServletContainer + + jersey.config.server.provider.packages + + io.swagger.jaxrs.listing, + io.swagger.sample.resource, + org.openapitools.api + + + + jersey.config.server.provider.classnames + org.glassfish.jersey.media.multipart.MultiPartFeature + + + jersey.config.server.wadl.disableWadl + true + + 1 + + + + Jersey2Config + io.swagger.jersey.config.JerseyJaxrsConfig + + api.version + 1.0.0 + + + swagger.api.title + OpenAPI Server + + + swagger.api.basepath + http://petstore.swagger.io/v2 + + + 2 + + + Bootstrap + org.openapitools.api.Bootstrap + 2 + + + jersey + /v2/* + + + ApiOriginFilter + org.openapitools.api.ApiOriginFilter + + + ApiOriginFilter + /* + + From afdef8f890f0f7649656f6f014cf1281a9316bd1 Mon Sep 17 00:00:00 2001 From: Yusuke Iinuma Date: Fri, 10 Aug 2018 18:25:22 +0900 Subject: [PATCH 10/27] [Ruby] Fix method split (#780) * Fix methods split for readable * Recreate sample --- .../src/main/resources/ruby-client/api.mustache | 1 + .../client/petstore/ruby/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby/lib/petstore.rb | 2 +- .../ruby/lib/petstore/api/another_fake_api.rb | 3 ++- .../petstore/ruby/lib/petstore/api/fake_api.rb | 13 ++++++++++++- .../lib/petstore/api/fake_classname_tags123_api.rb | 3 ++- .../petstore/ruby/lib/petstore/api/pet_api.rb | 11 ++++++++++- .../petstore/ruby/lib/petstore/api/store_api.rb | 6 +++++- .../petstore/ruby/lib/petstore/api/user_api.rb | 10 +++++++++- .../client/petstore/ruby/lib/petstore/api_client.rb | 2 +- .../client/petstore/ruby/lib/petstore/api_error.rb | 2 +- .../petstore/ruby/lib/petstore/configuration.rb | 2 +- .../petstore/models/additional_properties_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/animal.rb | 2 +- .../ruby/lib/petstore/models/animal_farm.rb | 2 +- .../ruby/lib/petstore/models/api_response.rb | 2 +- .../models/array_of_array_of_number_only.rb | 2 +- .../lib/petstore/models/array_of_number_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/array_test.rb | 2 +- .../ruby/lib/petstore/models/capitalization.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/cat.rb | 2 +- .../petstore/ruby/lib/petstore/models/category.rb | 2 +- .../ruby/lib/petstore/models/class_model.rb | 2 +- .../petstore/ruby/lib/petstore/models/client.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/dog.rb | 2 +- .../ruby/lib/petstore/models/enum_arrays.rb | 2 +- .../petstore/ruby/lib/petstore/models/enum_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/enum_test.rb | 2 +- .../petstore/ruby/lib/petstore/models/file.rb | 2 +- .../lib/petstore/models/file_schema_test_class.rb | 2 +- .../ruby/lib/petstore/models/format_test.rb | 2 +- .../ruby/lib/petstore/models/has_only_read_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/list.rb | 2 +- .../petstore/ruby/lib/petstore/models/map_test.rb | 2 +- ...ed_properties_and_additional_properties_class.rb | 2 +- .../ruby/lib/petstore/models/model200_response.rb | 2 +- .../ruby/lib/petstore/models/model_return.rb | 2 +- .../petstore/ruby/lib/petstore/models/name.rb | 2 +- .../ruby/lib/petstore/models/number_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/order.rb | 2 +- .../ruby/lib/petstore/models/outer_composite.rb | 2 +- .../petstore/ruby/lib/petstore/models/outer_enum.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/pet.rb | 2 +- .../ruby/lib/petstore/models/read_only_first.rb | 2 +- .../ruby/lib/petstore/models/special_model_name.rb | 2 +- .../ruby/lib/petstore/models/string_boolean_map.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/tag.rb | 2 +- .../petstore/ruby/lib/petstore/models/user.rb | 2 +- .../client/petstore/ruby/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby/petstore.gemspec | 2 +- 50 files changed, 84 insertions(+), 49 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache index aef0fbb24c99..b65c0578a175 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache @@ -186,6 +186,7 @@ module {{moduleName}} end return data, status_code, headers end + {{/operation}} end {{/operations}} diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 4395ff592326..14900cee60e8 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -3.2.0-SNAPSHOT \ No newline at end of file +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index 05a72419f3bb..fb9522a24ca6 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 7d5554a463cb..631a32a42dcb 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -73,5 +73,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 5a79040d9077..73202e75325d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -65,6 +65,7 @@ module Petstore end return data, status_code, headers end + # Test serialization of object with outer number type # @param [Hash] opts the optional parameters # @option opts [OuterComposite] :outer_composite Input composite as post body @@ -111,6 +112,7 @@ module Petstore end return data, status_code, headers end + # Test serialization of outer number types # @param [Hash] opts the optional parameters # @option opts [Float] :body Input number as post body @@ -157,6 +159,7 @@ module Petstore end return data, status_code, headers end + # Test serialization of outer string types # @param [Hash] opts the optional parameters # @option opts [String] :body Input string as post body @@ -203,6 +206,7 @@ module Petstore end return data, status_code, headers end + # For this test, the body for this request much reference a schema named `File`. # @param file_schema_test_class # @param [Hash] opts the optional parameters @@ -252,6 +256,7 @@ module Petstore end return data, status_code, headers end + # @param query # @param user # @param [Hash] opts the optional parameters @@ -306,6 +311,7 @@ module Petstore end return data, status_code, headers end + # To test \"client\" model # To test \"client\" model # @param client client model @@ -360,6 +366,7 @@ module Petstore end return data, status_code, headers end + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # @param number None @@ -515,6 +522,7 @@ module Petstore end return data, status_code, headers end + # To test enum parameters # To test enum parameters # @param [Hash] opts the optional parameters @@ -608,6 +616,7 @@ module Petstore end return data, status_code, headers end + # test inline additionalProperties # @param request_body request body # @param [Hash] opts the optional parameters @@ -657,6 +666,7 @@ module Petstore end return data, status_code, headers end + # test json serialization of form data # @param param field1 # @param param2 field2 @@ -714,5 +724,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 9727790a40f5..673879cf0769 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -73,5 +73,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 2d5cce8d7224..ba02b06905d7 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -68,6 +68,7 @@ module Petstore end return data, status_code, headers end + # Deletes a pet # @param pet_id Pet id to delete # @param [Hash] opts the optional parameters @@ -118,6 +119,7 @@ module Petstore end return data, status_code, headers end + # Finds Pets by status # Multiple status values can be provided with comma separated strings # @param status Status values that need to be considered for filter @@ -171,6 +173,7 @@ module Petstore end return data, status_code, headers end + # Finds Pets by tags # Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. # @param tags Tags to filter by @@ -224,6 +227,7 @@ module Petstore end return data, status_code, headers end + # Find pet by ID # Returns a single pet # @param pet_id ID of pet to return @@ -276,6 +280,7 @@ module Petstore end return data, status_code, headers end + # Update an existing pet # @param pet Pet object that needs to be added to the store # @param [Hash] opts the optional parameters @@ -325,6 +330,7 @@ module Petstore end return data, status_code, headers end + # Updates a pet in the store with form data # @param pet_id ID of pet that needs to be updated # @param [Hash] opts the optional parameters @@ -380,6 +386,7 @@ module Petstore end return data, status_code, headers end + # uploads an image # @param pet_id ID of pet to update # @param [Hash] opts the optional parameters @@ -438,6 +445,7 @@ module Petstore end return data, status_code, headers end + # uploads an image (required) # @param pet_id ID of pet to update # @param required_file file to upload @@ -500,5 +508,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index d282fcc7a979..40e2658140f7 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -68,6 +68,7 @@ module Petstore end return data, status_code, headers end + # Returns pet inventories by status # Returns a map of status codes to quantities # @param [Hash] opts the optional parameters @@ -114,6 +115,7 @@ module Petstore end return data, status_code, headers end + # Find purchase order by ID # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions # @param order_id ID of pet that needs to be fetched @@ -174,6 +176,7 @@ module Petstore end return data, status_code, headers end + # Place an order for a pet # @param order order placed for purchasing the pet # @param [Hash] opts the optional parameters @@ -224,5 +227,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index 17d7fb77cd88..9a51c874d24d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end @@ -68,6 +68,7 @@ module Petstore end return data, status_code, headers end + # Creates list of users with given input array # @param user List of user object # @param [Hash] opts the optional parameters @@ -115,6 +116,7 @@ module Petstore end return data, status_code, headers end + # Creates list of users with given input array # @param user List of user object # @param [Hash] opts the optional parameters @@ -162,6 +164,7 @@ module Petstore end return data, status_code, headers end + # Delete user # This can only be done by the logged in user. # @param username The name that needs to be deleted @@ -211,6 +214,7 @@ module Petstore end return data, status_code, headers end + # Get user by user name # @param username The name that needs to be fetched. Use user1 for testing. # @param [Hash] opts the optional parameters @@ -261,6 +265,7 @@ module Petstore end return data, status_code, headers end + # Logs user into the system # @param username The user name for login # @param password The password for login in clear text @@ -319,6 +324,7 @@ module Petstore end return data, status_code, headers end + # Logs out current logged in user session # @param [Hash] opts the optional parameters # @return [nil] @@ -360,6 +366,7 @@ module Petstore end return data, status_code, headers end + # Updated user # This can only be done by the logged in user. # @param username name that need to be deleted @@ -415,5 +422,6 @@ module Petstore end return data, status_code, headers end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 42dbf2d7228b..06f714c0e770 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 81d379ef431d..78edb8feb73f 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index 83427d880679..6f8132d700c8 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index ad667291191e..bea7565c37fe 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index d3a4649ccdff..f2dcfb278aa7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb index 2130ee6cf955..92776bda94fc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index afb0eb293773..47613736d9e8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index a28454076c92..200b1003f333 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index 8d21ab4c109b..b50fbb4bd61d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index 5910bfa15b9d..af3061da626d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index 032b8587bbb6..fdabd812601d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index a478964603ca..129be2ccbdf1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 52862ce3949a..baccd2ecd07d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index fad7ed3b9dbb..d5b7d848a9a2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index 05c444bf0d1d..61a4bc93f0cc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index cda0316c5c15..5628376f9570 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index db3871fe8696..bed06c5194c6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index 0a1466f458d3..46059c246147 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index b685798baf37..40416289d452 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 8809734df23b..e141d680f8f6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index 28b5aec0dd96..4dd48acfa93c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 5baff8c0fab8..9f04147e823f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index db0c7b908d0e..6b33d9e5504e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index 4d1bca715cdd..a6d375a09b57 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index ccd50a40c941..40d6ce9a90d8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 3ac768d591c3..9666d11d1584 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index 50f5cfaff669..3bb679ae3c27 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index f1ac812979e9..8de1e511d6e1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 73bfd8d430e6..990d4c677519 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index fe163952fb2a..60a525f0b5e6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index d0d9b1b0817e..2f2ec5e91454 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index b4fa08bd49f9..eaeeed40882b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index 74c1f49d76e0..d815de0d8f4e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 9746124e9f6e..ceb3d9d327f2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index 1ebf4bd71929..992bea8712e9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index f8d0ee2ec75b..13ab4f67fc9c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb index 9ba9eae50026..2318f7e8fb09 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index 6016e32a712e..220c9848b73b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index e8862b7cd641..ce1f13ae8392 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 1ee762fa978d..1f94471ed8c7 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 786acf93baa6..a7beed1589cd 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 3.2.0-SNAPSHOT +OpenAPI Generator version: 3.2.1-SNAPSHOT =end From 21777f27590672baa4ed0ba88d7c02528ba79b63 Mon Sep 17 00:00:00 2001 From: Akihito Nakano Date: Fri, 10 Aug 2018 22:50:33 +0900 Subject: [PATCH 11/27] [JavaScript] Update vulnerable dependencies (#784) * Update vulnerable dependencies * Update samples: javascript-es6 * Update samples: javascript-promise * Update samples: javascript-promise-es6 * Update samples: javascript * Update samples: petstore-security-test/javascript * Rename operationId if it starts with a number * Update samples bin/javascript-petstore.sh bin/javascript-es6-petstore.sh bin/javascript-promise-petstore.sh bin/javascript-promise-es6-petstore.sh --- .../languages/JavascriptClientCodegen.java | 7 ++ .../resources/Javascript/es6/package.mustache | 2 +- .../resources/Javascript/package.mustache | 2 +- .../javascript/.openapi-generator/VERSION | 2 +- .../javascript/README.md | 29 +++--- .../javascript/docs/FakeApi.md | 20 ++--- .../javascript/docs/ModelReturn.md | 2 +- .../javascript/git_push.sh | 2 +- .../javascript/package.json | 4 +- .../javascript/src/ApiClient.js | 30 ++++--- .../javascript/src/api/FakeApi.js | 30 +++---- .../javascript/src/index.js | 20 ++--- .../javascript/src/model/ModelReturn.js | 16 ++-- .../javascript-es6/.openapi-generator/VERSION | 2 +- .../client/petstore/javascript-es6/README.md | 9 +- .../javascript-es6/docs/AnotherFakeApi.md | 12 +-- .../petstore/javascript-es6/docs/FakeApi.md | 43 +++++++++ .../petstore/javascript-es6/docs/File.md | 8 ++ .../docs/FileSchemaTestClass.md | 9 ++ .../petstore/javascript-es6/docs/MapTest.md | 2 + .../petstore/javascript-es6/docs/PetApi.md | 52 +++++++++++ .../javascript-es6/docs/StringBooleanMap.md | 7 ++ .../petstore/javascript-es6/package.json | 2 +- .../javascript-es6/src/api/AnotherFakeApi.js | 12 +-- .../javascript-es6/src/api/FakeApi.js | 44 +++++++++ .../petstore/javascript-es6/src/api/PetApi.js | 56 ++++++++++++ .../petstore/javascript-es6/src/index.js | 21 +++++ .../petstore/javascript-es6/src/model/File.js | 73 +++++++++++++++ .../src/model/FileSchemaTestClass.js | 79 ++++++++++++++++ .../javascript-es6/src/model/MapTest.js | 17 ++++ .../src/model/OuterComposite.js | 6 +- .../src/model/StringBooleanMap.js | 67 ++++++++++++++ .../javascript-es6/test/model/File.spec.js | 65 ++++++++++++++ .../test/model/FileSchemaTestClass.spec.js | 71 +++++++++++++++ .../test/model/StringBooleanMap.spec.js | 59 ++++++++++++ .../.openapi-generator/VERSION | 2 +- .../petstore/javascript-promise-es6/README.md | 9 +- .../docs/AnotherFakeApi.md | 12 +-- .../javascript-promise-es6/docs/FakeApi.md | 42 +++++++++ .../javascript-promise-es6/docs/File.md | 8 ++ .../docs/FileSchemaTestClass.md | 9 ++ .../javascript-promise-es6/docs/MapTest.md | 2 + .../javascript-promise-es6/docs/PetApi.md | 51 +++++++++++ .../docs/StringBooleanMap.md | 7 ++ .../javascript-promise-es6/package.json | 2 +- .../src/api/AnotherFakeApi.js | 12 +-- .../javascript-promise-es6/src/api/FakeApi.js | 49 ++++++++++ .../javascript-promise-es6/src/api/PetApi.js | 63 +++++++++++++ .../javascript-promise-es6/src/index.js | 21 +++++ .../javascript-promise-es6/src/model/File.js | 73 +++++++++++++++ .../src/model/FileSchemaTestClass.js | 79 ++++++++++++++++ .../src/model/MapTest.js | 17 ++++ .../src/model/OuterComposite.js | 6 +- .../src/model/StringBooleanMap.js | 67 ++++++++++++++ .../test/model/File.spec.js | 65 ++++++++++++++ .../test/model/FileSchemaTestClass.spec.js | 71 +++++++++++++++ .../test/model/StringBooleanMap.spec.js | 59 ++++++++++++ .../.openapi-generator/VERSION | 2 +- .../petstore/javascript-promise/README.md | 9 +- .../javascript-promise/docs/AnotherFakeApi.md | 12 +-- .../javascript-promise/docs/FakeApi.md | 42 +++++++++ .../petstore/javascript-promise/docs/File.md | 8 ++ .../docs/FileSchemaTestClass.md | 9 ++ .../javascript-promise/docs/MapTest.md | 2 + .../javascript-promise/docs/PetApi.md | 50 +++++++++++ .../docs/StringBooleanMap.md | 7 ++ .../petstore/javascript-promise/package.json | 2 +- .../javascript-promise/src/ApiClient.js | 2 +- .../src/api/AnotherFakeApi.js | 14 +-- .../javascript-promise/src/api/FakeApi.js | 60 +++++++++++-- .../src/api/FakeClassnameTags123Api.js | 2 +- .../javascript-promise/src/api/PetApi.js | 67 +++++++++++++- .../javascript-promise/src/api/StoreApi.js | 2 +- .../javascript-promise/src/api/UserApi.js | 2 +- .../petstore/javascript-promise/src/index.js | 23 ++++- .../src/model/AdditionalPropertiesClass.js | 2 +- .../javascript-promise/src/model/Animal.js | 2 +- .../src/model/AnimalFarm.js | 2 +- .../src/model/ApiResponse.js | 2 +- .../src/model/ArrayOfArrayOfNumberOnly.js | 2 +- .../src/model/ArrayOfNumberOnly.js | 2 +- .../javascript-promise/src/model/ArrayTest.js | 2 +- .../src/model/Capitalization.js | 2 +- .../javascript-promise/src/model/Cat.js | 2 +- .../javascript-promise/src/model/Category.js | 2 +- .../src/model/ClassModel.js | 2 +- .../javascript-promise/src/model/Client.js | 2 +- .../javascript-promise/src/model/Dog.js | 2 +- .../src/model/EnumArrays.js | 2 +- .../javascript-promise/src/model/EnumClass.js | 2 +- .../javascript-promise/src/model/EnumTest.js | 2 +- .../javascript-promise/src/model/File.js | 83 +++++++++++++++++ .../src/model/FileSchemaTestClass.js | 89 +++++++++++++++++++ .../src/model/FormatTest.js | 2 +- .../src/model/HasOnlyReadOnly.js | 2 +- .../javascript-promise/src/model/List.js | 2 +- .../javascript-promise/src/model/MapTest.js | 26 ++++-- ...dPropertiesAndAdditionalPropertiesClass.js | 2 +- .../src/model/Model200Response.js | 2 +- .../src/model/ModelReturn.js | 2 +- .../javascript-promise/src/model/Name.js | 2 +- .../src/model/NumberOnly.js | 2 +- .../javascript-promise/src/model/Order.js | 2 +- .../src/model/OuterComposite.js | 8 +- .../javascript-promise/src/model/OuterEnum.js | 2 +- .../javascript-promise/src/model/Pet.js | 2 +- .../src/model/ReadOnlyFirst.js | 2 +- .../src/model/SpecialModelName.js | 2 +- .../src/model/StringBooleanMap.js | 76 ++++++++++++++++ .../javascript-promise/src/model/Tag.js | 2 +- .../javascript-promise/src/model/User.js | 2 +- .../test/model/File.spec.js | 67 ++++++++++++++ .../test/model/FileSchemaTestClass.spec.js | 73 +++++++++++++++ .../test/model/StringBooleanMap.spec.js | 61 +++++++++++++ .../javascript/.openapi-generator/VERSION | 2 +- samples/client/petstore/javascript/README.md | 9 +- .../javascript/docs/AnotherFakeApi.md | 12 +-- .../petstore/javascript/docs/FakeApi.md | 44 +++++++++ .../client/petstore/javascript/docs/File.md | 8 ++ .../javascript/docs/FileSchemaTestClass.md | 9 ++ .../petstore/javascript/docs/MapTest.md | 2 + .../client/petstore/javascript/docs/PetApi.md | 52 +++++++++++ .../javascript/docs/StringBooleanMap.md | 7 ++ .../client/petstore/javascript/package.json | 2 +- .../petstore/javascript/src/ApiClient.js | 2 +- .../javascript/src/api/AnotherFakeApi.js | 14 +-- .../petstore/javascript/src/api/FakeApi.js | 55 ++++++++++-- .../src/api/FakeClassnameTags123Api.js | 2 +- .../petstore/javascript/src/api/PetApi.js | 60 ++++++++++++- .../petstore/javascript/src/api/StoreApi.js | 2 +- .../petstore/javascript/src/api/UserApi.js | 2 +- .../client/petstore/javascript/src/index.js | 23 ++++- .../src/model/AdditionalPropertiesClass.js | 2 +- .../petstore/javascript/src/model/Animal.js | 2 +- .../javascript/src/model/AnimalFarm.js | 2 +- .../javascript/src/model/ApiResponse.js | 2 +- .../src/model/ArrayOfArrayOfNumberOnly.js | 2 +- .../javascript/src/model/ArrayOfNumberOnly.js | 2 +- .../javascript/src/model/ArrayTest.js | 2 +- .../javascript/src/model/Capitalization.js | 2 +- .../petstore/javascript/src/model/Cat.js | 2 +- .../petstore/javascript/src/model/Category.js | 2 +- .../javascript/src/model/ClassModel.js | 2 +- .../petstore/javascript/src/model/Client.js | 2 +- .../petstore/javascript/src/model/Dog.js | 2 +- .../javascript/src/model/EnumArrays.js | 2 +- .../javascript/src/model/EnumClass.js | 2 +- .../petstore/javascript/src/model/EnumTest.js | 2 +- .../petstore/javascript/src/model/File.js | 83 +++++++++++++++++ .../src/model/FileSchemaTestClass.js | 89 +++++++++++++++++++ .../javascript/src/model/FormatTest.js | 2 +- .../javascript/src/model/HasOnlyReadOnly.js | 2 +- .../petstore/javascript/src/model/List.js | 2 +- .../petstore/javascript/src/model/MapTest.js | 26 ++++-- ...dPropertiesAndAdditionalPropertiesClass.js | 2 +- .../javascript/src/model/Model200Response.js | 2 +- .../javascript/src/model/ModelReturn.js | 2 +- .../petstore/javascript/src/model/Name.js | 2 +- .../javascript/src/model/NumberOnly.js | 2 +- .../petstore/javascript/src/model/Order.js | 2 +- .../javascript/src/model/OuterComposite.js | 8 +- .../javascript/src/model/OuterEnum.js | 2 +- .../petstore/javascript/src/model/Pet.js | 2 +- .../javascript/src/model/ReadOnlyFirst.js | 2 +- .../javascript/src/model/SpecialModelName.js | 2 +- .../javascript/src/model/StringBooleanMap.js | 76 ++++++++++++++++ .../petstore/javascript/src/model/Tag.js | 2 +- .../petstore/javascript/src/model/User.js | 2 +- .../javascript/test/model/File.spec.js | 67 ++++++++++++++ .../test/model/FileSchemaTestClass.spec.js | 73 +++++++++++++++ .../test/model/StringBooleanMap.spec.js | 61 +++++++++++++ 171 files changed, 3065 insertions(+), 255 deletions(-) create mode 100644 samples/client/petstore/javascript-es6/docs/File.md create mode 100644 samples/client/petstore/javascript-es6/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/javascript-es6/docs/StringBooleanMap.md create mode 100644 samples/client/petstore/javascript-es6/src/model/File.js create mode 100644 samples/client/petstore/javascript-es6/src/model/FileSchemaTestClass.js create mode 100644 samples/client/petstore/javascript-es6/src/model/StringBooleanMap.js create mode 100644 samples/client/petstore/javascript-es6/test/model/File.spec.js create mode 100644 samples/client/petstore/javascript-es6/test/model/FileSchemaTestClass.spec.js create mode 100644 samples/client/petstore/javascript-es6/test/model/StringBooleanMap.spec.js create mode 100644 samples/client/petstore/javascript-promise-es6/docs/File.md create mode 100644 samples/client/petstore/javascript-promise-es6/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/javascript-promise-es6/docs/StringBooleanMap.md create mode 100644 samples/client/petstore/javascript-promise-es6/src/model/File.js create mode 100644 samples/client/petstore/javascript-promise-es6/src/model/FileSchemaTestClass.js create mode 100644 samples/client/petstore/javascript-promise-es6/src/model/StringBooleanMap.js create mode 100644 samples/client/petstore/javascript-promise-es6/test/model/File.spec.js create mode 100644 samples/client/petstore/javascript-promise-es6/test/model/FileSchemaTestClass.spec.js create mode 100644 samples/client/petstore/javascript-promise-es6/test/model/StringBooleanMap.spec.js create mode 100644 samples/client/petstore/javascript-promise/docs/File.md create mode 100644 samples/client/petstore/javascript-promise/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/javascript-promise/docs/StringBooleanMap.md create mode 100644 samples/client/petstore/javascript-promise/src/model/File.js create mode 100644 samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js create mode 100644 samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js create mode 100644 samples/client/petstore/javascript-promise/test/model/File.spec.js create mode 100644 samples/client/petstore/javascript-promise/test/model/FileSchemaTestClass.spec.js create mode 100644 samples/client/petstore/javascript-promise/test/model/StringBooleanMap.spec.js create mode 100644 samples/client/petstore/javascript/docs/File.md create mode 100644 samples/client/petstore/javascript/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/javascript/docs/StringBooleanMap.md create mode 100644 samples/client/petstore/javascript/src/model/File.js create mode 100644 samples/client/petstore/javascript/src/model/FileSchemaTestClass.js create mode 100644 samples/client/petstore/javascript/src/model/StringBooleanMap.js create mode 100644 samples/client/petstore/javascript/test/model/File.spec.js create mode 100644 samples/client/petstore/javascript/test/model/FileSchemaTestClass.spec.js create mode 100644 samples/client/petstore/javascript/test/model/StringBooleanMap.spec.js diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index ca6433b5ca92..0bbefee3bed3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -837,6 +837,13 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo return newOperationId; } + // operationId starts with a number + if (operationId.matches("^\\d.*")) { + String newOperationId = camelize("call_" + operationId, true); + LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + newOperationId); + return newOperationId; + } + return operationId; } diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache index 997c5e240558..56376a1eede0 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache @@ -13,7 +13,7 @@ "dependencies": { "babel": "^6.23.0", "babel-cli": "^6.26.0", - "superagent": "3.5.2" + "superagent": "3.7.0" }, "devDependencies": { "babel-core": "6.26.0", diff --git a/modules/openapi-generator/src/main/resources/Javascript/package.mustache b/modules/openapi-generator/src/main/resources/Javascript/package.mustache index 79d0d8f67214..b40c7cc8fb82 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/package.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/package.mustache @@ -11,7 +11,7 @@ "fs": false }, "dependencies": { - "superagent": "3.5.2" + "superagent": "3.7.0" }, "devDependencies": { "mocha": "~2.3.4", diff --git a/samples/client/petstore-security-test/javascript/.openapi-generator/VERSION b/samples/client/petstore-security-test/javascript/.openapi-generator/VERSION index f9f7450d1359..4395ff592326 100644 --- a/samples/client/petstore-security-test/javascript/.openapi-generator/VERSION +++ b/samples/client/petstore-security-test/javascript/.openapi-generator/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +3.2.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore-security-test/javascript/README.md b/samples/client/petstore-security-test/javascript/README.md index 4a9bd7e80db9..648467de2371 100644 --- a/samples/client/petstore-security-test/javascript/README.md +++ b/samples/client/petstore-security-test/javascript/README.md @@ -1,12 +1,12 @@ -# swagger_petstore____end____rn_n_r +# open_api_petstore____end____rn_n_r -SwaggerPetstoreEndRnNR - JavaScript client for swagger_petstore____end____rn_n_r +OpenApiPetstoreEndRnNR - JavaScript client for open_api_petstore____end____rn_n_r This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- -This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project: +This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r - Package version: 1.0.0 *_/ =end -- \r\n \n \r -- Build package: io.swagger.codegen.languages.JavascriptClientCodegen +- Build package: org.openapitools.codegen.languages.JavascriptClientCodegen ## Installation @@ -20,7 +20,7 @@ please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.co Then install it via: ```shell -npm install swagger_petstore____end____rn_n_r --save +npm install open_api_petstore____end____rn_n_r --save ``` ##### Local development @@ -38,13 +38,13 @@ Next, [link](https://docs.npmjs.com/cli/link) it globally in npm with the follow npm link ``` -Finally, switch to the directory you want to use your swagger_petstore____end____rn_n_r from, and run: +Finally, switch to the directory you want to use your open_api_petstore____end____rn_n_r from, and run: ```shell npm link /path/to/ ``` -You should now be able to `require('swagger_petstore____end____rn_n_r')` in javascript files from the directory you ran the last +You should now be able to `require('open_api_petstore____end____rn_n_r')` in javascript files from the directory you ran the last command above from. #### git @@ -93,12 +93,11 @@ module: { Please follow the [installation](#installation) instruction and execute the following JS code: ```javascript -var SwaggerPetstoreEndRnNR = require('swagger_petstore____end____rn_n_r'); +var OpenApiPetstoreEndRnNR = require('open_api_petstore____end____rn_n_r'); -var api = new SwaggerPetstoreEndRnNR.FakeApi() - -var opts = { - 'testCodeInjectEndRnNR': "testCodeInjectEndRnNR_example" // {String} To test code injection *_/ ' \" =end -- \\r\\n \\n \\r +var api = new OpenApiPetstoreEndRnNR.FakeApi() +var opts = { + 'UNKNOWN_BASE_TYPE': new OpenApiPetstoreEndRnNR.UNKNOWN_BASE_TYPE() // {UNKNOWN_BASE_TYPE} }; var callback = function(error, data, response) { @@ -114,16 +113,16 @@ api.testCodeInjectEndRnNR(opts, callback); ## Documentation for API Endpoints -All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* +All URIs are relative to *http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*SwaggerPetstoreEndRnNR.FakeApi* | [**testCodeInjectEndRnNR**](docs/FakeApi.md#testCodeInjectEndRnNR) | **PUT** /fake | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r +*OpenApiPetstoreEndRnNR.FakeApi* | [**testCodeInjectEndRnNR**](docs/FakeApi.md#testCodeInjectEndRnNR) | **PUT** /fake | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r ## Documentation for Models - - [SwaggerPetstoreEndRnNR.ModelReturn](docs/ModelReturn.md) + - [OpenApiPetstoreEndRnNR.ModelReturn](docs/ModelReturn.md) ## Documentation for Authorization diff --git a/samples/client/petstore-security-test/javascript/docs/FakeApi.md b/samples/client/petstore-security-test/javascript/docs/FakeApi.md index 61b58cf72a97..de667cca9624 100644 --- a/samples/client/petstore-security-test/javascript/docs/FakeApi.md +++ b/samples/client/petstore-security-test/javascript/docs/FakeApi.md @@ -1,6 +1,6 @@ -# SwaggerPetstoreEndRnNR.FakeApi +# OpenApiPetstoreEndRnNR.FakeApi -All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* +All URIs are relative to *http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* Method | HTTP request | Description ------------- | ------------- | ------------- @@ -13,16 +13,16 @@ Method | HTTP request | Description To test code injection *_/ ' \" =end -- \\r\\n \\n \\r +To test code injection *_/ ' \" =end -- \\r\\n \\n \\r + ### Example ```javascript -var SwaggerPetstoreEndRnNR = require('swagger_petstore____end____rn_n_r'); +var OpenApiPetstoreEndRnNR = require('open_api_petstore____end____rn_n_r'); -var apiInstance = new SwaggerPetstoreEndRnNR.FakeApi(); - -var opts = { - 'testCodeInjectEndRnNR': "testCodeInjectEndRnNR_example" // String | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r +var apiInstance = new OpenApiPetstoreEndRnNR.FakeApi(); +var opts = { + 'UNKNOWN_BASE_TYPE': new OpenApiPetstoreEndRnNR.UNKNOWN_BASE_TYPE() // UNKNOWN_BASE_TYPE | }; - var callback = function(error, data, response) { if (error) { console.error(error); @@ -37,7 +37,7 @@ apiInstance.testCodeInjectEndRnNR(opts, callback); Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **testCodeInjectEndRnNR** | **String**| To test code injection *_/ ' \" =end -- \\r\\n \\n \\r | [optional] + **UNKNOWN_BASE_TYPE** | [**UNKNOWN_BASE_TYPE**](UNKNOWN_BASE_TYPE.md)| | [optional] ### Return type @@ -50,5 +50,5 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json, *_/ =end -- - - **Accept**: application/json, *_/ =end -- + - **Accept**: Not defined diff --git a/samples/client/petstore-security-test/javascript/docs/ModelReturn.md b/samples/client/petstore-security-test/javascript/docs/ModelReturn.md index e542020a95c8..1ccf256e4e7d 100644 --- a/samples/client/petstore-security-test/javascript/docs/ModelReturn.md +++ b/samples/client/petstore-security-test/javascript/docs/ModelReturn.md @@ -1,4 +1,4 @@ -# SwaggerPetstoreEndRnNR.ModelReturn +# OpenApiPetstoreEndRnNR.ModelReturn ## Properties Name | Type | Description | Notes diff --git a/samples/client/petstore-security-test/javascript/git_push.sh b/samples/client/petstore-security-test/javascript/git_push.sh index 0d041ad0ba49..04dd5df38e83 100644 --- a/samples/client/petstore-security-test/javascript/git_push.sh +++ b/samples/client/petstore-security-test/javascript/git_push.sh @@ -1,7 +1,7 @@ #!/bin/sh # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # -# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update" +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" git_user_id=$1 git_repo_id=$2 diff --git a/samples/client/petstore-security-test/javascript/package.json b/samples/client/petstore-security-test/javascript/package.json index 9fae64eb6469..d045d120e0ec 100644 --- a/samples/client/petstore-security-test/javascript/package.json +++ b/samples/client/petstore-security-test/javascript/package.json @@ -1,5 +1,5 @@ { - "name": "swagger_petstore____end____rn_n_r", + "name": "open_api_petstore____end____rn_n_r", "version": "1.0.0 *_/ =end -- \r\n \n \r", "description": "This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters_______end______", "license": "Apache-2.0 */ ' " =end -- \r\n \n \r", @@ -11,7 +11,7 @@ "fs": false }, "dependencies": { - "superagent": "3.5.2" + "superagent": "3.7.0" }, "devDependencies": { "mocha": "~2.3.4", diff --git a/samples/client/petstore-security-test/javascript/src/ApiClient.js b/samples/client/petstore-security-test/javascript/src/ApiClient.js index 193dcfa683b1..cbcd2ce4c391 100644 --- a/samples/client/petstore-security-test/javascript/src/ApiClient.js +++ b/samples/client/petstore-security-test/javascript/src/ApiClient.js @@ -1,14 +1,14 @@ /** - * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r + * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- * * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r - * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r + * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * - * Swagger Codegen version: 2.3.0-SNAPSHOT + * OpenAPI Generator version: 3.2.0-SNAPSHOT * * Do not edit the class manually. * @@ -23,10 +23,10 @@ module.exports = factory(require('superagent'), require('querystring')); } else { // Browser globals (root is window) - if (!root.SwaggerPetstoreEndRnNR) { - root.SwaggerPetstoreEndRnNR = {}; + if (!root.OpenApiPetstoreEndRnNR) { + root.OpenApiPetstoreEndRnNR = {}; } - root.SwaggerPetstoreEndRnNR.ApiClient = factory(root.superagent, root.querystring); + root.OpenApiPetstoreEndRnNR.ApiClient = factory(root.superagent, root.querystring); } }(this, function(superagent, querystring) { 'use strict'; @@ -47,9 +47,9 @@ /** * The base URL against which to resolve every API call's (relative) path. * @type {String} - * @default https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r + * @default http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r */ - this.basePath = 'https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r'.replace(/\/+$/, ''); + this.basePath = 'http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r'.replace(/\/+$/, ''); /** * The authentication methods to be included for all API calls. @@ -96,6 +96,10 @@ this.agent = new superagent.agent(); } + /* + * Allow user to override superagent agent + */ + this.requestAgent = null; }; /** @@ -413,6 +417,12 @@ // set header parameters request.set(this.defaultHeaders).set(this.normalizeParams(headerParams)); + + // set requestAgent if it is set by user + if (this.requestAgent) { + request.agent(this.requestAgent); + } + // set request timeout request.timeout(this.timeout); diff --git a/samples/client/petstore-security-test/javascript/src/api/FakeApi.js b/samples/client/petstore-security-test/javascript/src/api/FakeApi.js index 32e2c7ea1ec7..e7fdb205e7ef 100644 --- a/samples/client/petstore-security-test/javascript/src/api/FakeApi.js +++ b/samples/client/petstore-security-test/javascript/src/api/FakeApi.js @@ -1,14 +1,14 @@ /** - * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r + * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- * * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r - * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r + * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * - * Swagger Codegen version: 2.3.0-SNAPSHOT + * OpenAPI Generator version: 3.2.0-SNAPSHOT * * Do not edit the class manually. * @@ -17,18 +17,18 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient'], factory); + define(['ApiClient', 'model/UNKNOWN_BASE_TYPE'], factory); } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient')); + module.exports = factory(require('../ApiClient'), require('../model/UNKNOWN_BASE_TYPE')); } else { // Browser globals (root is window) - if (!root.SwaggerPetstoreEndRnNR) { - root.SwaggerPetstoreEndRnNR = {}; + if (!root.OpenApiPetstoreEndRnNR) { + root.OpenApiPetstoreEndRnNR = {}; } - root.SwaggerPetstoreEndRnNR.FakeApi = factory(root.SwaggerPetstoreEndRnNR.ApiClient); + root.OpenApiPetstoreEndRnNR.FakeApi = factory(root.OpenApiPetstoreEndRnNR.ApiClient, root.OpenApiPetstoreEndRnNR.UNKNOWN_BASE_TYPE); } -}(this, function(ApiClient) { +}(this, function(ApiClient, UNKNOWN_BASE_TYPE) { 'use strict'; /** @@ -57,14 +57,15 @@ */ /** + * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r * @param {Object} opts Optional parameters - * @param {String} opts.testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r + * @param {module:model/UNKNOWN_BASE_TYPE} opts.UNKNOWN_BASE_TYPE * @param {module:api/FakeApi~testCodeInjectEndRnNRCallback} callback The callback function, accepting three arguments: error, data, response */ this.testCodeInjectEndRnNR = function(opts, callback) { opts = opts || {}; - var postBody = null; + var postBody = opts['UNKNOWN_BASE_TYPE']; var pathParams = { @@ -76,12 +77,11 @@ var headerParams = { }; var formParams = { - 'test code inject */ ' " =end -- \r\n \n \r': opts['testCodeInjectEndRnNR'] }; var authNames = []; var contentTypes = ['application/json', '*_/ =end -- ']; - var accepts = ['application/json', '*_/ =end -- ']; + var accepts = []; var returnType = null; return this.apiClient.callApi( diff --git a/samples/client/petstore-security-test/javascript/src/index.js b/samples/client/petstore-security-test/javascript/src/index.js index 4da0fef98eac..8006be061a2a 100644 --- a/samples/client/petstore-security-test/javascript/src/index.js +++ b/samples/client/petstore-security-test/javascript/src/index.js @@ -1,14 +1,14 @@ /** - * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r + * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- * * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r - * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r + * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * - * Swagger Codegen version: 2.3.0-SNAPSHOT + * OpenAPI Generator version: 3.2.0-SNAPSHOT * * Do not edit the class manually. * @@ -31,9 +31,9 @@ *

* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following: * 

-   * var SwaggerPetstoreEndRnNR = require('index'); // See note below*.
-   * var xxxSvc = new SwaggerPetstoreEndRnNR.XxxApi(); // Allocate the API class we're going to use.
-   * var yyyModel = new SwaggerPetstoreEndRnNR.Yyy(); // Construct a model instance.
+   * var OpenApiPetstoreEndRnNR = require('index'); // See note below*.
+   * var xxxSvc = new OpenApiPetstoreEndRnNR.XxxApi(); // Allocate the API class we're going to use.
+   * var yyyModel = new OpenApiPetstoreEndRnNR.Yyy(); // Construct a model instance.
    * yyyModel.someProperty = 'someValue';
    * ...
    * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
@@ -45,8 +45,8 @@
    * 

    * A non-AMD browser application (discouraged) might do something like this:
    * 
-   * var xxxSvc = new SwaggerPetstoreEndRnNR.XxxApi(); // Allocate the API class we're going to use.
-   * var yyy = new SwaggerPetstoreEndRnNR.Yyy(); // Construct a model instance.
+   * var xxxSvc = new OpenApiPetstoreEndRnNR.XxxApi(); // Allocate the API class we're going to use.
+   * var yyy = new OpenApiPetstoreEndRnNR.Yyy(); // Construct a model instance.
    * yyyModel.someProperty = 'someValue';
    * ...
    * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
diff --git a/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js b/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js
index 6e9c1fd3c72a..a8865e7e0df9 100644
--- a/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js
@@ -1,14 +1,14 @@
 /**
- * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
  *
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
- * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -23,10 +23,10 @@
     module.exports = factory(require('../ApiClient'));
   } else {
     // Browser globals (root is window)
-    if (!root.SwaggerPetstoreEndRnNR) {
-      root.SwaggerPetstoreEndRnNR = {};
+    if (!root.OpenApiPetstoreEndRnNR) {
+      root.OpenApiPetstoreEndRnNR = {};
     }
-    root.SwaggerPetstoreEndRnNR.ModelReturn = factory(root.SwaggerPetstoreEndRnNR.ApiClient);
+    root.OpenApiPetstoreEndRnNR.ModelReturn = factory(root.OpenApiPetstoreEndRnNR.ApiClient);
   }
 }(this, function(ApiClient) {
   'use strict';
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
index 1c00c5181548..14900cee60e8 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-es6/README.md b/samples/client/petstore/javascript-es6/README.md
index 9503c4fd15ae..7674da7bb398 100644
--- a/samples/client/petstore/javascript-es6/README.md
+++ b/samples/client/petstore/javascript-es6/README.md
@@ -80,7 +80,7 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.testSpecialTags(client, callback);
+api.call123testSpecialTags(client, callback);
 
 ```
 
@@ -90,11 +90,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*OpenApiPetstore.AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*OpenApiPetstore.AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 *OpenApiPetstore.FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 *OpenApiPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -110,6 +111,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *OpenApiPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *OpenApiPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*OpenApiPetstore.PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *OpenApiPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *OpenApiPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *OpenApiPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -142,6 +144,8 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.EnumArrays](docs/EnumArrays.md)
  - [OpenApiPetstore.EnumClass](docs/EnumClass.md)
  - [OpenApiPetstore.EnumTest](docs/EnumTest.md)
+ - [OpenApiPetstore.File](docs/File.md)
+ - [OpenApiPetstore.FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.List](docs/List.md)
@@ -157,6 +161,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [OpenApiPetstore.StringBooleanMap](docs/StringBooleanMap.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
 
diff --git a/samples/client/petstore/javascript-es6/docs/AnotherFakeApi.md b/samples/client/petstore/javascript-es6/docs/AnotherFakeApi.md
index c70f1769bf62..efd102e1ab31 100644
--- a/samples/client/petstore/javascript-es6/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/AnotherFakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
-# **testSpecialTags**
-> Client testSpecialTags(client)
+
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```javascript
@@ -21,7 +21,7 @@ import OpenApiPetstore from 'open_api_petstore';
 
 let apiInstance = new OpenApiPetstore.AnotherFakeApi();
 let client = new OpenApiPetstore.Client(); // Client | client model
-apiInstance.testSpecialTags(client, (error, data, response) => {
+apiInstance.call123testSpecialTags(client, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index 3327bfce4e6f..b51de14ceaa5 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -192,6 +193,48 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
+# **testBodyWithFileSchema**
+> testBodyWithFileSchema(fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+
+let apiInstance = new OpenApiPetstore.FakeApi();
+let fileSchemaTestClass = new OpenApiPetstore.FileSchemaTestClass(); // FileSchemaTestClass | 
+apiInstance.testBodyWithFileSchema(fileSchemaTestClass, (error, data, response) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+});
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
 
 # **testBodyWithQueryParams**
 > testBodyWithQueryParams(query, user)
diff --git a/samples/client/petstore/javascript-es6/docs/File.md b/samples/client/petstore/javascript-es6/docs/File.md
new file mode 100644
index 000000000000..a34d76a3e46e
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/File.md
@@ -0,0 +1,8 @@
+# OpenApiPetstore.File
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**sourceURI** | **String** | Test capitalization | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-es6/docs/FileSchemaTestClass.md b/samples/client/petstore/javascript-es6/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..3ccb4162dcc1
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/FileSchemaTestClass.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.FileSchemaTestClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | **File** |  | [optional] 
+**files** | **[File]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-es6/docs/MapTest.md b/samples/client/petstore/javascript-es6/docs/MapTest.md
index 4a128da00fd0..f1075bf0681f 100644
--- a/samples/client/petstore/javascript-es6/docs/MapTest.md
+++ b/samples/client/petstore/javascript-es6/docs/MapTest.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
+**directMap** | **{String: Boolean}** |  | [optional] 
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
 
 
 
diff --git a/samples/client/petstore/javascript-es6/docs/PetApi.md b/samples/client/petstore/javascript-es6/docs/PetApi.md
index 324ecfbe867a..76dabe26aed6 100644
--- a/samples/client/petstore/javascript-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-es6/docs/PetApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
@@ -398,3 +399,54 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
+# **uploadFileWithRequiredFile**
+> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, opts)
+
+uploads an image (required)
+
+### Example
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+let defaultClient = OpenApiPetstore.ApiClient.instance;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+let petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
+
+let apiInstance = new OpenApiPetstore.PetApi();
+let petId = 789; // Number | ID of pet to update
+let requiredFile = "/path/to/file"; // File | file to upload
+let opts = {
+  'additionalMetadata': "additionalMetadata_example" // String | Additional data to pass to server
+};
+apiInstance.uploadFileWithRequiredFile(petId, requiredFile, opts, (error, data, response) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+});
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Number**| ID of pet to update | 
+ **requiredFile** | **File**| file to upload | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
diff --git a/samples/client/petstore/javascript-es6/docs/StringBooleanMap.md b/samples/client/petstore/javascript-es6/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..195a7d57677f
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/StringBooleanMap.md
@@ -0,0 +1,7 @@
+# OpenApiPetstore.StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript-es6/package.json b/samples/client/petstore/javascript-es6/package.json
index df2fea63d600..b10b73e80a3f 100644
--- a/samples/client/petstore/javascript-es6/package.json
+++ b/samples/client/petstore/javascript-es6/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "babel": "^6.23.0",
     "babel-cli": "^6.26.0",
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "babel-core": "6.26.0",
diff --git a/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js
index 601a54725e33..6b7e708a5682 100644
--- a/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js
@@ -35,8 +35,8 @@ export default class AnotherFakeApi {
 
 
     /**
-     * Callback function to receive the result of the testSpecialTags operation.
-     * @callback module:api/AnotherFakeApi~testSpecialTagsCallback
+     * Callback function to receive the result of the call123testSpecialTags operation.
+     * @callback module:api/AnotherFakeApi~call123testSpecialTagsCallback
      * @param {String} error Error message, if any.
      * @param {module:model/Client} data The data returned by the service call.
      * @param {String} response The complete HTTP response.
@@ -44,17 +44,17 @@ export default class AnotherFakeApi {
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
-     * @param {module:api/AnotherFakeApi~testSpecialTagsCallback} callback The callback function, accepting three arguments: error, data, response
+     * @param {module:api/AnotherFakeApi~call123testSpecialTagsCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Client}
      */
-    testSpecialTags(client, callback) {
+    call123testSpecialTags(client, callback) {
       let postBody = client;
 
       // verify the required parameter 'client' is set
       if (client === undefined || client === null) {
-        throw new Error("Missing the required parameter 'client' when calling testSpecialTags");
+        throw new Error("Missing the required parameter 'client' when calling call123testSpecialTags");
       }
 
 
diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
index 725872e09963..b559f3607816 100644
--- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
@@ -14,6 +14,7 @@
 
 import ApiClient from "../ApiClient";
 import Client from '../model/Client';
+import FileSchemaTestClass from '../model/FileSchemaTestClass';
 import OuterComposite from '../model/OuterComposite';
 import User from '../model/User';
 
@@ -200,6 +201,49 @@ export default class FakeApi {
       );
     }
 
+    /**
+     * Callback function to receive the result of the testBodyWithFileSchema operation.
+     * @callback module:api/FakeApi~testBodyWithFileSchemaCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @param {module:api/FakeApi~testBodyWithFileSchemaCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    testBodyWithFileSchema(fileSchemaTestClass, callback) {
+      let postBody = fileSchemaTestClass;
+
+      // verify the required parameter 'fileSchemaTestClass' is set
+      if (fileSchemaTestClass === undefined || fileSchemaTestClass === null) {
+        throw new Error("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema");
+      }
+
+
+      let pathParams = {
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+      };
+
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = [];
+      let returnType = null;
+
+      return this.apiClient.callApi(
+        '/fake/body-with-file-schema', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
     /**
      * Callback function to receive the result of the testBodyWithQueryParams operation.
      * @callback module:api/FakeApi~testBodyWithQueryParamsCallback
diff --git a/samples/client/petstore/javascript-es6/src/api/PetApi.js b/samples/client/petstore/javascript-es6/src/api/PetApi.js
index d6b39c8671b8..e55f6d26020a 100644
--- a/samples/client/petstore/javascript-es6/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/PetApi.js
@@ -408,5 +408,61 @@ export default class PetApi {
       );
     }
 
+    /**
+     * Callback function to receive the result of the uploadFileWithRequiredFile operation.
+     * @callback module:api/PetApi~uploadFileWithRequiredFileCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/ApiResponse} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @param {module:api/PetApi~uploadFileWithRequiredFileCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {@link module:model/ApiResponse}
+     */
+    uploadFileWithRequiredFile(petId, requiredFile, opts, callback) {
+      opts = opts || {};
+      let postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId === undefined || petId === null) {
+        throw new Error("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+      }
+
+      // verify the required parameter 'requiredFile' is set
+      if (requiredFile === undefined || requiredFile === null) {
+        throw new Error("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+      }
+
+
+      let pathParams = {
+        'petId': petId
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'requiredFile': requiredFile
+      };
+
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['multipart/form-data'];
+      let accepts = ['application/json'];
+      let returnType = ApiResponse;
+
+      return this.apiClient.callApi(
+        '/fake/{petId}/uploadImageWithRequiredFile', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
 
 }
diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
index 95bcba6b5d54..c3ca07e4c4c7 100644
--- a/samples/client/petstore/javascript-es6/src/index.js
+++ b/samples/client/petstore/javascript-es6/src/index.js
@@ -29,6 +29,8 @@ import Dog from './model/Dog';
 import EnumArrays from './model/EnumArrays';
 import EnumClass from './model/EnumClass';
 import EnumTest from './model/EnumTest';
+import File from './model/File';
+import FileSchemaTestClass from './model/FileSchemaTestClass';
 import FormatTest from './model/FormatTest';
 import HasOnlyReadOnly from './model/HasOnlyReadOnly';
 import List from './model/List';
@@ -44,6 +46,7 @@ import OuterEnum from './model/OuterEnum';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
 import SpecialModelName from './model/SpecialModelName';
+import StringBooleanMap from './model/StringBooleanMap';
 import Tag from './model/Tag';
 import User from './model/User';
 import AnotherFakeApi from './api/AnotherFakeApi';
@@ -188,6 +191,18 @@ export {
      */
     EnumTest,
 
+    /**
+     * The File model constructor.
+     * @property {module:model/File}
+     */
+    File,
+
+    /**
+     * The FileSchemaTestClass model constructor.
+     * @property {module:model/FileSchemaTestClass}
+     */
+    FileSchemaTestClass,
+
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
@@ -278,6 +293,12 @@ export {
      */
     SpecialModelName,
 
+    /**
+     * The StringBooleanMap model constructor.
+     * @property {module:model/StringBooleanMap}
+     */
+    StringBooleanMap,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
diff --git a/samples/client/petstore/javascript-es6/src/model/File.js b/samples/client/petstore/javascript-es6/src/model/File.js
new file mode 100644
index 000000000000..e29e1a0309f1
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/src/model/File.js
@@ -0,0 +1,73 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The File model module.
+ * @module model/File
+ * @version 1.0.0
+ */
+class File {
+    /**
+     * Constructs a new File.
+     * Must be named `File` for test.
+     * @alias module:model/File
+     */
+    constructor() { 
+        
+        File.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a File from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/File} obj Optional instance to populate.
+     * @return {module:model/File} The populated File instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new File();
+
+            if (data.hasOwnProperty('sourceURI')) {
+                obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * Test capitalization
+ * @member {String} sourceURI
+ */
+File.prototype['sourceURI'] = undefined;
+
+
+
+
+
+
+export default File;
+
diff --git a/samples/client/petstore/javascript-es6/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-es6/src/model/FileSchemaTestClass.js
new file mode 100644
index 000000000000..b4be63df0e68
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/src/model/FileSchemaTestClass.js
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The FileSchemaTestClass model module.
+ * @module model/FileSchemaTestClass
+ * @version 1.0.0
+ */
+class FileSchemaTestClass {
+    /**
+     * Constructs a new FileSchemaTestClass.
+     * @alias module:model/FileSchemaTestClass
+     */
+    constructor() { 
+        
+        FileSchemaTestClass.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a FileSchemaTestClass from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/FileSchemaTestClass} obj Optional instance to populate.
+     * @return {module:model/FileSchemaTestClass} The populated FileSchemaTestClass instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new FileSchemaTestClass();
+
+            if (data.hasOwnProperty('file')) {
+                obj['file'] = File.constructFromObject(data['file']);
+            }
+            if (data.hasOwnProperty('files')) {
+                obj['files'] = ApiClient.convertToType(data['files'], [File]);
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {File} file
+ */
+FileSchemaTestClass.prototype['file'] = undefined;
+
+/**
+ * @member {Array.} files
+ */
+FileSchemaTestClass.prototype['files'] = undefined;
+
+
+
+
+
+
+export default FileSchemaTestClass;
+
diff --git a/samples/client/petstore/javascript-es6/src/model/MapTest.js b/samples/client/petstore/javascript-es6/src/model/MapTest.js
index 8cc6640c9d4f..31c37d601cec 100644
--- a/samples/client/petstore/javascript-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/MapTest.js
@@ -12,6 +12,7 @@
  */
 
 import ApiClient from '../ApiClient';
+import StringBooleanMap from './StringBooleanMap';
 
 /**
  * The MapTest model module.
@@ -53,6 +54,12 @@ class MapTest {
             if (data.hasOwnProperty('map_of_enum_string')) {
                 obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
             }
+            if (data.hasOwnProperty('direct_map')) {
+                obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
+            }
+            if (data.hasOwnProperty('indirect_map')) {
+                obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+            }
         }
         return obj;
     }
@@ -70,6 +77,16 @@ MapTest.prototype['map_map_of_string'] = undefined;
  */
 MapTest.prototype['map_of_enum_string'] = undefined;
 
+/**
+ * @member {Object.} direct_map
+ */
+MapTest.prototype['direct_map'] = undefined;
+
+/**
+ * @member {module:model/StringBooleanMap} indirect_map
+ */
+MapTest.prototype['indirect_map'] = undefined;
+
 
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterComposite.js b/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
index 8b61cb8f654b..ba597462eec6 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
@@ -48,13 +48,13 @@ class OuterComposite {
             obj = obj || new OuterComposite();
 
             if (data.hasOwnProperty('my_number')) {
-                obj['my_number'] = 'Number'.constructFromObject(data['my_number']);
+                obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
             }
             if (data.hasOwnProperty('my_string')) {
-                obj['my_string'] = 'String'.constructFromObject(data['my_string']);
+                obj['my_string'] = ApiClient.convertToType(data['my_string'], 'String');
             }
             if (data.hasOwnProperty('my_boolean')) {
-                obj['my_boolean'] = 'Boolean'.constructFromObject(data['my_boolean']);
+                obj['my_boolean'] = ApiClient.convertToType(data['my_boolean'], 'Boolean');
             }
         }
         return obj;
diff --git a/samples/client/petstore/javascript-es6/src/model/StringBooleanMap.js b/samples/client/petstore/javascript-es6/src/model/StringBooleanMap.js
new file mode 100644
index 000000000000..30172b33f7b9
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/src/model/StringBooleanMap.js
@@ -0,0 +1,67 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The StringBooleanMap model module.
+ * @module model/StringBooleanMap
+ * @version 1.0.0
+ */
+class StringBooleanMap {
+    /**
+     * Constructs a new StringBooleanMap.
+     * @alias module:model/StringBooleanMap
+     * @extends Object
+     */
+    constructor() { 
+        
+        StringBooleanMap.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a StringBooleanMap from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/StringBooleanMap} obj Optional instance to populate.
+     * @return {module:model/StringBooleanMap} The populated StringBooleanMap instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new StringBooleanMap();
+
+            ApiClient.constructFromObject(data, obj, 'Boolean');
+            
+
+        }
+        return obj;
+    }
+
+
+}
+
+
+
+
+
+
+export default StringBooleanMap;
+
diff --git a/samples/client/petstore/javascript-es6/test/model/File.spec.js b/samples/client/petstore/javascript-es6/test/model/File.spec.js
new file mode 100644
index 000000000000..10666dc53c7c
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/test/model/File.spec.js
@@ -0,0 +1,65 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.File();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('File', function() {
+    it('should create an instance of File', function() {
+      // uncomment below and update the code to test File
+      //var instane = new OpenApiPetstore.File();
+      //expect(instance).to.be.a(OpenApiPetstore.File);
+    });
+
+    it('should have the property sourceURI (base name: "sourceURI")', function() {
+      // uncomment below and update the code to test the property sourceURI
+      //var instane = new OpenApiPetstore.File();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-es6/test/model/FileSchemaTestClass.spec.js b/samples/client/petstore/javascript-es6/test/model/FileSchemaTestClass.spec.js
new file mode 100644
index 000000000000..d6e49689d232
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/test/model/FileSchemaTestClass.spec.js
@@ -0,0 +1,71 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FileSchemaTestClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FileSchemaTestClass', function() {
+    it('should create an instance of FileSchemaTestClass', function() {
+      // uncomment below and update the code to test FileSchemaTestClass
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be.a(OpenApiPetstore.FileSchemaTestClass);
+    });
+
+    it('should have the property file (base name: "file")', function() {
+      // uncomment below and update the code to test the property file
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property files (base name: "files")', function() {
+      // uncomment below and update the code to test the property files
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-es6/test/model/StringBooleanMap.spec.js b/samples/client/petstore/javascript-es6/test/model/StringBooleanMap.spec.js
new file mode 100644
index 000000000000..0fd499cc819e
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/test/model/StringBooleanMap.spec.js
@@ -0,0 +1,59 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StringBooleanMap();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StringBooleanMap', function() {
+    it('should create an instance of StringBooleanMap', function() {
+      // uncomment below and update the code to test StringBooleanMap
+      //var instane = new OpenApiPetstore.StringBooleanMap();
+      //expect(instance).to.be.a(OpenApiPetstore.StringBooleanMap);
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
index 1c00c5181548..14900cee60e8 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise-es6/README.md b/samples/client/petstore/javascript-promise-es6/README.md
index fa41841dab26..46b329b1bc4c 100644
--- a/samples/client/petstore/javascript-promise-es6/README.md
+++ b/samples/client/petstore/javascript-promise-es6/README.md
@@ -73,7 +73,7 @@ var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.AnotherFakeApi()
 var client = new OpenApiPetstore.Client(); // {Client} client model
-api.testSpecialTags(client).then(function(data) {
+api.call123testSpecialTags(client).then(function(data) {
   console.log('API called successfully. Returned data: ' + data);
 }, function(error) {
   console.error(error);
@@ -88,11 +88,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*OpenApiPetstore.AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*OpenApiPetstore.AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 *OpenApiPetstore.FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 *OpenApiPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -108,6 +109,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *OpenApiPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *OpenApiPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*OpenApiPetstore.PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *OpenApiPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *OpenApiPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *OpenApiPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -140,6 +142,8 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.EnumArrays](docs/EnumArrays.md)
  - [OpenApiPetstore.EnumClass](docs/EnumClass.md)
  - [OpenApiPetstore.EnumTest](docs/EnumTest.md)
+ - [OpenApiPetstore.File](docs/File.md)
+ - [OpenApiPetstore.FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.List](docs/List.md)
@@ -155,6 +159,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [OpenApiPetstore.StringBooleanMap](docs/StringBooleanMap.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/AnotherFakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/AnotherFakeApi.md
index 2eccfe5f4798..74ad8b2f00c2 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/AnotherFakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
-# **testSpecialTags**
-> Client testSpecialTags(client)
+
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```javascript
@@ -21,7 +21,7 @@ import OpenApiPetstore from 'open_api_petstore';
 
 let apiInstance = new OpenApiPetstore.AnotherFakeApi();
 let client = new OpenApiPetstore.Client(); // Client | client model
-apiInstance.testSpecialTags(client).then((data) => {
+apiInstance.call123testSpecialTags(client).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
 }, (error) => {
   console.error(error);
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index 8a2a57c8b669..bb62b487674a 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -188,6 +189,47 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
+# **testBodyWithFileSchema**
+> testBodyWithFileSchema(fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+
+let apiInstance = new OpenApiPetstore.FakeApi();
+let fileSchemaTestClass = new OpenApiPetstore.FileSchemaTestClass(); // FileSchemaTestClass | 
+apiInstance.testBodyWithFileSchema(fileSchemaTestClass).then(() => {
+  console.log('API called successfully.');
+}, (error) => {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
 
 # **testBodyWithQueryParams**
 > testBodyWithQueryParams(query, user)
diff --git a/samples/client/petstore/javascript-promise-es6/docs/File.md b/samples/client/petstore/javascript-promise-es6/docs/File.md
new file mode 100644
index 000000000000..a34d76a3e46e
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/File.md
@@ -0,0 +1,8 @@
+# OpenApiPetstore.File
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**sourceURI** | **String** | Test capitalization | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FileSchemaTestClass.md b/samples/client/petstore/javascript-promise-es6/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..3ccb4162dcc1
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/FileSchemaTestClass.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.FileSchemaTestClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | **File** |  | [optional] 
+**files** | **[File]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/docs/MapTest.md b/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
index 4a128da00fd0..f1075bf0681f 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
+**directMap** | **{String: Boolean}** |  | [optional] 
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
 
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
index 3a402233a9ec..1978431440fe 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
@@ -390,3 +391,53 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
+# **uploadFileWithRequiredFile**
+> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, opts)
+
+uploads an image (required)
+
+### Example
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+let defaultClient = OpenApiPetstore.ApiClient.instance;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+let petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
+
+let apiInstance = new OpenApiPetstore.PetApi();
+let petId = 789; // Number | ID of pet to update
+let requiredFile = "/path/to/file"; // File | file to upload
+let opts = {
+  'additionalMetadata': "additionalMetadata_example" // String | Additional data to pass to server
+};
+apiInstance.uploadFileWithRequiredFile(petId, requiredFile, opts).then((data) => {
+  console.log('API called successfully. Returned data: ' + data);
+}, (error) => {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Number**| ID of pet to update | 
+ **requiredFile** | **File**| file to upload | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
diff --git a/samples/client/petstore/javascript-promise-es6/docs/StringBooleanMap.md b/samples/client/petstore/javascript-promise-es6/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..195a7d57677f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/StringBooleanMap.md
@@ -0,0 +1,7 @@
+# OpenApiPetstore.StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/package.json b/samples/client/petstore/javascript-promise-es6/package.json
index df2fea63d600..b10b73e80a3f 100644
--- a/samples/client/petstore/javascript-promise-es6/package.json
+++ b/samples/client/petstore/javascript-promise-es6/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "babel": "^6.23.0",
     "babel-cli": "^6.26.0",
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "babel-core": "6.26.0",
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/AnotherFakeApi.js
index a9a409d6336a..17dc83517bbb 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/AnotherFakeApi.js
@@ -37,16 +37,16 @@ export default class AnotherFakeApi {
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Client} and HTTP response
      */
-    testSpecialTagsWithHttpInfo(client) {
+    call123testSpecialTagsWithHttpInfo(client) {
       let postBody = client;
 
       // verify the required parameter 'client' is set
       if (client === undefined || client === null) {
-        throw new Error("Missing the required parameter 'client' when calling testSpecialTags");
+        throw new Error("Missing the required parameter 'client' when calling call123testSpecialTags");
       }
 
 
@@ -73,12 +73,12 @@ export default class AnotherFakeApi {
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Client}
      */
-    testSpecialTags(client) {
-      return this.testSpecialTagsWithHttpInfo(client)
+    call123testSpecialTags(client) {
+      return this.call123testSpecialTagsWithHttpInfo(client)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
index 87cfae006597..63650ef631b1 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
@@ -14,6 +14,7 @@
 
 import ApiClient from "../ApiClient";
 import Client from '../model/Client';
+import FileSchemaTestClass from '../model/FileSchemaTestClass';
 import OuterComposite from '../model/OuterComposite';
 import User from '../model/User';
 
@@ -221,6 +222,54 @@ export default class FakeApi {
     }
 
 
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
+     */
+    testBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass) {
+      let postBody = fileSchemaTestClass;
+
+      // verify the required parameter 'fileSchemaTestClass' is set
+      if (fileSchemaTestClass === undefined || fileSchemaTestClass === null) {
+        throw new Error("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema");
+      }
+
+
+      let pathParams = {
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+      };
+
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = [];
+      let returnType = null;
+
+      return this.apiClient.callApi(
+        '/fake/body-with-file-schema', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}
+     */
+    testBodyWithFileSchema(fileSchemaTestClass) {
+      return this.testBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass)
+        .then(function(response_and_data) {
+          return response_and_data.data;
+        });
+    }
+
+
     /**
      * @param {String} query 
      * @param {module:model/User} user 
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
index a8a8d91c9502..cd180e898eb8 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
@@ -456,4 +456,67 @@ export default class PetApi {
     }
 
 
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/ApiResponse} and HTTP response
+     */
+    uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, opts) {
+      opts = opts || {};
+      let postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId === undefined || petId === null) {
+        throw new Error("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+      }
+
+      // verify the required parameter 'requiredFile' is set
+      if (requiredFile === undefined || requiredFile === null) {
+        throw new Error("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+      }
+
+
+      let pathParams = {
+        'petId': petId
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'requiredFile': requiredFile
+      };
+
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['multipart/form-data'];
+      let accepts = ['application/json'];
+      let returnType = ApiResponse;
+
+      return this.apiClient.callApi(
+        '/fake/{petId}/uploadImageWithRequiredFile', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/ApiResponse}
+     */
+    uploadFileWithRequiredFile(petId, requiredFile, opts) {
+      return this.uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, opts)
+        .then(function(response_and_data) {
+          return response_and_data.data;
+        });
+    }
+
+
 }
diff --git a/samples/client/petstore/javascript-promise-es6/src/index.js b/samples/client/petstore/javascript-promise-es6/src/index.js
index 95bcba6b5d54..c3ca07e4c4c7 100644
--- a/samples/client/petstore/javascript-promise-es6/src/index.js
+++ b/samples/client/petstore/javascript-promise-es6/src/index.js
@@ -29,6 +29,8 @@ import Dog from './model/Dog';
 import EnumArrays from './model/EnumArrays';
 import EnumClass from './model/EnumClass';
 import EnumTest from './model/EnumTest';
+import File from './model/File';
+import FileSchemaTestClass from './model/FileSchemaTestClass';
 import FormatTest from './model/FormatTest';
 import HasOnlyReadOnly from './model/HasOnlyReadOnly';
 import List from './model/List';
@@ -44,6 +46,7 @@ import OuterEnum from './model/OuterEnum';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
 import SpecialModelName from './model/SpecialModelName';
+import StringBooleanMap from './model/StringBooleanMap';
 import Tag from './model/Tag';
 import User from './model/User';
 import AnotherFakeApi from './api/AnotherFakeApi';
@@ -188,6 +191,18 @@ export {
      */
     EnumTest,
 
+    /**
+     * The File model constructor.
+     * @property {module:model/File}
+     */
+    File,
+
+    /**
+     * The FileSchemaTestClass model constructor.
+     * @property {module:model/FileSchemaTestClass}
+     */
+    FileSchemaTestClass,
+
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
@@ -278,6 +293,12 @@ export {
      */
     SpecialModelName,
 
+    /**
+     * The StringBooleanMap model constructor.
+     * @property {module:model/StringBooleanMap}
+     */
+    StringBooleanMap,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/File.js b/samples/client/petstore/javascript-promise-es6/src/model/File.js
new file mode 100644
index 000000000000..e29e1a0309f1
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/File.js
@@ -0,0 +1,73 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The File model module.
+ * @module model/File
+ * @version 1.0.0
+ */
+class File {
+    /**
+     * Constructs a new File.
+     * Must be named `File` for test.
+     * @alias module:model/File
+     */
+    constructor() { 
+        
+        File.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a File from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/File} obj Optional instance to populate.
+     * @return {module:model/File} The populated File instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new File();
+
+            if (data.hasOwnProperty('sourceURI')) {
+                obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * Test capitalization
+ * @member {String} sourceURI
+ */
+File.prototype['sourceURI'] = undefined;
+
+
+
+
+
+
+export default File;
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise-es6/src/model/FileSchemaTestClass.js
new file mode 100644
index 000000000000..b4be63df0e68
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/FileSchemaTestClass.js
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The FileSchemaTestClass model module.
+ * @module model/FileSchemaTestClass
+ * @version 1.0.0
+ */
+class FileSchemaTestClass {
+    /**
+     * Constructs a new FileSchemaTestClass.
+     * @alias module:model/FileSchemaTestClass
+     */
+    constructor() { 
+        
+        FileSchemaTestClass.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a FileSchemaTestClass from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/FileSchemaTestClass} obj Optional instance to populate.
+     * @return {module:model/FileSchemaTestClass} The populated FileSchemaTestClass instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new FileSchemaTestClass();
+
+            if (data.hasOwnProperty('file')) {
+                obj['file'] = File.constructFromObject(data['file']);
+            }
+            if (data.hasOwnProperty('files')) {
+                obj['files'] = ApiClient.convertToType(data['files'], [File]);
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {File} file
+ */
+FileSchemaTestClass.prototype['file'] = undefined;
+
+/**
+ * @member {Array.} files
+ */
+FileSchemaTestClass.prototype['files'] = undefined;
+
+
+
+
+
+
+export default FileSchemaTestClass;
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js b/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
index 8cc6640c9d4f..31c37d601cec 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
@@ -12,6 +12,7 @@
  */
 
 import ApiClient from '../ApiClient';
+import StringBooleanMap from './StringBooleanMap';
 
 /**
  * The MapTest model module.
@@ -53,6 +54,12 @@ class MapTest {
             if (data.hasOwnProperty('map_of_enum_string')) {
                 obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
             }
+            if (data.hasOwnProperty('direct_map')) {
+                obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
+            }
+            if (data.hasOwnProperty('indirect_map')) {
+                obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+            }
         }
         return obj;
     }
@@ -70,6 +77,16 @@ MapTest.prototype['map_map_of_string'] = undefined;
  */
 MapTest.prototype['map_of_enum_string'] = undefined;
 
+/**
+ * @member {Object.} direct_map
+ */
+MapTest.prototype['direct_map'] = undefined;
+
+/**
+ * @member {module:model/StringBooleanMap} indirect_map
+ */
+MapTest.prototype['indirect_map'] = undefined;
+
 
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
index 8b61cb8f654b..ba597462eec6 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
@@ -48,13 +48,13 @@ class OuterComposite {
             obj = obj || new OuterComposite();
 
             if (data.hasOwnProperty('my_number')) {
-                obj['my_number'] = 'Number'.constructFromObject(data['my_number']);
+                obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
             }
             if (data.hasOwnProperty('my_string')) {
-                obj['my_string'] = 'String'.constructFromObject(data['my_string']);
+                obj['my_string'] = ApiClient.convertToType(data['my_string'], 'String');
             }
             if (data.hasOwnProperty('my_boolean')) {
-                obj['my_boolean'] = 'Boolean'.constructFromObject(data['my_boolean']);
+                obj['my_boolean'] = ApiClient.convertToType(data['my_boolean'], 'Boolean');
             }
         }
         return obj;
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/StringBooleanMap.js b/samples/client/petstore/javascript-promise-es6/src/model/StringBooleanMap.js
new file mode 100644
index 000000000000..30172b33f7b9
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/StringBooleanMap.js
@@ -0,0 +1,67 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The StringBooleanMap model module.
+ * @module model/StringBooleanMap
+ * @version 1.0.0
+ */
+class StringBooleanMap {
+    /**
+     * Constructs a new StringBooleanMap.
+     * @alias module:model/StringBooleanMap
+     * @extends Object
+     */
+    constructor() { 
+        
+        StringBooleanMap.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a StringBooleanMap from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from data to obj if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/StringBooleanMap} obj Optional instance to populate.
+     * @return {module:model/StringBooleanMap} The populated StringBooleanMap instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new StringBooleanMap();
+
+            ApiClient.constructFromObject(data, obj, 'Boolean');
+            
+
+        }
+        return obj;
+    }
+
+
+}
+
+
+
+
+
+
+export default StringBooleanMap;
+
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/File.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/File.spec.js
new file mode 100644
index 000000000000..10666dc53c7c
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/test/model/File.spec.js
@@ -0,0 +1,65 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.File();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('File', function() {
+    it('should create an instance of File', function() {
+      // uncomment below and update the code to test File
+      //var instane = new OpenApiPetstore.File();
+      //expect(instance).to.be.a(OpenApiPetstore.File);
+    });
+
+    it('should have the property sourceURI (base name: "sourceURI")', function() {
+      // uncomment below and update the code to test the property sourceURI
+      //var instane = new OpenApiPetstore.File();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/FileSchemaTestClass.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/FileSchemaTestClass.spec.js
new file mode 100644
index 000000000000..d6e49689d232
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/test/model/FileSchemaTestClass.spec.js
@@ -0,0 +1,71 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FileSchemaTestClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FileSchemaTestClass', function() {
+    it('should create an instance of FileSchemaTestClass', function() {
+      // uncomment below and update the code to test FileSchemaTestClass
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be.a(OpenApiPetstore.FileSchemaTestClass);
+    });
+
+    it('should have the property file (base name: "file")', function() {
+      // uncomment below and update the code to test the property file
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property files (base name: "files")', function() {
+      // uncomment below and update the code to test the property files
+      //var instane = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/StringBooleanMap.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/StringBooleanMap.spec.js
new file mode 100644
index 000000000000..0fd499cc819e
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/test/model/StringBooleanMap.spec.js
@@ -0,0 +1,59 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StringBooleanMap();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StringBooleanMap', function() {
+    it('should create an instance of StringBooleanMap', function() {
+      // uncomment below and update the code to test StringBooleanMap
+      //var instane = new OpenApiPetstore.StringBooleanMap();
+      //expect(instance).to.be.a(OpenApiPetstore.StringBooleanMap);
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
index 1c00c5181548..14900cee60e8 100644
--- a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/README.md b/samples/client/petstore/javascript-promise/README.md
index a78275aee673..93b5f02e2239 100644
--- a/samples/client/petstore/javascript-promise/README.md
+++ b/samples/client/petstore/javascript-promise/README.md
@@ -97,7 +97,7 @@ var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.AnotherFakeApi()
 var client = new OpenApiPetstore.Client(); // {Client} client model
-api.testSpecialTags(client).then(function(data) {
+api.call123testSpecialTags(client).then(function(data) {
   console.log('API called successfully. Returned data: ' + data);
 }, function(error) {
   console.error(error);
@@ -112,11 +112,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*OpenApiPetstore.AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*OpenApiPetstore.AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 *OpenApiPetstore.FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 *OpenApiPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -132,6 +133,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *OpenApiPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *OpenApiPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*OpenApiPetstore.PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *OpenApiPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *OpenApiPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *OpenApiPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -164,6 +166,8 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.EnumArrays](docs/EnumArrays.md)
  - [OpenApiPetstore.EnumClass](docs/EnumClass.md)
  - [OpenApiPetstore.EnumTest](docs/EnumTest.md)
+ - [OpenApiPetstore.File](docs/File.md)
+ - [OpenApiPetstore.FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.List](docs/List.md)
@@ -179,6 +183,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [OpenApiPetstore.StringBooleanMap](docs/StringBooleanMap.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
 
diff --git a/samples/client/petstore/javascript-promise/docs/AnotherFakeApi.md b/samples/client/petstore/javascript-promise/docs/AnotherFakeApi.md
index 6666cbc0df77..007f4327b179 100644
--- a/samples/client/petstore/javascript-promise/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/javascript-promise/docs/AnotherFakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
-# **testSpecialTags**
-> Client testSpecialTags(client)
+
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```javascript
@@ -21,7 +21,7 @@ var OpenApiPetstore = require('open_api_petstore');
 
 var apiInstance = new OpenApiPetstore.AnotherFakeApi();
 var client = new OpenApiPetstore.Client(); // Client | client model
-apiInstance.testSpecialTags(client).then(function(data) {
+apiInstance.call123testSpecialTags(client).then(function(data) {
   console.log('API called successfully. Returned data: ' + data);
 }, function(error) {
   console.error(error);
diff --git a/samples/client/petstore/javascript-promise/docs/FakeApi.md b/samples/client/petstore/javascript-promise/docs/FakeApi.md
index 9d56939ca608..cb50ee6de648 100644
--- a/samples/client/petstore/javascript-promise/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -188,6 +189,47 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
+# **testBodyWithFileSchema**
+> testBodyWithFileSchema(fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```javascript
+var OpenApiPetstore = require('open_api_petstore');
+
+var apiInstance = new OpenApiPetstore.FakeApi();
+var fileSchemaTestClass = new OpenApiPetstore.FileSchemaTestClass(); // FileSchemaTestClass | 
+apiInstance.testBodyWithFileSchema(fileSchemaTestClass).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
 
 # **testBodyWithQueryParams**
 > testBodyWithQueryParams(query, user)
diff --git a/samples/client/petstore/javascript-promise/docs/File.md b/samples/client/petstore/javascript-promise/docs/File.md
new file mode 100644
index 000000000000..a34d76a3e46e
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/File.md
@@ -0,0 +1,8 @@
+# OpenApiPetstore.File
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**sourceURI** | **String** | Test capitalization | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/FileSchemaTestClass.md b/samples/client/petstore/javascript-promise/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..3ccb4162dcc1
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/FileSchemaTestClass.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.FileSchemaTestClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | **File** |  | [optional] 
+**files** | **[File]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/MapTest.md b/samples/client/petstore/javascript-promise/docs/MapTest.md
index 4a128da00fd0..f1075bf0681f 100644
--- a/samples/client/petstore/javascript-promise/docs/MapTest.md
+++ b/samples/client/petstore/javascript-promise/docs/MapTest.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
+**directMap** | **{String: Boolean}** |  | [optional] 
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
 
 
 
diff --git a/samples/client/petstore/javascript-promise/docs/PetApi.md b/samples/client/petstore/javascript-promise/docs/PetApi.md
index 28469bc95a1c..30f008958ffc 100644
--- a/samples/client/petstore/javascript-promise/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise/docs/PetApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
@@ -382,3 +383,52 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
+# **uploadFileWithRequiredFile**
+> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, opts)
+
+uploads an image (required)
+
+### Example
+```javascript
+var OpenApiPetstore = require('open_api_petstore');
+var defaultClient = OpenApiPetstore.ApiClient.instance;
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
+
+var apiInstance = new OpenApiPetstore.PetApi();
+var petId = 789; // Number | ID of pet to update
+var requiredFile = "/path/to/file"; // File | file to upload
+var opts = {
+  'additionalMetadata': "additionalMetadata_example" // String | Additional data to pass to server
+};
+apiInstance.uploadFileWithRequiredFile(petId, requiredFile, opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Number**| ID of pet to update | 
+ **requiredFile** | **File**| file to upload | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
diff --git a/samples/client/petstore/javascript-promise/docs/StringBooleanMap.md b/samples/client/petstore/javascript-promise/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..195a7d57677f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/StringBooleanMap.md
@@ -0,0 +1,7 @@
+# OpenApiPetstore.StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript-promise/package.json b/samples/client/petstore/javascript-promise/package.json
index 6cee1971957b..6fcefce10bad 100644
--- a/samples/client/petstore/javascript-promise/package.json
+++ b/samples/client/petstore/javascript-promise/package.json
@@ -11,7 +11,7 @@
     "fs": false
   },
   "dependencies": {
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
index 435175dc8d6b..b2151bf9f420 100644
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
index 7821ec7a222e..84c0b45c7cd8 100644
--- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -50,16 +50,16 @@
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Client} and HTTP response
      */
-    this.testSpecialTagsWithHttpInfo = function(client) {
+    this.call123testSpecialTagsWithHttpInfo = function(client) {
       var postBody = client;
 
       // verify the required parameter 'client' is set
       if (client === undefined || client === null) {
-        throw new Error("Missing the required parameter 'client' when calling testSpecialTags");
+        throw new Error("Missing the required parameter 'client' when calling call123testSpecialTags");
       }
 
 
@@ -88,12 +88,12 @@
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Client}
      */
-    this.testSpecialTags = function(client) {
-      return this.testSpecialTagsWithHttpInfo(client)
+    this.call123testSpecialTags = function(client) {
+      return this.call123testSpecialTagsWithHttpInfo(client)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
index 8b07f17c78f9..284f964a43c1 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,18 +16,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client', 'model/OuterComposite', 'model/User'], factory);
+    define(['ApiClient', 'model/Client', 'model/FileSchemaTestClass', 'model/OuterComposite', 'model/User'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/OuterComposite'), require('../model/User'));
+    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/FileSchemaTestClass'), require('../model/OuterComposite'), require('../model/User'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.FakeApi = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.Client, root.OpenApiPetstore.OuterComposite, root.OpenApiPetstore.User);
+    root.OpenApiPetstore.FakeApi = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.Client, root.OpenApiPetstore.FileSchemaTestClass, root.OpenApiPetstore.OuterComposite, root.OpenApiPetstore.User);
   }
-}(this, function(ApiClient, Client, OuterComposite, User) {
+}(this, function(ApiClient, Client, FileSchemaTestClass, OuterComposite, User) {
   'use strict';
 
   /**
@@ -240,6 +240,56 @@
     }
 
 
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
+     */
+    this.testBodyWithFileSchemaWithHttpInfo = function(fileSchemaTestClass) {
+      var postBody = fileSchemaTestClass;
+
+      // verify the required parameter 'fileSchemaTestClass' is set
+      if (fileSchemaTestClass === undefined || fileSchemaTestClass === null) {
+        throw new Error("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema");
+      }
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var collectionQueryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = ['application/json'];
+      var accepts = [];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/fake/body-with-file-schema', 'PUT',
+        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}
+     */
+    this.testBodyWithFileSchema = function(fileSchemaTestClass) {
+      return this.testBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass)
+        .then(function(response_and_data) {
+          return response_and_data.data;
+        });
+    }
+
+
     /**
      * @param {String} query 
      * @param {module:model/User} user 
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
index 7293a03fe8eb..409db18bdb9e 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js
index 68d7bd7e1022..15db5e00a60f 100644
--- a/samples/client/petstore/javascript-promise/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -488,6 +488,71 @@
           return response_and_data.data;
         });
     }
+
+
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/ApiResponse} and HTTP response
+     */
+    this.uploadFileWithRequiredFileWithHttpInfo = function(petId, requiredFile, opts) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId === undefined || petId === null) {
+        throw new Error("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+      }
+
+      // verify the required parameter 'requiredFile' is set
+      if (requiredFile === undefined || requiredFile === null) {
+        throw new Error("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var collectionQueryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'requiredFile': requiredFile
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['multipart/form-data'];
+      var accepts = ['application/json'];
+      var returnType = ApiResponse;
+
+      return this.apiClient.callApi(
+        '/fake/{petId}/uploadImageWithRequiredFile', 'POST',
+        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/ApiResponse}
+     */
+    this.uploadFileWithRequiredFile = function(petId, requiredFile, opts) {
+      return this.uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, opts)
+        .then(function(response_and_data) {
+          return response_and_data.data;
+        });
+    }
   };
 
   return exports;
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
index c4b2f93bbc0d..517f01e2c837 100644
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
index 4942cbc464b3..2dfa2d9429d8 100644
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
index 25685095fb2f..3f904b570cab 100644
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,12 +16,12 @@
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterComposite', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/AnotherFakeApi', 'api/FakeApi', 'api/FakeClassnameTags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
+    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/File', 'model/FileSchemaTestClass', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterComposite', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/StringBooleanMap', 'model/Tag', 'model/User', 'api/AnotherFakeApi', 'api/FakeApi', 'api/FakeClassnameTags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/AnotherFakeApi'), require('./api/FakeApi'), require('./api/FakeClassnameTags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/File'), require('./model/FileSchemaTestClass'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/StringBooleanMap'), require('./model/Tag'), require('./model/User'), require('./api/AnotherFakeApi'), require('./api/FakeApi'), require('./api/FakeClassnameTags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterComposite, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, AnotherFakeApi, FakeApi, FakeClassnameTags123Api, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, File, FileSchemaTestClass, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterComposite, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, StringBooleanMap, Tag, User, AnotherFakeApi, FakeApi, FakeClassnameTags123Api, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
@@ -141,6 +141,16 @@
      * @property {module:model/EnumTest}
      */
     EnumTest: EnumTest,
+    /**
+     * The File model constructor.
+     * @property {module:model/File}
+     */
+    File: File,
+    /**
+     * The FileSchemaTestClass model constructor.
+     * @property {module:model/FileSchemaTestClass}
+     */
+    FileSchemaTestClass: FileSchemaTestClass,
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
@@ -216,6 +226,11 @@
      * @property {module:model/SpecialModelName}
      */
     SpecialModelName: SpecialModelName,
+    /**
+     * The StringBooleanMap model constructor.
+     * @property {module:model/StringBooleanMap}
+     */
+    StringBooleanMap: StringBooleanMap,
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
index 08572d900840..3e41a2906a5b 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js
index 29376d771bfc..5ec0fe427cb4 100644
--- a/samples/client/petstore/javascript-promise/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js b/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
index e1a4797eec19..f80991972452 100644
--- a/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
index 5c112418181d..d3236a99234a 100644
--- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
index 024c26469df3..e7ac7b24a330 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
index ca79a7c2a6d0..7c98321c3d4b 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
index 01b97a1b5809..0f47e3e78ef1 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Capitalization.js b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
index 05934fb253ce..9f5e832699d3 100644
--- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js
index 10b787fed4eb..4c1d8f0c845d 100644
--- a/samples/client/petstore/javascript-promise/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js
index c289c6b8e5bd..560f1a94013e 100644
--- a/samples/client/petstore/javascript-promise/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ClassModel.js b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
index 6edd8fbadd04..cadf752c6446 100644
--- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Client.js b/samples/client/petstore/javascript-promise/src/model/Client.js
index e563bcf7ea59..7bf09ed3ac6f 100644
--- a/samples/client/petstore/javascript-promise/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise/src/model/Client.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js
index c308f3dc9f11..93f8f38ae13d 100644
--- a/samples/client/petstore/javascript-promise/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
index 07d52b119db0..d7b36eb6307e 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumClass.js b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
index d4a9f39f5661..d2f7c69374b1 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumTest.js b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
index 4dfc6753323a..e6f1a7ea9e47 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/File.js b/samples/client/petstore/javascript-promise/src/model/File.js
new file mode 100644
index 000000000000..aa7449e29078
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/File.js
@@ -0,0 +1,83 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.File = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The File model module.
+   * @module model/File
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new File.
+   * Must be named `File` for test.
+   * @alias module:model/File
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+
+  };
+
+  /**
+   * Constructs a File from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/File} obj Optional instance to populate.
+   * @return {module:model/File} The populated File instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('sourceURI')) {
+        obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * Test capitalization
+   * @member {String} sourceURI
+   */
+  exports.prototype['sourceURI'] = undefined;
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
new file mode 100644
index 000000000000..f2f1b8e966a3
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
@@ -0,0 +1,89 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.FileSchemaTestClass = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The FileSchemaTestClass model module.
+   * @module model/FileSchemaTestClass
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new FileSchemaTestClass.
+   * @alias module:model/FileSchemaTestClass
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+
+
+  };
+
+  /**
+   * Constructs a FileSchemaTestClass from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/FileSchemaTestClass} obj Optional instance to populate.
+   * @return {module:model/FileSchemaTestClass} The populated FileSchemaTestClass instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('file')) {
+        obj['file'] = File.constructFromObject(data['file']);
+      }
+      if (data.hasOwnProperty('files')) {
+        obj['files'] = ApiClient.convertToType(data['files'], [File]);
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * @member {File} file
+   */
+  exports.prototype['file'] = undefined;
+  /**
+   * @member {Array.} files
+   */
+  exports.prototype['files'] = undefined;
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
index 6c5986d48985..ea6d19666136 100644
--- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
index 484fd0c99910..b6470082caf9 100644
--- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/List.js b/samples/client/petstore/javascript-promise/src/model/List.js
index ab3c2e34e343..3b9f343524e8 100644
--- a/samples/client/petstore/javascript-promise/src/model/List.js
+++ b/samples/client/petstore/javascript-promise/src/model/List.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/MapTest.js b/samples/client/petstore/javascript-promise/src/model/MapTest.js
index adf82a358c28..8563624adffe 100644
--- a/samples/client/petstore/javascript-promise/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,18 +16,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
+    define(['ApiClient', 'model/StringBooleanMap'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
+    module.exports = factory(require('../ApiClient'), require('./StringBooleanMap'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient);
+    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.StringBooleanMap);
   }
-}(this, function(ApiClient) {
+}(this, function(ApiClient, StringBooleanMap) {
   'use strict';
 
 
@@ -49,6 +49,8 @@
 
 
 
+
+
   };
 
   /**
@@ -68,6 +70,12 @@
       if (data.hasOwnProperty('map_of_enum_string')) {
         obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
       }
+      if (data.hasOwnProperty('direct_map')) {
+        obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
+      }
+      if (data.hasOwnProperty('indirect_map')) {
+        obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+      }
     }
     return obj;
   }
@@ -80,6 +88,14 @@
    * @member {Object.} map_of_enum_string
    */
   exports.prototype['map_of_enum_string'] = undefined;
+  /**
+   * @member {Object.} direct_map
+   */
+  exports.prototype['direct_map'] = undefined;
+  /**
+   * @member {module:model/StringBooleanMap} indirect_map
+   */
+  exports.prototype['indirect_map'] = undefined;
 
 
   /**
diff --git a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 62c7a2f59e32..ff56b0e4981c 100644
--- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
index 84131169fb13..665e9d64f653 100644
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
index 87484d2ee234..836fab1b221c 100644
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
index 8c851c4cec54..24d63b4836f8 100644
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
index 389ad08e8c5c..b50c8dadc269 100644
--- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js
index bfd5f3714bef..5abd1899c042 100644
--- a/samples/client/petstore/javascript-promise/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
index b4fc48476dee..7410237332e4 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -64,13 +64,13 @@
       obj = obj || new exports();
 
       if (data.hasOwnProperty('my_number')) {
-        obj['my_number'] = 'Number'.constructFromObject(data['my_number']);
+        obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
       }
       if (data.hasOwnProperty('my_string')) {
-        obj['my_string'] = 'String'.constructFromObject(data['my_string']);
+        obj['my_string'] = ApiClient.convertToType(data['my_string'], 'String');
       }
       if (data.hasOwnProperty('my_boolean')) {
-        obj['my_boolean'] = 'Boolean'.constructFromObject(data['my_boolean']);
+        obj['my_boolean'] = ApiClient.convertToType(data['my_boolean'], 'Boolean');
       }
     }
     return obj;
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
index 9e1f532b44d0..0d7f9a4fd595 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js
index 55997490b789..69d47d25aef9 100644
--- a/samples/client/petstore/javascript-promise/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
index 1b0ae1104cc6..4e2f573958ea 100644
--- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
index 22464bbe7a25..5bea0b84fcf7 100644
--- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js b/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js
new file mode 100644
index 000000000000..d07c0fc99ea7
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js
@@ -0,0 +1,76 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.StringBooleanMap = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The StringBooleanMap model module.
+   * @module model/StringBooleanMap
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new StringBooleanMap.
+   * @alias module:model/StringBooleanMap
+   * @class
+   * @extends Object
+   */
+  var exports = function() {
+    var _this = this;
+
+    return _this;
+  };
+
+  /**
+   * Constructs a StringBooleanMap from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/StringBooleanMap} obj Optional instance to populate.
+   * @return {module:model/StringBooleanMap} The populated StringBooleanMap instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+      ApiClient.constructFromObject(data, obj, 'Boolean');
+
+    }
+    return obj;
+  }
+
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js
index 9e4f88b0872e..09299a4d0d61 100644
--- a/samples/client/petstore/javascript-promise/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js
index 06d4e6e7ad0a..62a2a70c6802 100644
--- a/samples/client/petstore/javascript-promise/src/model/User.js
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/test/model/File.spec.js b/samples/client/petstore/javascript-promise/test/model/File.spec.js
new file mode 100644
index 000000000000..67f2956c3973
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/model/File.spec.js
@@ -0,0 +1,67 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.File();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('File', function() {
+    it('should create an instance of File', function() {
+      // uncomment below and update the code to test File
+      //var instance = new OpenApiPetstore.File();
+      //expect(instance).to.be.a(OpenApiPetstore.File);
+    });
+
+    it('should have the property sourceURI (base name: "sourceURI")', function() {
+      // uncomment below and update the code to test the property sourceURI
+      //var instance = new OpenApiPetstore.File();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise/test/model/FileSchemaTestClass.spec.js b/samples/client/petstore/javascript-promise/test/model/FileSchemaTestClass.spec.js
new file mode 100644
index 000000000000..74f68c03ff6b
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/model/FileSchemaTestClass.spec.js
@@ -0,0 +1,73 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FileSchemaTestClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FileSchemaTestClass', function() {
+    it('should create an instance of FileSchemaTestClass', function() {
+      // uncomment below and update the code to test FileSchemaTestClass
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be.a(OpenApiPetstore.FileSchemaTestClass);
+    });
+
+    it('should have the property file (base name: "file")', function() {
+      // uncomment below and update the code to test the property file
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property files (base name: "files")', function() {
+      // uncomment below and update the code to test the property files
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise/test/model/StringBooleanMap.spec.js b/samples/client/petstore/javascript-promise/test/model/StringBooleanMap.spec.js
new file mode 100644
index 000000000000..c14a469bcf5f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/model/StringBooleanMap.spec.js
@@ -0,0 +1,61 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StringBooleanMap();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StringBooleanMap', function() {
+    it('should create an instance of StringBooleanMap', function() {
+      // uncomment below and update the code to test StringBooleanMap
+      //var instance = new OpenApiPetstore.StringBooleanMap();
+      //expect(instance).to.be.a(OpenApiPetstore.StringBooleanMap);
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript/.openapi-generator/VERSION b/samples/client/petstore/javascript/.openapi-generator/VERSION
index 1c00c5181548..14900cee60e8 100644
--- a/samples/client/petstore/javascript/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md
index 9d9637737d0c..5283d7248f67 100644
--- a/samples/client/petstore/javascript/README.md
+++ b/samples/client/petstore/javascript/README.md
@@ -105,7 +105,7 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.testSpecialTags(client, callback);
+api.call123testSpecialTags(client, callback);
 
 ```
 
@@ -115,11 +115,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*OpenApiPetstore.AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*OpenApiPetstore.AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 *OpenApiPetstore.FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 *OpenApiPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -135,6 +136,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *OpenApiPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *OpenApiPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*OpenApiPetstore.PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *OpenApiPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *OpenApiPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *OpenApiPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -167,6 +169,8 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.EnumArrays](docs/EnumArrays.md)
  - [OpenApiPetstore.EnumClass](docs/EnumClass.md)
  - [OpenApiPetstore.EnumTest](docs/EnumTest.md)
+ - [OpenApiPetstore.File](docs/File.md)
+ - [OpenApiPetstore.FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [OpenApiPetstore.FormatTest](docs/FormatTest.md)
  - [OpenApiPetstore.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [OpenApiPetstore.List](docs/List.md)
@@ -182,6 +186,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [OpenApiPetstore.StringBooleanMap](docs/StringBooleanMap.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
 
diff --git a/samples/client/petstore/javascript/docs/AnotherFakeApi.md b/samples/client/petstore/javascript/docs/AnotherFakeApi.md
index 4529aa0c18b0..a334daa2e433 100644
--- a/samples/client/petstore/javascript/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/javascript/docs/AnotherFakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
-# **testSpecialTags**
-> Client testSpecialTags(client)
+
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```javascript
@@ -28,7 +28,7 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-apiInstance.testSpecialTags(client, callback);
+apiInstance.call123testSpecialTags(client, callback);
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/javascript/docs/FakeApi.md b/samples/client/petstore/javascript/docs/FakeApi.md
index e0aa348e9011..73f3740d199e 100644
--- a/samples/client/petstore/javascript/docs/FakeApi.md
+++ b/samples/client/petstore/javascript/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -196,6 +197,49 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
+# **testBodyWithFileSchema**
+> testBodyWithFileSchema(fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```javascript
+var OpenApiPetstore = require('open_api_petstore');
+
+var apiInstance = new OpenApiPetstore.FakeApi();
+var fileSchemaTestClass = new OpenApiPetstore.FileSchemaTestClass(); // FileSchemaTestClass | 
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+apiInstance.testBodyWithFileSchema(fileSchemaTestClass, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
 
 # **testBodyWithQueryParams**
 > testBodyWithQueryParams(query, user)
diff --git a/samples/client/petstore/javascript/docs/File.md b/samples/client/petstore/javascript/docs/File.md
new file mode 100644
index 000000000000..a34d76a3e46e
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/File.md
@@ -0,0 +1,8 @@
+# OpenApiPetstore.File
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**sourceURI** | **String** | Test capitalization | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/FileSchemaTestClass.md b/samples/client/petstore/javascript/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..3ccb4162dcc1
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/FileSchemaTestClass.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.FileSchemaTestClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | **File** |  | [optional] 
+**files** | **[File]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/MapTest.md b/samples/client/petstore/javascript/docs/MapTest.md
index 4a128da00fd0..f1075bf0681f 100644
--- a/samples/client/petstore/javascript/docs/MapTest.md
+++ b/samples/client/petstore/javascript/docs/MapTest.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
+**directMap** | **{String: Boolean}** |  | [optional] 
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
 
 
 
diff --git a/samples/client/petstore/javascript/docs/PetApi.md b/samples/client/petstore/javascript/docs/PetApi.md
index fbcca8372ccc..265fc5a9b254 100644
--- a/samples/client/petstore/javascript/docs/PetApi.md
+++ b/samples/client/petstore/javascript/docs/PetApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
@@ -398,3 +399,54 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
+# **uploadFileWithRequiredFile**
+> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, opts)
+
+uploads an image (required)
+
+### Example
+```javascript
+var OpenApiPetstore = require('open_api_petstore');
+var defaultClient = OpenApiPetstore.ApiClient.instance;
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
+
+var apiInstance = new OpenApiPetstore.PetApi();
+var petId = 789; // Number | ID of pet to update
+var requiredFile = "/path/to/file"; // File | file to upload
+var opts = {
+  'additionalMetadata': "additionalMetadata_example" // String | Additional data to pass to server
+};
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+apiInstance.uploadFileWithRequiredFile(petId, requiredFile, opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Number**| ID of pet to update | 
+ **requiredFile** | **File**| file to upload | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
diff --git a/samples/client/petstore/javascript/docs/StringBooleanMap.md b/samples/client/petstore/javascript/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..195a7d57677f
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/StringBooleanMap.md
@@ -0,0 +1,7 @@
+# OpenApiPetstore.StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript/package.json b/samples/client/petstore/javascript/package.json
index 6cee1971957b..6fcefce10bad 100644
--- a/samples/client/petstore/javascript/package.json
+++ b/samples/client/petstore/javascript/package.json
@@ -11,7 +11,7 @@
     "fs": false
   },
   "dependencies": {
-    "superagent": "3.5.2"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index f43711962b0a..666b55968cd9 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
index 73b690b0d56d..5075bf8ee34b 100644
--- a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -48,8 +48,8 @@
 
 
     /**
-     * Callback function to receive the result of the testSpecialTags operation.
-     * @callback module:api/AnotherFakeApi~testSpecialTagsCallback
+     * Callback function to receive the result of the call123testSpecialTags operation.
+     * @callback module:api/AnotherFakeApi~call123testSpecialTagsCallback
      * @param {String} error Error message, if any.
      * @param {module:model/Client} data The data returned by the service call.
      * @param {String} response The complete HTTP response.
@@ -57,17 +57,17 @@
 
     /**
      * To test special tags
-     * To test special tags
+     * To test special tags and operation ID starting with number
      * @param {module:model/Client} client client model
-     * @param {module:api/AnotherFakeApi~testSpecialTagsCallback} callback The callback function, accepting three arguments: error, data, response
+     * @param {module:api/AnotherFakeApi~call123testSpecialTagsCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Client}
      */
-    this.testSpecialTags = function(client, callback) {
+    this.call123testSpecialTags = function(client, callback) {
       var postBody = client;
 
       // verify the required parameter 'client' is set
       if (client === undefined || client === null) {
-        throw new Error("Missing the required parameter 'client' when calling testSpecialTags");
+        throw new Error("Missing the required parameter 'client' when calling call123testSpecialTags");
       }
 
 
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index 71cb70f8be7c..56d61947600a 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,18 +16,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client', 'model/OuterComposite', 'model/User'], factory);
+    define(['ApiClient', 'model/Client', 'model/FileSchemaTestClass', 'model/OuterComposite', 'model/User'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/OuterComposite'), require('../model/User'));
+    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/FileSchemaTestClass'), require('../model/OuterComposite'), require('../model/User'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.FakeApi = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.Client, root.OpenApiPetstore.OuterComposite, root.OpenApiPetstore.User);
+    root.OpenApiPetstore.FakeApi = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.Client, root.OpenApiPetstore.FileSchemaTestClass, root.OpenApiPetstore.OuterComposite, root.OpenApiPetstore.User);
   }
-}(this, function(ApiClient, Client, OuterComposite, User) {
+}(this, function(ApiClient, Client, FileSchemaTestClass, OuterComposite, User) {
   'use strict';
 
   /**
@@ -219,6 +219,51 @@
       );
     }
 
+    /**
+     * Callback function to receive the result of the testBodyWithFileSchema operation.
+     * @callback module:api/FakeApi~testBodyWithFileSchemaCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * For this test, the body for this request much reference a schema named `File`.
+     * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
+     * @param {module:api/FakeApi~testBodyWithFileSchemaCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.testBodyWithFileSchema = function(fileSchemaTestClass, callback) {
+      var postBody = fileSchemaTestClass;
+
+      // verify the required parameter 'fileSchemaTestClass' is set
+      if (fileSchemaTestClass === undefined || fileSchemaTestClass === null) {
+        throw new Error("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema");
+      }
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var collectionQueryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = ['application/json'];
+      var accepts = [];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/fake/body-with-file-schema', 'PUT',
+        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
     /**
      * Callback function to receive the result of the testBodyWithQueryParams operation.
      * @callback module:api/FakeApi~testBodyWithQueryParamsCallback
diff --git a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
index 469890d60bbb..9384dce1b7d2 100644
--- a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index 840cb2fa67e9..34bd8e70ddc2 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -441,6 +441,64 @@
         authNames, contentTypes, accepts, returnType, callback
       );
     }
+
+    /**
+     * Callback function to receive the result of the uploadFileWithRequiredFile operation.
+     * @callback module:api/PetApi~uploadFileWithRequiredFileCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/ApiResponse} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * uploads an image (required)
+     * @param {Number} petId ID of pet to update
+     * @param {File} requiredFile file to upload
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @param {module:api/PetApi~uploadFileWithRequiredFileCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {@link module:model/ApiResponse}
+     */
+    this.uploadFileWithRequiredFile = function(petId, requiredFile, opts, callback) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId === undefined || petId === null) {
+        throw new Error("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+      }
+
+      // verify the required parameter 'requiredFile' is set
+      if (requiredFile === undefined || requiredFile === null) {
+        throw new Error("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var collectionQueryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'requiredFile': requiredFile
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['multipart/form-data'];
+      var accepts = ['application/json'];
+      var returnType = ApiResponse;
+
+      return this.apiClient.callApi(
+        '/fake/{petId}/uploadImageWithRequiredFile', 'POST',
+        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
   };
 
   return exports;
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index ba2c675ec771..33216d30b39c 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index d3e3b8513c55..4ca5eb45ee76 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index 25685095fb2f..3f904b570cab 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,12 +16,12 @@
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterComposite', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/AnotherFakeApi', 'api/FakeApi', 'api/FakeClassnameTags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
+    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/File', 'model/FileSchemaTestClass', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterComposite', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/StringBooleanMap', 'model/Tag', 'model/User', 'api/AnotherFakeApi', 'api/FakeApi', 'api/FakeClassnameTags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/AnotherFakeApi'), require('./api/FakeApi'), require('./api/FakeClassnameTags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/File'), require('./model/FileSchemaTestClass'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/StringBooleanMap'), require('./model/Tag'), require('./model/User'), require('./api/AnotherFakeApi'), require('./api/FakeApi'), require('./api/FakeClassnameTags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterComposite, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, AnotherFakeApi, FakeApi, FakeClassnameTags123Api, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, File, FileSchemaTestClass, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterComposite, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, StringBooleanMap, Tag, User, AnotherFakeApi, FakeApi, FakeClassnameTags123Api, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
@@ -141,6 +141,16 @@
      * @property {module:model/EnumTest}
      */
     EnumTest: EnumTest,
+    /**
+     * The File model constructor.
+     * @property {module:model/File}
+     */
+    File: File,
+    /**
+     * The FileSchemaTestClass model constructor.
+     * @property {module:model/FileSchemaTestClass}
+     */
+    FileSchemaTestClass: FileSchemaTestClass,
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
@@ -216,6 +226,11 @@
      * @property {module:model/SpecialModelName}
      */
     SpecialModelName: SpecialModelName,
+    /**
+     * The StringBooleanMap model constructor.
+     * @property {module:model/StringBooleanMap}
+     */
+    StringBooleanMap: StringBooleanMap,
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
index 08572d900840..3e41a2906a5b 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index 29376d771bfc..5ec0fe427cb4 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AnimalFarm.js b/samples/client/petstore/javascript/src/model/AnimalFarm.js
index e1a4797eec19..f80991972452 100644
--- a/samples/client/petstore/javascript/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript/src/model/AnimalFarm.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js
index 5c112418181d..d3236a99234a 100644
--- a/samples/client/petstore/javascript/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript/src/model/ApiResponse.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
index 024c26469df3..e7ac7b24a330 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
index ca79a7c2a6d0..7c98321c3d4b 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js
index 01b97a1b5809..0f47e3e78ef1 100644
--- a/samples/client/petstore/javascript/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript/src/model/ArrayTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Capitalization.js b/samples/client/petstore/javascript/src/model/Capitalization.js
index 05934fb253ce..9f5e832699d3 100644
--- a/samples/client/petstore/javascript/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript/src/model/Capitalization.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js
index 10b787fed4eb..4c1d8f0c845d 100644
--- a/samples/client/petstore/javascript/src/model/Cat.js
+++ b/samples/client/petstore/javascript/src/model/Cat.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index c289c6b8e5bd..560f1a94013e 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ClassModel.js b/samples/client/petstore/javascript/src/model/ClassModel.js
index 6edd8fbadd04..cadf752c6446 100644
--- a/samples/client/petstore/javascript/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript/src/model/ClassModel.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Client.js b/samples/client/petstore/javascript/src/model/Client.js
index e563bcf7ea59..7bf09ed3ac6f 100644
--- a/samples/client/petstore/javascript/src/model/Client.js
+++ b/samples/client/petstore/javascript/src/model/Client.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js
index c308f3dc9f11..93f8f38ae13d 100644
--- a/samples/client/petstore/javascript/src/model/Dog.js
+++ b/samples/client/petstore/javascript/src/model/Dog.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumArrays.js b/samples/client/petstore/javascript/src/model/EnumArrays.js
index 07d52b119db0..d7b36eb6307e 100644
--- a/samples/client/petstore/javascript/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript/src/model/EnumArrays.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumClass.js b/samples/client/petstore/javascript/src/model/EnumClass.js
index d4a9f39f5661..d2f7c69374b1 100644
--- a/samples/client/petstore/javascript/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript/src/model/EnumClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js
index 4dfc6753323a..e6f1a7ea9e47 100644
--- a/samples/client/petstore/javascript/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript/src/model/EnumTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/File.js b/samples/client/petstore/javascript/src/model/File.js
new file mode 100644
index 000000000000..aa7449e29078
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/File.js
@@ -0,0 +1,83 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.File = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The File model module.
+   * @module model/File
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new File.
+   * Must be named `File` for test.
+   * @alias module:model/File
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+
+  };
+
+  /**
+   * Constructs a File from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/File} obj Optional instance to populate.
+   * @return {module:model/File} The populated File instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('sourceURI')) {
+        obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * Test capitalization
+   * @member {String} sourceURI
+   */
+  exports.prototype['sourceURI'] = undefined;
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
new file mode 100644
index 000000000000..f2f1b8e966a3
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
@@ -0,0 +1,89 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.FileSchemaTestClass = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The FileSchemaTestClass model module.
+   * @module model/FileSchemaTestClass
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new FileSchemaTestClass.
+   * @alias module:model/FileSchemaTestClass
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+
+
+  };
+
+  /**
+   * Constructs a FileSchemaTestClass from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/FileSchemaTestClass} obj Optional instance to populate.
+   * @return {module:model/FileSchemaTestClass} The populated FileSchemaTestClass instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('file')) {
+        obj['file'] = File.constructFromObject(data['file']);
+      }
+      if (data.hasOwnProperty('files')) {
+        obj['files'] = ApiClient.convertToType(data['files'], [File]);
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * @member {File} file
+   */
+  exports.prototype['file'] = undefined;
+  /**
+   * @member {Array.} files
+   */
+  exports.prototype['files'] = undefined;
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js
index 6c5986d48985..ea6d19666136 100644
--- a/samples/client/petstore/javascript/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript/src/model/FormatTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
index 484fd0c99910..b6470082caf9 100644
--- a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/List.js b/samples/client/petstore/javascript/src/model/List.js
index ab3c2e34e343..3b9f343524e8 100644
--- a/samples/client/petstore/javascript/src/model/List.js
+++ b/samples/client/petstore/javascript/src/model/List.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/MapTest.js b/samples/client/petstore/javascript/src/model/MapTest.js
index adf82a358c28..8563624adffe 100644
--- a/samples/client/petstore/javascript/src/model/MapTest.js
+++ b/samples/client/petstore/javascript/src/model/MapTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,18 +16,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
+    define(['ApiClient', 'model/StringBooleanMap'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
+    module.exports = factory(require('../ApiClient'), require('./StringBooleanMap'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient);
+    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.StringBooleanMap);
   }
-}(this, function(ApiClient) {
+}(this, function(ApiClient, StringBooleanMap) {
   'use strict';
 
 
@@ -49,6 +49,8 @@
 
 
 
+
+
   };
 
   /**
@@ -68,6 +70,12 @@
       if (data.hasOwnProperty('map_of_enum_string')) {
         obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
       }
+      if (data.hasOwnProperty('direct_map')) {
+        obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
+      }
+      if (data.hasOwnProperty('indirect_map')) {
+        obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+      }
     }
     return obj;
   }
@@ -80,6 +88,14 @@
    * @member {Object.} map_of_enum_string
    */
   exports.prototype['map_of_enum_string'] = undefined;
+  /**
+   * @member {Object.} direct_map
+   */
+  exports.prototype['direct_map'] = undefined;
+  /**
+   * @member {module:model/StringBooleanMap} indirect_map
+   */
+  exports.prototype['indirect_map'] = undefined;
 
 
   /**
diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 62c7a2f59e32..ff56b0e4981c 100644
--- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
index 84131169fb13..665e9d64f653 100644
--- a/samples/client/petstore/javascript/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
index 87484d2ee234..836fab1b221c 100644
--- a/samples/client/petstore/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index 8c851c4cec54..24d63b4836f8 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/NumberOnly.js b/samples/client/petstore/javascript/src/model/NumberOnly.js
index 389ad08e8c5c..b50c8dadc269 100644
--- a/samples/client/petstore/javascript/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/NumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index bfd5f3714bef..5abd1899c042 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/OuterComposite.js b/samples/client/petstore/javascript/src/model/OuterComposite.js
index b4fc48476dee..7410237332e4 100644
--- a/samples/client/petstore/javascript/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript/src/model/OuterComposite.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -64,13 +64,13 @@
       obj = obj || new exports();
 
       if (data.hasOwnProperty('my_number')) {
-        obj['my_number'] = 'Number'.constructFromObject(data['my_number']);
+        obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
       }
       if (data.hasOwnProperty('my_string')) {
-        obj['my_string'] = 'String'.constructFromObject(data['my_string']);
+        obj['my_string'] = ApiClient.convertToType(data['my_string'], 'String');
       }
       if (data.hasOwnProperty('my_boolean')) {
-        obj['my_boolean'] = 'Boolean'.constructFromObject(data['my_boolean']);
+        obj['my_boolean'] = ApiClient.convertToType(data['my_boolean'], 'Boolean');
       }
     }
     return obj;
diff --git a/samples/client/petstore/javascript/src/model/OuterEnum.js b/samples/client/petstore/javascript/src/model/OuterEnum.js
index 9e1f532b44d0..0d7f9a4fd595 100644
--- a/samples/client/petstore/javascript/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript/src/model/OuterEnum.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index 55997490b789..69d47d25aef9 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
index 1b0ae1104cc6..4e2f573958ea 100644
--- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js
index 22464bbe7a25..5bea0b84fcf7 100644
--- a/samples/client/petstore/javascript/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/StringBooleanMap.js b/samples/client/petstore/javascript/src/model/StringBooleanMap.js
new file mode 100644
index 000000000000..d07c0fc99ea7
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/StringBooleanMap.js
@@ -0,0 +1,76 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.OpenApiPetstore) {
+      root.OpenApiPetstore = {};
+    }
+    root.OpenApiPetstore.StringBooleanMap = factory(root.OpenApiPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The StringBooleanMap model module.
+   * @module model/StringBooleanMap
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new StringBooleanMap.
+   * @alias module:model/StringBooleanMap
+   * @class
+   * @extends Object
+   */
+  var exports = function() {
+    var _this = this;
+
+    return _this;
+  };
+
+  /**
+   * Constructs a StringBooleanMap from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from data to obj if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/StringBooleanMap} obj Optional instance to populate.
+   * @return {module:model/StringBooleanMap} The populated StringBooleanMap instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+      ApiClient.constructFromObject(data, obj, 'Boolean');
+
+    }
+    return obj;
+  }
+
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index 9e4f88b0872e..09299a4d0d61 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index 06d4e6e7ad0a..62a2a70c6802 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.0.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.1-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/test/model/File.spec.js b/samples/client/petstore/javascript/test/model/File.spec.js
new file mode 100644
index 000000000000..67f2956c3973
--- /dev/null
+++ b/samples/client/petstore/javascript/test/model/File.spec.js
@@ -0,0 +1,67 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.File();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('File', function() {
+    it('should create an instance of File', function() {
+      // uncomment below and update the code to test File
+      //var instance = new OpenApiPetstore.File();
+      //expect(instance).to.be.a(OpenApiPetstore.File);
+    });
+
+    it('should have the property sourceURI (base name: "sourceURI")', function() {
+      // uncomment below and update the code to test the property sourceURI
+      //var instance = new OpenApiPetstore.File();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript/test/model/FileSchemaTestClass.spec.js b/samples/client/petstore/javascript/test/model/FileSchemaTestClass.spec.js
new file mode 100644
index 000000000000..74f68c03ff6b
--- /dev/null
+++ b/samples/client/petstore/javascript/test/model/FileSchemaTestClass.spec.js
@@ -0,0 +1,73 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FileSchemaTestClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FileSchemaTestClass', function() {
+    it('should create an instance of FileSchemaTestClass', function() {
+      // uncomment below and update the code to test FileSchemaTestClass
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be.a(OpenApiPetstore.FileSchemaTestClass);
+    });
+
+    it('should have the property file (base name: "file")', function() {
+      // uncomment below and update the code to test the property file
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property files (base name: "files")', function() {
+      // uncomment below and update the code to test the property files
+      //var instance = new OpenApiPetstore.FileSchemaTestClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript/test/model/StringBooleanMap.spec.js b/samples/client/petstore/javascript/test/model/StringBooleanMap.spec.js
new file mode 100644
index 000000000000..c14a469bcf5f
--- /dev/null
+++ b/samples/client/petstore/javascript/test/model/StringBooleanMap.spec.js
@@ -0,0 +1,61 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ *
+ * OpenAPI Generator version: 3.2.0-SNAPSHOT
+ *
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StringBooleanMap();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StringBooleanMap', function() {
+    it('should create an instance of StringBooleanMap', function() {
+      // uncomment below and update the code to test StringBooleanMap
+      //var instance = new OpenApiPetstore.StringBooleanMap();
+      //expect(instance).to.be.a(OpenApiPetstore.StringBooleanMap);
+    });
+
+  });
+
+}));

From ddb0920fede28a631bfb603579a879d1e6a6c363 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Sat, 11 Aug 2018 11:34:20 +0800
Subject: [PATCH 12/27] Fix C# client enum issue (#774)

* fix csharp enum issue

* fix numeric enum value

* add docstring to exlain isDataTypeString

* fix docstring by adding return

* fix ToJson in hash model

* remove BaseValidate for map model

* restore csproj file
---
 .../openapitools/codegen/DefaultCodegen.java  |   8 +
 .../languages/AbstractCSharpCodegen.java      |   6 +
 .../main/resources/csharp/enumClass.mustache  |   9 +-
 .../main/resources/csharp/modelEnum.mustache  |  13 +-
 .../resources/csharp/modelGeneric.mustache    |   4 +-
 .../resources/csharp/modelInnerEnum.mustache  |  13 +-
 .../OpenAPIClient/.openapi-generator/VERSION  |   2 +-
 .../petstore/csharp/OpenAPIClient/README.md   |  11 +-
 .../OpenAPIClient/docs/AnotherFakeApi.md      |  16 +-
 .../csharp/OpenAPIClient/docs/FakeApi.md      |  64 +++++-
 .../csharp/OpenAPIClient/docs/File.md         |   9 +
 .../OpenAPIClient/docs/FileSchemaTestClass.md |  10 +
 .../csharp/OpenAPIClient/docs/MapTest.md      |   2 +
 .../csharp/OpenAPIClient/docs/PetApi.md       |  67 ++++++
 .../OpenAPIClient/docs/StringBooleanMap.md    |   8 +
 .../Model/FileSchemaTestClassTests.cs         |  88 +++++++
 .../Org.OpenAPITools.Test/Model/FileTests.cs  |  80 +++++++
 .../Model/StringBooleanMapTests.cs            |  72 ++++++
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  44 ++--
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 187 +++++++++++++++
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 215 ++++++++++++++++++
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  |   8 +-
 .../src/Org.OpenAPITools/Model/EnumClass.cs   |   6 +-
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |  22 +-
 .../src/Org.OpenAPITools/Model/File.cs        | 125 ++++++++++
 .../Model/FileSchemaTestClass.cs              | 140 ++++++++++++
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  38 +++-
 .../src/Org.OpenAPITools/Model/Order.cs       |   6 +-
 .../src/Org.OpenAPITools/Model/OuterEnum.cs   |   6 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |   6 +-
 .../Model/StringBooleanMap.cs                 | 110 +++++++++
 31 files changed, 1316 insertions(+), 79 deletions(-)
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/docs/File.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs

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 0747ade52245..46790890a855 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
@@ -4577,6 +4577,14 @@ public class DefaultCodegen implements CodegenConfig {
         }
     }
 
+    /**
+     * checks if the data should be classified as "string" in enum
+     * e.g. double in C# needs to be double-quoted (e.g. "2.8") by treating it as a string
+     * In the future, we may rename this function to "isEnumString"
+     *
+     * @param dataType data type
+     * @return true if it's a enum string
+     */
     public boolean isDataTypeString(String dataType) {
         return "String".equals(dataType);
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index c56f2c9423c8..c5633e0acc2d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -961,4 +961,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     public String escapeUnsafeCharacters(String input) {
         return input.replace("*/", "*_/").replace("/*", "/_*").replace("--", "- -");
     }
+
+    @Override
+    public boolean isDataTypeString(String dataType) {
+        // also treat double/decimal/float as "string" in enum so that the values (e.g. 2.8) get double-quoted
+        return "String".equalsIgnoreCase(dataType) || "double?".equals(dataType) || "decimal?".equals(dataType) || "float?".equals(dataType);
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
index 015e7142dbc5..de8c602a14dc 100644
--- a/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
@@ -7,11 +7,14 @@
         [JsonConverter(typeof(StringEnumConverter))]
         {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}
         {
-            {{#allowableValues}}{{#enumVars}}
+            {{#allowableValues}}
+            {{#enumVars}}
             /// 
             /// Enum {{name}} for {{{value}}}
             /// 
             [EnumMember(Value = {{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isFloat}}"{{/isFloat}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isFloat}}"{{/isFloat}})]
-            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
-            {{/-last}}{{/enumVars}}{{/allowableValues}}
+            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},{{/-last}}
+
+            {{/enumVars}}
+            {{/allowableValues}}
         }
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
index a7cf4473385f..c1a70a37f2dd 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
@@ -9,11 +9,16 @@
     {{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}
     {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}}: byte{{/vendorExtensions.x-enum-byte}}
     {
-        {{#allowableValues}}{{#enumVars}}
+        {{#allowableValues}}
+        {{#enumVars}}
         /// 
         /// Enum {{name}} for value: {{{value}}}
         /// 
-        {{#isString}}[EnumMember(Value = "{{{value}}}")]{{/isString}}
-        {{name}}{{^isString}} = {{{value}}}{{/isString}}{{#isString}} = {{-index}}{{/isString}}{{^-last}},
-        {{/-last}}{{/enumVars}}{{/allowableValues}}
+        {{#isString}}
+        [EnumMember(Value = "{{{value}}}")]
+        {{/isString}}
+        {{name}}{{^isString}} = {{{value}}}{{/isString}}{{#isString}} = {{-index}}{{/isString}}{{^-last}},{{/-last}}
+
+        {{/enumVars}}
+        {{/allowableValues}}
     }{{! NOTE: This model's enumVars is modified to look like CodegenProperty}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
index 3659e7db0bba..89d35b73ec09 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
@@ -133,7 +133,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
         /// Returns the JSON string presentation of the object
         /// 
         /// JSON string presentation of the object
-        public {{#parent}}{{^isArrayModel}}override {{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
+        public {{#parent}}{{^isArrayModel}}{{^isMapModel}}override {{/isMapModel}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -247,7 +247,9 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
 {{/discriminator}}
             {{#parent}}
             {{^isArrayModel}}
+            {{^isMapModel}}
             foreach(var x in BaseValidate(validationContext)) yield return x;
+            {{/isMapModel}}
             {{/isArrayModel}}
             {{/parent}}
             {{#vars}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
index bede8a16b5e9..d9e96dccdb3c 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
@@ -10,12 +10,17 @@
         {{/isString}}
         {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}}: byte{{/vendorExtensions.x-enum-byte}}
         {
-            {{#allowableValues}}{{#enumVars}}
+            {{#allowableValues}}
+            {{#enumVars}}
             /// 
             /// Enum {{name}} for value: {{{value}}}
             /// 
-            {{#isString}}[EnumMember(Value = "{{{value}}}")]{{/isString}}
-            {{name}}{{^isString}} = {{{value}}}{{/isString}}{{#isString}} = {{-index}}{{/isString}}{{^-last}},
-            {{/-last}}{{/enumVars}}{{/allowableValues}}
+            {{#isString}}
+            [EnumMember(Value = "{{{value}}}")]
+            {{/isString}}
+            {{name}}{{^isString}} = {{{value}}}{{/isString}}{{#isString}} = {{-index}}{{/isString}}{{^-last}},{{/-last}}
+
+            {{/enumVars}}
+            {{/allowableValues}}
         }
         {{/isContainer}}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
index 096bf47efe31..14900cee60e8 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient/README.md b/samples/client/petstore/csharp/OpenAPIClient/README.md
index 441abc408817..a2b8a9b17a0f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/README.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/README.md
@@ -76,12 +76,12 @@ namespace Example
             try
             {
                 // To test special tags
-                ModelClient result = apiInstance.TestSpecialTags(modelClient);
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AnotherFakeApi.TestSpecialTags: " + e.Message );
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
             }
 
         }
@@ -96,11 +96,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**TestSpecialTags**](docs/AnotherFakeApi.md#testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
 *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**TestBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
 *FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -116,6 +117,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -148,6 +150,8 @@ Class | Method | HTTP request | Description
  - [Model.EnumArrays](docs/EnumArrays.md)
  - [Model.EnumClass](docs/EnumClass.md)
  - [Model.EnumTest](docs/EnumTest.md)
+ - [Model.File](docs/File.md)
+ - [Model.FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [Model.FormatTest](docs/FormatTest.md)
  - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [Model.List](docs/List.md)
@@ -164,6 +168,7 @@ Class | Method | HTTP request | Description
  - [Model.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Model.Return](docs/Return.md)
  - [Model.SpecialModelName](docs/SpecialModelName.md)
+ - [Model.StringBooleanMap](docs/StringBooleanMap.md)
  - [Model.Tag](docs/Tag.md)
  - [Model.User](docs/User.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
index 2dca444f2768..81cc3106d64f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**TestSpecialTags**](AnotherFakeApi.md#testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+[**Call123TestSpecialTags**](AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
-# **TestSpecialTags**
-> ModelClient TestSpecialTags (ModelClient modelClient)
+
+# **Call123TestSpecialTags**
+> ModelClient Call123TestSpecialTags (ModelClient modelClient)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```csharp
@@ -25,7 +25,7 @@ using Org.OpenAPITools.Model;
 
 namespace Example
 {
-    public class TestSpecialTagsExample
+    public class Call123TestSpecialTagsExample
     {
         public void main()
         {
@@ -35,12 +35,12 @@ namespace Example
             try
             {
                 // To test special tags
-                ModelClient result = apiInstance.TestSpecialTags(modelClient);
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AnotherFakeApi.TestSpecialTags: " + e.Message );
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
             }
         }
     }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
index 2a4fb6094ae0..9c91addfad03 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 [**FakeOuterStringSerialize**](FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+[**TestBodyWithFileSchema**](FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 [**TestBodyWithQueryParams**](FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 [**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
 [**TestEndpointParameters**](FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -256,6 +257,65 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+
+# **TestBodyWithFileSchema**
+> void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestBodyWithFileSchemaExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var fileSchemaTestClass = new FileSchemaTestClass(); // FileSchemaTestClass | 
+
+            try
+            {
+                apiInstance.TestBodyWithFileSchema(fileSchemaTestClass);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestBodyWithFileSchema: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 
 # **TestBodyWithQueryParams**
 > void TestBodyWithQueryParams (string query, User user)
@@ -495,7 +555,7 @@ namespace Example
             var enumQueryString = enumQueryString_example;  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 56;  // int? | Query parameter enum test (double) (optional) 
             var enumQueryDouble = 1.2;  // double? | Query parameter enum test (double) (optional) 
-            var enumFormStringArray = enumFormStringArray_example;  // List | Form parameter enum test (string array) (optional)  (default to $)
+            var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional)  (default to $)
             var enumFormString = enumFormString_example;  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
@@ -522,7 +582,7 @@ Name | Type | Description  | Notes
  **enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg]
  **enumQueryInteger** | **int?**| Query parameter enum test (double) | [optional] 
  **enumQueryDouble** | **double?**| Query parameter enum test (double) | [optional] 
- **enumFormStringArray** | **List<string>**| Form parameter enum test (string array) | [optional] [default to $]
+ **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] [default to $]
  **enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg]
 
 ### Return type
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient/docs/File.md
new file mode 100644
index 000000000000..acf85a4c001a
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/File.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.File
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SourceURI** | **string** | Test capitalization | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..e0820fa4e650
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.FileSchemaTestClass
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**File** | **System.IO.Stream** |  | [optional] 
+**Files** | **List<System.IO.Stream>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
index 2baba08d8552..ee62dbf135fa 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
 **MapOfEnumString** | **Dictionary<string, string>** |  | [optional] 
+**DirectMap** | **Dictionary<string, bool?>** |  | [optional] 
+**IndirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
index 244ece53a318..dd23df9b3683 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description
 [**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
 [**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**UploadFileWithRequiredFile**](PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
@@ -524,3 +525,69 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+
+# **UploadFileWithRequiredFile**
+> ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+
+uploads an image (required)
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UploadFileWithRequiredFileExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to update
+            var requiredFile = BINARY_DATA_HERE;  // System.IO.Stream | file to upload
+            var additionalMetadata = additionalMetadata_example;  // string | Additional data to pass to server (optional) 
+
+            try
+            {
+                // uploads an image (required)
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UploadFileWithRequiredFile: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to update | 
+ **requiredFile** | **System.IO.Stream**| file to upload | 
+ **additionalMetadata** | **string**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md b/samples/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..6e7a71368df7
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
@@ -0,0 +1,8 @@
+# Org.OpenAPITools.Model.StringBooleanMap
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
new file mode 100644
index 000000000000..bb47c43dc7a1
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing FileSchemaTestClass
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class FileSchemaTestClassTests
+    {
+        // TODO uncomment below to declare an instance variable for FileSchemaTestClass
+        //private FileSchemaTestClass instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of FileSchemaTestClass
+            //instance = new FileSchemaTestClass();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of FileSchemaTestClass
+        /// 
+        [Test]
+        public void FileSchemaTestClassInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" FileSchemaTestClass
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a FileSchemaTestClass");
+        }
+
+
+        /// 
+        /// Test the property 'File'
+        /// 
+        [Test]
+        public void FileTest()
+        {
+            // TODO unit test for the property 'File'
+        }
+        /// 
+        /// Test the property 'Files'
+        /// 
+        [Test]
+        public void FilesTest()
+        {
+            // TODO unit test for the property 'Files'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
new file mode 100644
index 000000000000..f1cf54c22e4d
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing File
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class FileTests
+    {
+        // TODO uncomment below to declare an instance variable for File
+        //private File instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of File
+            //instance = new File();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of File
+        /// 
+        [Test]
+        public void FileInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" File
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a File");
+        }
+
+
+        /// 
+        /// Test the property 'SourceURI'
+        /// 
+        [Test]
+        public void SourceURITest()
+        {
+            // TODO unit test for the property 'SourceURI'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
new file mode 100644
index 000000000000..efc4cd907733
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
@@ -0,0 +1,72 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing StringBooleanMap
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class StringBooleanMapTests
+    {
+        // TODO uncomment below to declare an instance variable for StringBooleanMap
+        //private StringBooleanMap instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of StringBooleanMap
+            //instance = new StringBooleanMap();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of StringBooleanMap
+        /// 
+        [Test]
+        public void StringBooleanMapInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" StringBooleanMap
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a StringBooleanMap");
+        }
+
+
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index a636d07b7219..aacccf92ca50 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -28,46 +28,46 @@ namespace Org.OpenAPITools.Api
         /// To test special tags
         /// 
         /// 
-        /// To test special tags
+        /// To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// ModelClient
-        ModelClient TestSpecialTags (ModelClient modelClient);
+        ModelClient Call123TestSpecialTags (ModelClient modelClient);
 
         /// 
         /// To test special tags
         /// 
         /// 
-        /// To test special tags
+        /// To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// ApiResponse of ModelClient
-        ApiResponse TestSpecialTagsWithHttpInfo (ModelClient modelClient);
+        ApiResponse Call123TestSpecialTagsWithHttpInfo (ModelClient modelClient);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// 
         /// To test special tags
         /// 
         /// 
-        /// To test special tags
+        /// To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// Task of ModelClient
-        System.Threading.Tasks.Task TestSpecialTagsAsync (ModelClient modelClient);
+        System.Threading.Tasks.Task Call123TestSpecialTagsAsync (ModelClient modelClient);
 
         /// 
         /// To test special tags
         /// 
         /// 
-        /// To test special tags
+        /// To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// Task of ApiResponse (ModelClient)
-        System.Threading.Tasks.Task> TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient);
+        System.Threading.Tasks.Task> Call123TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient);
         #endregion Asynchronous Operations
     }
 
@@ -169,28 +169,28 @@ namespace Org.OpenAPITools.Api
         }
 
         /// 
-        /// To test special tags To test special tags
+        /// To test special tags To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// ModelClient
-        public ModelClient TestSpecialTags (ModelClient modelClient)
+        public ModelClient Call123TestSpecialTags (ModelClient modelClient)
         {
-             ApiResponse localVarResponse = TestSpecialTagsWithHttpInfo(modelClient);
+             ApiResponse localVarResponse = Call123TestSpecialTagsWithHttpInfo(modelClient);
              return localVarResponse.Data;
         }
 
         /// 
-        /// To test special tags To test special tags
+        /// To test special tags To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// ApiResponse of ModelClient
-        public ApiResponse< ModelClient > TestSpecialTagsWithHttpInfo (ModelClient modelClient)
+        public ApiResponse< ModelClient > Call123TestSpecialTagsWithHttpInfo (ModelClient modelClient)
         {
             // verify the required parameter 'modelClient' is set
             if (modelClient == null)
-                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->TestSpecialTags");
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags");
 
             var localVarPath = "/another-fake/dummy";
             var localVarPathParams = new Dictionary();
@@ -233,7 +233,7 @@ namespace Org.OpenAPITools.Api
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("TestSpecialTags", localVarResponse);
+                Exception exception = ExceptionFactory("Call123TestSpecialTags", localVarResponse);
                 if (exception != null) throw exception;
             }
 
@@ -243,29 +243,29 @@ namespace Org.OpenAPITools.Api
         }
 
         /// 
-        /// To test special tags To test special tags
+        /// To test special tags To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// Task of ModelClient
-        public async System.Threading.Tasks.Task TestSpecialTagsAsync (ModelClient modelClient)
+        public async System.Threading.Tasks.Task Call123TestSpecialTagsAsync (ModelClient modelClient)
         {
-             ApiResponse localVarResponse = await TestSpecialTagsAsyncWithHttpInfo(modelClient);
+             ApiResponse localVarResponse = await Call123TestSpecialTagsAsyncWithHttpInfo(modelClient);
              return localVarResponse.Data;
 
         }
 
         /// 
-        /// To test special tags To test special tags
+        /// To test special tags To test special tags and operation ID starting with number
         /// 
         /// Thrown when fails to make API call
         /// client model
         /// Task of ApiResponse (ModelClient)
-        public async System.Threading.Tasks.Task> TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient)
+        public async System.Threading.Tasks.Task> Call123TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient)
         {
             // verify the required parameter 'modelClient' is set
             if (modelClient == null)
-                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->TestSpecialTags");
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags");
 
             var localVarPath = "/another-fake/dummy";
             var localVarPathParams = new Dictionary();
@@ -308,7 +308,7 @@ namespace Org.OpenAPITools.Api
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("TestSpecialTags", localVarResponse);
+                Exception exception = ExceptionFactory("Call123TestSpecialTags", localVarResponse);
                 if (exception != null) throw exception;
             }
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
index 8974ba425708..60e219ead9d0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -112,6 +112,27 @@ namespace Org.OpenAPITools.Api
         /// 
         /// 
         /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// ApiResponse of Object(void)
+        ApiResponse TestBodyWithFileSchemaWithHttpInfo (FileSchemaTestClass fileSchemaTestClass);
+        /// 
+        /// 
+        /// 
+        /// 
         /// 
         /// 
         /// Thrown when fails to make API call
@@ -368,6 +389,27 @@ namespace Org.OpenAPITools.Api
         /// 
         /// 
         /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of void
+        System.Threading.Tasks.Task TestBodyWithFileSchemaAsync (FileSchemaTestClass fileSchemaTestClass);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestBodyWithFileSchemaAsyncWithHttpInfo (FileSchemaTestClass fileSchemaTestClass);
+        /// 
+        /// 
+        /// 
+        /// 
         /// 
         /// 
         /// Thrown when fails to make API call
@@ -1198,6 +1240,151 @@ namespace Org.OpenAPITools.Api
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        public void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass)
+        {
+             TestBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass);
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// ApiResponse of Object(void)
+        public ApiResponse TestBodyWithFileSchemaWithHttpInfo (FileSchemaTestClass fileSchemaTestClass)
+        {
+            // verify the required parameter 'fileSchemaTestClass' is set
+            if (fileSchemaTestClass == null)
+                throw new ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema");
+
+            var localVarPath = "/fake/body-with-file-schema";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (fileSchemaTestClass != null && fileSchemaTestClass.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(fileSchemaTestClass); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = fileSchemaTestClass; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithFileSchema", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of void
+        public async System.Threading.Tasks.Task TestBodyWithFileSchemaAsync (FileSchemaTestClass fileSchemaTestClass)
+        {
+             await TestBodyWithFileSchemaAsyncWithHttpInfo(fileSchemaTestClass);
+
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestBodyWithFileSchemaAsyncWithHttpInfo (FileSchemaTestClass fileSchemaTestClass)
+        {
+            // verify the required parameter 'fileSchemaTestClass' is set
+            if (fileSchemaTestClass == null)
+                throw new ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema");
+
+            var localVarPath = "/fake/body-with-file-schema";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (fileSchemaTestClass != null && fileSchemaTestClass.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(fileSchemaTestClass); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = fileSchemaTestClass; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithFileSchema", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
         /// 
         ///  
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
index 9bfb712fd455..2fb6528b32e2 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
@@ -202,6 +202,31 @@ namespace Org.OpenAPITools.Api
         /// file to upload (optional)
         /// ApiResponse of ApiResponse
         ApiResponse UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse
+        ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse of ApiResponse
+        ApiResponse UploadFileWithRequiredFileWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// 
@@ -382,6 +407,31 @@ namespace Org.OpenAPITools.Api
         /// file to upload (optional)
         /// Task of ApiResponse (ApiResponse)
         System.Threading.Tasks.Task> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task UploadFileWithRequiredFileAsync (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse (ApiResponse)
+        System.Threading.Tasks.Task> UploadFileWithRequiredFileAsyncWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
         #endregion Asynchronous Operations
     }
 
@@ -1700,5 +1750,170 @@ namespace Org.OpenAPITools.Api
                 (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
         }
 
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse
+        public ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+             ApiResponse localVarResponse = UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse of ApiResponse
+        public ApiResponse< ApiResponse > UploadFileWithRequiredFileWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFileWithRequiredFile");
+            // verify the required parameter 'requiredFile' is set
+            if (requiredFile == null)
+                throw new ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile");
+
+            var localVarPath = "/fake/{petId}/uploadImageWithRequiredFile";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (requiredFile != null) localVarFileParams.Add("requiredFile", this.Configuration.ApiClient.ParameterToFile("requiredFile", requiredFile));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFileWithRequiredFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task UploadFileWithRequiredFileAsync (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+             ApiResponse localVarResponse = await UploadFileWithRequiredFileAsyncWithHttpInfo(petId, requiredFile, additionalMetadata);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse (ApiResponse)
+        public async System.Threading.Tasks.Task> UploadFileWithRequiredFileAsyncWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFileWithRequiredFile");
+            // verify the required parameter 'requiredFile' is set
+            if (requiredFile == null)
+                throw new ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile");
+
+            var localVarPath = "/fake/{petId}/uploadImageWithRequiredFile";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (requiredFile != null) localVarFileParams.Add("requiredFile", this.Configuration.ApiClient.ParameterToFile("requiredFile", requiredFile));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFileWithRequiredFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
     }
 }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
index ba25e7775635..567a207068c2 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -36,18 +36,18 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum JustSymbolEnum
         {
-            
             /// 
             /// Enum GreaterThanOrEqualTo for value: >=
             /// 
             [EnumMember(Value = ">=")]
             GreaterThanOrEqualTo = 1,
-            
+
             /// 
             /// Enum Dollar for value: $
             /// 
             [EnumMember(Value = "$")]
             Dollar = 2
+
         }
 
         /// 
@@ -61,18 +61,18 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ArrayEnumEnum
         {
-            
             /// 
             /// Enum Fish for value: fish
             /// 
             [EnumMember(Value = "fish")]
             Fish = 1,
-            
+
             /// 
             /// Enum Crab for value: crab
             /// 
             [EnumMember(Value = "crab")]
             Crab = 2
+
         }
 
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
index 3da1bee1360c..33643e475f51 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -32,24 +32,24 @@ namespace Org.OpenAPITools.Model
     
     public enum EnumClass
     {
-        
         /// 
         /// Enum Abc for value: _abc
         /// 
         [EnumMember(Value = "_abc")]
         Abc = 1,
-        
+
         /// 
         /// Enum Efg for value: -efg
         /// 
         [EnumMember(Value = "-efg")]
         Efg = 2,
-        
+
         /// 
         /// Enum Xyz for value: (xyz)
         /// 
         [EnumMember(Value = "(xyz)")]
         Xyz = 3
+
     }
 
 }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
index 663d01a2b23a..7099a980016f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -36,24 +36,24 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum EnumStringEnum
         {
-            
             /// 
             /// Enum UPPER for value: UPPER
             /// 
             [EnumMember(Value = "UPPER")]
             UPPER = 1,
-            
+
             /// 
             /// Enum Lower for value: lower
             /// 
             [EnumMember(Value = "lower")]
             Lower = 2,
-            
+
             /// 
             /// Enum Empty for value: 
             /// 
             [EnumMember(Value = "")]
             Empty = 3
+
         }
 
         /// 
@@ -67,24 +67,24 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum EnumStringRequiredEnum
         {
-            
             /// 
             /// Enum UPPER for value: UPPER
             /// 
             [EnumMember(Value = "UPPER")]
             UPPER = 1,
-            
+
             /// 
             /// Enum Lower for value: lower
             /// 
             [EnumMember(Value = "lower")]
             Lower = 2,
-            
+
             /// 
             /// Enum Empty for value: 
             /// 
             [EnumMember(Value = "")]
             Empty = 3
+
         }
 
         /// 
@@ -97,18 +97,16 @@ namespace Org.OpenAPITools.Model
         /// 
         public enum EnumIntegerEnum
         {
-            
             /// 
             /// Enum NUMBER_1 for value: 1
             /// 
-            
             NUMBER_1 = 1,
-            
+
             /// 
             /// Enum NUMBER_MINUS_1 for value: -1
             /// 
-            
             NUMBER_MINUS_1 = -1
+
         }
 
         /// 
@@ -122,18 +120,18 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum EnumNumberEnum
         {
-            
             /// 
             /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// 
             [EnumMember(Value = "1.1")]
             NUMBER_1_DOT_1 = 1,
-            
+
             /// 
             /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// 
             [EnumMember(Value = "-1.2")]
             NUMBER_MINUS_1_DOT_2 = 2
+
         }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
new file mode 100644
index 000000000000..68d564d17e72
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Must be named `File` for test.
+    /// 
+    [DataContract]
+    public partial class File :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// Test capitalization.
+        public File(string sourceURI = default(string))
+        {
+            this.SourceURI = sourceURI;
+        }
+        
+        /// 
+        /// Test capitalization
+        /// 
+        /// Test capitalization
+        [DataMember(Name="sourceURI", EmitDefaultValue=false)]
+        public string SourceURI { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class File {\n");
+            sb.Append("  SourceURI: ").Append(SourceURI).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as File);
+        }
+
+        /// 
+        /// Returns true if File instances are equal
+        /// 
+        /// Instance of File to be compared
+        /// Boolean
+        public bool Equals(File input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SourceURI == input.SourceURI ||
+                    (this.SourceURI != null &&
+                    this.SourceURI.Equals(input.SourceURI))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SourceURI != null)
+                    hashCode = hashCode * 59 + this.SourceURI.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
new file mode 100644
index 000000000000..1505ab9c4b1c
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// FileSchemaTestClass
+    /// 
+    [DataContract]
+    public partial class FileSchemaTestClass :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// file.
+        /// files.
+        public FileSchemaTestClass(System.IO.Stream file = default(System.IO.Stream), List files = default(List))
+        {
+            this.File = file;
+            this.Files = files;
+        }
+        
+        /// 
+        /// Gets or Sets File
+        /// 
+        [DataMember(Name="file", EmitDefaultValue=false)]
+        public System.IO.Stream File { get; set; }
+
+        /// 
+        /// Gets or Sets Files
+        /// 
+        [DataMember(Name="files", EmitDefaultValue=false)]
+        public List Files { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class FileSchemaTestClass {\n");
+            sb.Append("  File: ").Append(File).Append("\n");
+            sb.Append("  Files: ").Append(Files).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as FileSchemaTestClass);
+        }
+
+        /// 
+        /// Returns true if FileSchemaTestClass instances are equal
+        /// 
+        /// Instance of FileSchemaTestClass to be compared
+        /// Boolean
+        public bool Equals(FileSchemaTestClass input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.File == input.File ||
+                    (this.File != null &&
+                    this.File.Equals(input.File))
+                ) && 
+                (
+                    this.Files == input.Files ||
+                    this.Files != null &&
+                    this.Files.SequenceEqual(input.Files)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.File != null)
+                    hashCode = hashCode * 59 + this.File.GetHashCode();
+                if (this.Files != null)
+                    hashCode = hashCode * 59 + this.Files.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
index 25c030067064..1c5bfa70198a 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
@@ -36,18 +36,18 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum InnerEnum
         {
-            
             /// 
             /// Enum UPPER for value: UPPER
             /// 
             [EnumMember(Value = "UPPER")]
             UPPER = 1,
-            
+
             /// 
             /// Enum Lower for value: lower
             /// 
             [EnumMember(Value = "lower")]
             Lower = 2
+
         }
 
 
@@ -61,10 +61,14 @@ namespace Org.OpenAPITools.Model
         /// 
         /// mapMapOfString.
         /// mapOfEnumString.
-        public MapTest(Dictionary> mapMapOfString = default(Dictionary>), Dictionary mapOfEnumString = default(Dictionary))
+        /// directMap.
+        /// indirectMap.
+        public MapTest(Dictionary> mapMapOfString = default(Dictionary>), Dictionary mapOfEnumString = default(Dictionary), Dictionary directMap = default(Dictionary), StringBooleanMap indirectMap = default(StringBooleanMap))
         {
             this.MapMapOfString = mapMapOfString;
             this.MapOfEnumString = mapOfEnumString;
+            this.DirectMap = directMap;
+            this.IndirectMap = indirectMap;
         }
         
         /// 
@@ -74,6 +78,18 @@ namespace Org.OpenAPITools.Model
         public Dictionary> MapMapOfString { get; set; }
 
 
+        /// 
+        /// Gets or Sets DirectMap
+        /// 
+        [DataMember(Name="direct_map", EmitDefaultValue=false)]
+        public Dictionary DirectMap { get; set; }
+
+        /// 
+        /// Gets or Sets IndirectMap
+        /// 
+        [DataMember(Name="indirect_map", EmitDefaultValue=false)]
+        public StringBooleanMap IndirectMap { get; set; }
+
         /// 
         /// Returns the string presentation of the object
         /// 
@@ -84,6 +100,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("class MapTest {\n");
             sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
             sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
+            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
+            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -127,6 +145,16 @@ namespace Org.OpenAPITools.Model
                     this.MapOfEnumString == input.MapOfEnumString ||
                     this.MapOfEnumString != null &&
                     this.MapOfEnumString.SequenceEqual(input.MapOfEnumString)
+                ) && 
+                (
+                    this.DirectMap == input.DirectMap ||
+                    this.DirectMap != null &&
+                    this.DirectMap.SequenceEqual(input.DirectMap)
+                ) && 
+                (
+                    this.IndirectMap == input.IndirectMap ||
+                    (this.IndirectMap != null &&
+                    this.IndirectMap.Equals(input.IndirectMap))
                 );
         }
 
@@ -143,6 +171,10 @@ namespace Org.OpenAPITools.Model
                     hashCode = hashCode * 59 + this.MapMapOfString.GetHashCode();
                 if (this.MapOfEnumString != null)
                     hashCode = hashCode * 59 + this.MapOfEnumString.GetHashCode();
+                if (this.DirectMap != null)
+                    hashCode = hashCode * 59 + this.DirectMap.GetHashCode();
+                if (this.IndirectMap != null)
+                    hashCode = hashCode * 59 + this.IndirectMap.GetHashCode();
                 return hashCode;
             }
         }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
index 27863dccbae7..f895f035192b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
@@ -37,24 +37,24 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum
         {
-            
             /// 
             /// Enum Placed for value: placed
             /// 
             [EnumMember(Value = "placed")]
             Placed = 1,
-            
+
             /// 
             /// Enum Approved for value: approved
             /// 
             [EnumMember(Value = "approved")]
             Approved = 2,
-            
+
             /// 
             /// Enum Delivered for value: delivered
             /// 
             [EnumMember(Value = "delivered")]
             Delivered = 3
+
         }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
index 2716692ee0ec..be116aff60ab 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -32,24 +32,24 @@ namespace Org.OpenAPITools.Model
     
     public enum OuterEnum
     {
-        
         /// 
         /// Enum Placed for value: placed
         /// 
         [EnumMember(Value = "placed")]
         Placed = 1,
-        
+
         /// 
         /// Enum Approved for value: approved
         /// 
         [EnumMember(Value = "approved")]
         Approved = 2,
-        
+
         /// 
         /// Enum Delivered for value: delivered
         /// 
         [EnumMember(Value = "delivered")]
         Delivered = 3
+
     }
 
 }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
index 02628fcf1240..1e213e5006ad 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
@@ -37,24 +37,24 @@ namespace Org.OpenAPITools.Model
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum
         {
-            
             /// 
             /// Enum Available for value: available
             /// 
             [EnumMember(Value = "available")]
             Available = 1,
-            
+
             /// 
             /// Enum Pending for value: pending
             /// 
             [EnumMember(Value = "pending")]
             Pending = 2,
-            
+
             /// 
             /// Enum Sold for value: sold
             /// 
             [EnumMember(Value = "sold")]
             Sold = 3
+
         }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
new file mode 100644
index 000000000000..df4dc6e486dc
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
@@ -0,0 +1,110 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// StringBooleanMap
+    /// 
+    [DataContract]
+    public partial class StringBooleanMap : Dictionary,  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        public StringBooleanMap() : base()
+        {
+        }
+        
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StringBooleanMap {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StringBooleanMap);
+        }
+
+        /// 
+        /// Returns true if StringBooleanMap instances are equal
+        /// 
+        /// Instance of StringBooleanMap to be compared
+        /// Boolean
+        public bool Equals(StringBooleanMap input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input);
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

From 0cd6d8c139a1faf93b393f65e13a832b45518ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rytis=20Karpu=C5=A1ka?= 
Date: Sun, 12 Aug 2018 14:44:07 +0300
Subject: [PATCH 13/27] Do not declare destructor as default when destructor is
 explicitly declared. (#732)

---
 .../src/main/resources/cpp-rest-sdk-client/api-header.mustache  | 2 +-
 samples/client/petstore/cpp-restsdk/api/PetApi.h                | 2 +-
 samples/client/petstore/cpp-restsdk/api/StoreApi.h              | 2 +-
 samples/client/petstore/cpp-restsdk/api/UserApi.h               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache
index 8f7aad025476..fbf515deb156 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache
@@ -51,7 +51,7 @@ public:
     ~{{classname}}() override;
     {{/gmockApis}}
     {{^gmockApis}}
-    virtual ~{{classname}}() = default;
+    virtual ~{{classname}}();
     {{/gmockApis}}
 
     {{#operation}}
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
index 2f5c70e77e6b..b2d42109f457 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.h
@@ -43,7 +43,7 @@ public:
 
     explicit PetApi( std::shared_ptr apiClient );
 
-    virtual ~PetApi() = default;
+    virtual ~PetApi();
 
     /// 
     /// Add a new pet to the store
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
index 4d78791de44c..0b9f2b5c0f43 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
@@ -42,7 +42,7 @@ public:
 
     explicit StoreApi( std::shared_ptr apiClient );
 
-    virtual ~StoreApi() = default;
+    virtual ~StoreApi();
 
     /// 
     /// Delete purchase order by ID
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h
index d4218faa6a9c..76e5e7894dff 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.h
@@ -42,7 +42,7 @@ public:
 
     explicit UserApi( std::shared_ptr apiClient );
 
-    virtual ~UserApi() = default;
+    virtual ~UserApi();
 
     /// 
     /// Create user

From 1559c4fadd8451683adc88900ca2c2fb1e5d8162 Mon Sep 17 00:00:00 2001
From: attrobit 
Date: Sun, 12 Aug 2018 16:37:19 +0200
Subject: [PATCH 14/27] Issue 758 root resource (#771)

* Unit-Test for JavaJAXRSSpecServerCodegen.

* Path generation for primary resource fixed.

* Unit test for toApiName.

* Review-Feedback: blank line removed.
---
 .../languages/JavaJAXRSSpecServerCodegen.java |  30 ++++-
 .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 108 ++++++++++++++++++
 2 files changed, 132 insertions(+), 6 deletions(-)
 create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
index 07f38793d039..2242ed2dd41a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -18,7 +18,6 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
@@ -42,7 +41,9 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     private boolean interfaceOnly = false;
     private boolean returnResponse = false;
     private boolean generatePom = true;
-
+    
+    private String primaryResourceName;
+    
     public JavaJAXRSSpecServerCodegen() {
         super();
         invokerPackage = "org.openapitools.api";
@@ -147,19 +148,26 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         if (pos > 0) {
             basePath = basePath.substring(0, pos);
         }
-
+        
+        String operationKey = basePath;
         if (StringUtils.isEmpty(basePath)) {
-            basePath = "default";
+            basePath = tag;
+            operationKey = "";
+            primaryResourceName = tag;
+        } else if (basePath.matches("\\{.*\\}")) {
+            basePath = tag;
+            operationKey = "";
+            co.subresourceOperation = true;
         } else {
             if (co.path.startsWith("/" + basePath)) {
                 co.path = co.path.substring(("/" + basePath).length());
             }
             co.subresourceOperation = !co.path.isEmpty();
         }
-        List opList = operations.get(basePath);
+        List opList = operations.get(operationKey);
         if (opList == null || opList.isEmpty()) {
             opList = new ArrayList();
-            operations.put(basePath, opList);
+            operations.put(operationKey, opList);
         }
         opList.add(co);
         co.baseName = basePath;
@@ -186,4 +194,14 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public String getHelp() {
         return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
     }
+    
+    @Override
+    public String toApiName(final String name) {
+        String computed = name;
+        if (computed.length() == 0) {
+            return primaryResourceName + "Api";
+        }
+        computed = sanitizeName(computed);
+        return camelize(computed) + "Api";
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
new file mode 100644
index 000000000000..1ccafa1e48fe
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
@@ -0,0 +1,108 @@
+package org.openapitools.codegen.java.jaxrs;
+
+import io.swagger.v3.oas.models.Operation;
+import org.junit.Before;
+import org.junit.Test;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Unit-Test for {@link org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen}.
+ *
+ * @author attrobit
+ */
+public class JavaJAXRSSpecServerCodegenTest {
+    
+    private JavaJAXRSSpecServerCodegen instance;
+    
+    @Before
+    public void before() {
+        instance = new JavaJAXRSSpecServerCodegen();
+    }
+    
+    /**
+     * Test
+     * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String, Operation, CodegenOperation, Map)} for Resource with path "/" and set tag.
+     */
+    @Test
+    public void testAddOperationToGroupForRootResource() {
+        CodegenOperation codegenOperation = new CodegenOperation();
+        codegenOperation.operationId = "findPrimaryresource";
+        Operation operation = new Operation();
+        Map> operationList = new HashMap<>();
+        
+        instance.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
+        
+        assertThat(operationList.size(), is(1));
+        assertThat(operationList.containsKey(""), is(true));
+        assertThat(codegenOperation.baseName, is("Primaryresource"));
+    }
+    
+    /**
+     * Test
+     * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String, Operation, CodegenOperation, Map)} for Resource with path param.
+     */
+    @Test
+    public void testAddOperationToGroupForRootResourcePathParam() {
+        CodegenOperation codegenOperation = new CodegenOperation();
+        codegenOperation.operationId = "getPrimaryresource";
+        Operation operation = new Operation();
+        Map> operationList = new HashMap<>();
+        
+        instance.addOperationToGroup("Primaryresource", "/{uuid}", operation, codegenOperation, operationList);
+        
+        assertThat(operationList.size(), is(1));
+        assertThat(operationList.containsKey(""), is(true));
+        assertThat(codegenOperation.baseName, is("Primaryresource"));
+    }
+    
+    /**
+     * Test
+     * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String,
+     * Operation, CodegenOperation, Map)} for Resource with path "/subresource".
+     */
+    @Test
+    public void testAddOperationToGroupForSubresource() {
+        CodegenOperation codegenOperation = new CodegenOperation();
+        codegenOperation.path = "/subresource";
+        Operation operation = new Operation();
+        Map> operationList = new HashMap<>();
+        
+        instance.addOperationToGroup("Default", "/subresource", operation, codegenOperation, operationList);
+        
+        assertThat(codegenOperation.baseName, is("subresource"));
+        assertThat(operationList.size(), is(1));
+        assertThat(operationList.containsKey("subresource"), is(true));
+    }
+    
+    /**
+     * Test {@link JavaJAXRSSpecServerCodegen#toApiName(String)} with subresource.
+     */
+    @Test
+    public void testToApiNameForSubresource() {
+        final String subresource = instance.toApiName("subresource");
+        assertThat(subresource, is("SubresourceApi"));
+    }
+    
+    /**
+     * Test {@link JavaJAXRSSpecServerCodegen#toApiName(String)} with primary resource.
+     */
+    @Test
+    public void testToApiNameForPrimaryResource() {
+        CodegenOperation codegenOperation = new CodegenOperation();
+        codegenOperation.operationId = "findPrimaryresource";
+        Operation operation = new Operation();
+        Map> operationList = new HashMap<>();
+        instance.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
+        
+        final String subresource = instance.toApiName("");
+        assertThat(subresource, is("PrimaryresourceApi"));
+    }
+}

From 5e1c4cde5093b6f04fd111cfc54203638e24b8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= 
Date: Mon, 13 Aug 2018 07:26:34 +0200
Subject: [PATCH 15/27] Remove duplicate variable declaration (#792)

---
 .../languages/PhpLaravelServerCodegen.java    | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
index 0d4f91181de6..ed9215d40101 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
@@ -17,31 +17,13 @@
 
 package org.openapitools.codegen.languages;
 
-import io.swagger.models.properties.*;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.parameters.*;
 import org.openapitools.codegen.*;
 
 import java.io.File;
 import java.util.*;
 
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.PathItem.HttpMethod;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.core.util.Yaml;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
 public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
-    @SuppressWarnings("hiding")
     protected String apiVersion = "1.0.0";
-    protected String variableNamingConvention = "camelCase";
 
     /**
      * Configures the type of generator.
@@ -80,6 +62,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
         super();
 
         embeddedTemplateDir = templateDir = "php-laravel";
+        variableNamingConvention = "camelCase";
 
         /*
          * packPath

From c237fe9f1c7c162d9ed870ffb4b8c8cb561b345d Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Mon, 13 Aug 2018 13:27:45 +0800
Subject: [PATCH 16/27] Enhancements to documentation generators (samples,
 default values, etc) (#790)

* enhancements to doc generators (samples, default values, etc)

* add 3.3.x to PR template
---
 .github/PULL_REQUEST_TEMPLATE.md                    |   2 +-
 bin/dynamic-html.sh                                 |   2 +-
 bin/html-markdown.sh                                |   2 +-
 bin/html-petstore.sh                                |   2 +-
 bin/html2-petstore.sh                               |   2 +-
 bin/windows/html-petstore.bat                       |   2 +-
 bin/windows/html2-petstore.bat                      |   2 +-
 .../codegen/languages/ConfluenceWikiCodegen.java    |   6 +++---
 .../codegen/languages/StaticDocCodegen.java         |   8 ++++----
 .../codegen/languages/StaticHtml2Generator.java     |   6 +++---
 .../codegen/languages/StaticHtmlGenerator.java      |   6 +++---
 .../assets/css/bootstrap-responsive.css             |   0
 .../assets/css/bootstrap.css                        |   0
 .../assets/css/site.css                             |   0
 .../assets/css/style.css                            |   0
 .../assets/images/logo.png                          | Bin
 .../assets/js/bootstrap.js                          |   0
 .../assets/js/jquery-1.8.3.min.js                   |   0
 .../assets/js/main.js                               |   0
 .../index.mustache                                  |   0
 .../main.mustache                                   |   0
 .../model.mustache                                  |   0
 .../operation.mustache                              |   0
 .../package.mustache                                |   0
 .../{swagger-static => openapi-static}/pom.xml      |   0
 .../documentation/cwiki/.openapi-generator/VERSION  |   2 +-
 .../dynamic-html/.openapi-generator-ignore          |   0
 .../dynamic-html/.openapi-generator/VERSION         |   1 +
 .../docs/assets/css/bootstrap-responsive.css        |   0
 .../dynamic-html/docs/assets/css/bootstrap.css      |   0
 .../dynamic-html/docs/assets/css/style.css          |   0
 .../dynamic-html/docs/assets/images/logo.png        | Bin
 .../dynamic-html/docs/assets/js/bootstrap.js        |   0
 .../dynamic-html/docs/assets/js/jquery-1.8.3.min.js |   0
 .../dynamic-html/docs/assets/js/main.js             |   0
 .../dynamic-html/docs/index.html                    |   0
 .../dynamic-html/docs/models/ApiResponse.html       |   0
 .../dynamic-html/docs/models/Category.html          |   0
 .../dynamic-html/docs/models/Order.html             |   0
 .../dynamic-html/docs/models/Pet.html               |   0
 .../dynamic-html/docs/models/Tag.html               |   0
 .../dynamic-html/docs/models/User.html              |   0
 .../dynamic-html/docs/operations/PetApi.html        |   0
 .../dynamic-html/docs/operations/StoreApi.html      |   0
 .../dynamic-html/docs/operations/UserApi.html       |   0
 samples/{ => documentation}/dynamic-html/main.js    |   0
 .../{ => documentation}/dynamic-html/package.json   |   0
 .../html.md/.openapi-generator-ignore               |   0
 .../html.md}/.openapi-generator/VERSION             |   0
 samples/{ => documentation}/html.md/index.html      |   0
 .../html/.openapi-generator-ignore                  |   0
 .../documentation/html/.openapi-generator/VERSION   |   1 +
 samples/{ => documentation}/html/index.html         |   4 ++--
 .../html2/.openapi-generator-ignore                 |   0
 .../documentation/html2/.openapi-generator/VERSION  |   1 +
 samples/{ => documentation}/html2/index.html        |   2 +-
 samples/html.md/.openapi-generator/VERSION          |   1 -
 samples/html/.openapi-generator/VERSION             |   1 -
 samples/html2/.openapi-generator/VERSION            |   1 -
 59 files changed, 27 insertions(+), 27 deletions(-)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/bootstrap-responsive.css (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/bootstrap.css (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/site.css (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/style.css (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/images/logo.png (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/bootstrap.js (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/jquery-1.8.3.min.js (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/main.js (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/index.mustache (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/main.mustache (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/model.mustache (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/operation.mustache (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/package.mustache (100%)
 rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/pom.xml (100%)
 rename samples/{ => documentation}/dynamic-html/.openapi-generator-ignore (100%)
 create mode 100644 samples/documentation/dynamic-html/.openapi-generator/VERSION
 rename samples/{ => documentation}/dynamic-html/docs/assets/css/bootstrap-responsive.css (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/css/bootstrap.css (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/css/style.css (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/images/logo.png (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/js/bootstrap.js (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/js/jquery-1.8.3.min.js (100%)
 rename samples/{ => documentation}/dynamic-html/docs/assets/js/main.js (100%)
 rename samples/{ => documentation}/dynamic-html/docs/index.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/ApiResponse.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/Category.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/Order.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/Pet.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/Tag.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/models/User.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/operations/PetApi.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/operations/StoreApi.html (100%)
 rename samples/{ => documentation}/dynamic-html/docs/operations/UserApi.html (100%)
 rename samples/{ => documentation}/dynamic-html/main.js (100%)
 rename samples/{ => documentation}/dynamic-html/package.json (100%)
 rename samples/{ => documentation}/html.md/.openapi-generator-ignore (100%)
 rename samples/{dynamic-html => documentation/html.md}/.openapi-generator/VERSION (100%)
 rename samples/{ => documentation}/html.md/index.html (100%)
 rename samples/{ => documentation}/html/.openapi-generator-ignore (100%)
 create mode 100644 samples/documentation/html/.openapi-generator/VERSION
 rename samples/{ => documentation}/html/index.html (99%)
 rename samples/{ => documentation}/html2/.openapi-generator-ignore (100%)
 create mode 100644 samples/documentation/html2/.openapi-generator/VERSION
 rename samples/{ => documentation}/html2/index.html (99%)
 delete mode 100644 samples/html.md/.openapi-generator/VERSION
 delete mode 100644 samples/html/.openapi-generator/VERSION
 delete mode 100644 samples/html2/.openapi-generator/VERSION

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f2a2cd59b7e1..e93ef7163643 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
 - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
-- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.0.x`. Default: `master`.
+- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.3.x`, `4.0.x`. Default: `master`.
 - [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
 
 ### Description of the PR
diff --git a/bin/dynamic-html.sh b/bin/dynamic-html.sh
index 7fc4f6a6ba7a..c98948913433 100755
--- a/bin/dynamic-html.sh
+++ b/bin/dynamic-html.sh
@@ -27,6 +27,6 @@ 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"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dynamic-html  -o samples/dynamic-html $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dynamic-html  -o samples/documentation/dynamic-html $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/html-markdown.sh b/bin/html-markdown.sh
index 7808fe8c09df..391e549f2acc 100755
--- a/bin/html-markdown.sh
+++ b/bin/html-markdown.sh
@@ -27,6 +27,6 @@ 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"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/markdown.yaml -g html  -o samples/html.md $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/markdown.yaml -g html  -o samples/documentation/html.md $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/html-petstore.sh b/bin/html-petstore.sh
index 29743d6059aa..1b8fadbac987 100755
--- a/bin/html-petstore.sh
+++ b/bin/html-petstore.sh
@@ -27,6 +27,6 @@ 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"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html  -o samples/html $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html  -o samples/documentation/html $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/html2-petstore.sh b/bin/html2-petstore.sh
index 5939463d6c1d..70f6b71c0e5d 100755
--- a/bin/html2-petstore.sh
+++ b/bin/html2-petstore.sh
@@ -27,6 +27,6 @@ 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"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html2  -o samples/html2 --additional-properties hideGenerationTimestamp=true $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html2  -o samples/documentation/html2 --additional-properties hideGenerationTimestamp=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat
index 178890387eff..5a4802d2963a 100755
--- a/bin/windows/html-petstore.bat
+++ b/bin/windows/html-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html -o samples\client\petstore\html
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html -o samples\documentation\html
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/html2-petstore.bat b/bin/windows/html2-petstore.bat
index 01330cdceea7..a6386d2efae2 100644
--- a/bin/windows/html2-petstore.bat
+++ b/bin/windows/html2-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html2 -o samples\html2
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html2 -o samples\documentation\html2
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
index 965d7b70207c..b9243aaa2600 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
@@ -60,9 +60,9 @@ public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConf
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
 
         additionalProperties.put("appName", "OpenAPI Sample");
-        additionalProperties.put("appDescription", "A sample openapi server");
-        additionalProperties.put("infoUrl", "https://helloreverb.com");
-        additionalProperties.put("infoEmail", "hello@helloreverb.com");
+        additionalProperties.put("appDescription", "A sample OpenAPI server");
+        additionalProperties.put("infoUrl", "https://openapi-generator.tech");
+        additionalProperties.put("infoEmail", "team@openapitools.org");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
index 5067f039a9ab..56ff29d0f8e2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
@@ -43,7 +43,7 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
         outputFolder = "docs";
         modelTemplateFiles.put("model.mustache", ".html");
         apiTemplateFiles.put("operation.mustache", ".html");
-        embeddedTemplateDir = templateDir = "swagger-static";
+        embeddedTemplateDir = templateDir = "openapi-static";
 
         cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC));
@@ -94,8 +94,8 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
     @Override
-    public String escapeReservedWord(String name) {           
-        if(this.reservedWordsMappings().containsKey(name)) {
+    public String escapeReservedWord(String name) {
+        if (this.reservedWordsMappings().containsKey(name)) {
             return this.reservedWordsMappings().get(name);
         }
         return "_" + name;
@@ -121,5 +121,5 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
     public String escapeUnsafeCharacters(String input) {
         // just return the original string
         return input;
-    }   
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
index 37fda7e0b9b2..32e198a16529 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
@@ -82,9 +82,9 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
 
         additionalProperties.put("appName", "OpenAPI Sample");
-        additionalProperties.put("appDescription", "A sample openapi server");
+        additionalProperties.put("appDescription", "A sample OpenAPI server");
         additionalProperties.put("infoUrl", "https://openapi-generator.tech");
-        additionalProperties.put("infoEmail", "contributors@openapitools.org");
+        additionalProperties.put("infoEmail", "team@openapitools.org");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
@@ -180,7 +180,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
 
         Map vendorExtensions = openAPI.getExtensions();
         if (vendorExtensions != null) {
-            for(Map.Entry vendorExtension: vendorExtensions.entrySet()) {
+            for (Map.Entry vendorExtension : vendorExtensions.entrySet()) {
                 // Vendor extensions could be Maps (objects). If we wanted to iterate through them in our template files
                 // without knowing the keys beforehand, the default `toString` method renders them unusable. Instead, we
                 // convert them to JSON strings now, which means we can easily use them later.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
index eb37f69b4538..feaac9dbc5db 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
@@ -69,9 +69,9 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
 
         additionalProperties.put("appName", "OpenAPI Sample");
-        additionalProperties.put("appDescription", "A sample openapi server");
-        additionalProperties.put("infoUrl", "https://helloreverb.com");
-        additionalProperties.put("infoEmail", "hello@helloreverb.com");
+        additionalProperties.put("appDescription", "A sample OpenAPI server");
+        additionalProperties.put("infoUrl", "https//openapi-generator.tech");
+        additionalProperties.put("infoEmail", "team@openapitools.org");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap-responsive.css
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap-responsive.css
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap.css
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap.css
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap.css
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/site.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/site.css
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/site.css
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/site.css
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/style.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/style.css
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/style.css
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/style.css
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/images/logo.png b/modules/openapi-generator/src/main/resources/openapi-static/assets/images/logo.png
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/images/logo.png
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/images/logo.png
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/bootstrap.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/bootstrap.js
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/bootstrap.js
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/bootstrap.js
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/jquery-1.8.3.min.js
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/jquery-1.8.3.min.js
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/main.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/main.js
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/main.js
rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/main.js
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/index.mustache b/modules/openapi-generator/src/main/resources/openapi-static/index.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/index.mustache
rename to modules/openapi-generator/src/main/resources/openapi-static/index.mustache
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/main.mustache b/modules/openapi-generator/src/main/resources/openapi-static/main.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/main.mustache
rename to modules/openapi-generator/src/main/resources/openapi-static/main.mustache
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/model.mustache b/modules/openapi-generator/src/main/resources/openapi-static/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/model.mustache
rename to modules/openapi-generator/src/main/resources/openapi-static/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/operation.mustache b/modules/openapi-generator/src/main/resources/openapi-static/operation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/operation.mustache
rename to modules/openapi-generator/src/main/resources/openapi-static/operation.mustache
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/package.mustache b/modules/openapi-generator/src/main/resources/openapi-static/package.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/package.mustache
rename to modules/openapi-generator/src/main/resources/openapi-static/package.mustache
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/pom.xml b/modules/openapi-generator/src/main/resources/openapi-static/pom.xml
similarity index 100%
rename from modules/openapi-generator/src/main/resources/swagger-static/pom.xml
rename to modules/openapi-generator/src/main/resources/openapi-static/pom.xml
diff --git a/samples/documentation/cwiki/.openapi-generator/VERSION b/samples/documentation/cwiki/.openapi-generator/VERSION
index 096bf47efe31..14900cee60e8 100644
--- a/samples/documentation/cwiki/.openapi-generator/VERSION
+++ b/samples/documentation/cwiki/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/dynamic-html/.openapi-generator-ignore b/samples/documentation/dynamic-html/.openapi-generator-ignore
similarity index 100%
rename from samples/dynamic-html/.openapi-generator-ignore
rename to samples/documentation/dynamic-html/.openapi-generator-ignore
diff --git a/samples/documentation/dynamic-html/.openapi-generator/VERSION b/samples/documentation/dynamic-html/.openapi-generator/VERSION
new file mode 100644
index 000000000000..14900cee60e8
--- /dev/null
+++ b/samples/documentation/dynamic-html/.openapi-generator/VERSION
@@ -0,0 +1 @@
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/dynamic-html/docs/assets/css/bootstrap-responsive.css b/samples/documentation/dynamic-html/docs/assets/css/bootstrap-responsive.css
similarity index 100%
rename from samples/dynamic-html/docs/assets/css/bootstrap-responsive.css
rename to samples/documentation/dynamic-html/docs/assets/css/bootstrap-responsive.css
diff --git a/samples/dynamic-html/docs/assets/css/bootstrap.css b/samples/documentation/dynamic-html/docs/assets/css/bootstrap.css
similarity index 100%
rename from samples/dynamic-html/docs/assets/css/bootstrap.css
rename to samples/documentation/dynamic-html/docs/assets/css/bootstrap.css
diff --git a/samples/dynamic-html/docs/assets/css/style.css b/samples/documentation/dynamic-html/docs/assets/css/style.css
similarity index 100%
rename from samples/dynamic-html/docs/assets/css/style.css
rename to samples/documentation/dynamic-html/docs/assets/css/style.css
diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/documentation/dynamic-html/docs/assets/images/logo.png
similarity index 100%
rename from samples/dynamic-html/docs/assets/images/logo.png
rename to samples/documentation/dynamic-html/docs/assets/images/logo.png
diff --git a/samples/dynamic-html/docs/assets/js/bootstrap.js b/samples/documentation/dynamic-html/docs/assets/js/bootstrap.js
similarity index 100%
rename from samples/dynamic-html/docs/assets/js/bootstrap.js
rename to samples/documentation/dynamic-html/docs/assets/js/bootstrap.js
diff --git a/samples/dynamic-html/docs/assets/js/jquery-1.8.3.min.js b/samples/documentation/dynamic-html/docs/assets/js/jquery-1.8.3.min.js
similarity index 100%
rename from samples/dynamic-html/docs/assets/js/jquery-1.8.3.min.js
rename to samples/documentation/dynamic-html/docs/assets/js/jquery-1.8.3.min.js
diff --git a/samples/dynamic-html/docs/assets/js/main.js b/samples/documentation/dynamic-html/docs/assets/js/main.js
similarity index 100%
rename from samples/dynamic-html/docs/assets/js/main.js
rename to samples/documentation/dynamic-html/docs/assets/js/main.js
diff --git a/samples/dynamic-html/docs/index.html b/samples/documentation/dynamic-html/docs/index.html
similarity index 100%
rename from samples/dynamic-html/docs/index.html
rename to samples/documentation/dynamic-html/docs/index.html
diff --git a/samples/dynamic-html/docs/models/ApiResponse.html b/samples/documentation/dynamic-html/docs/models/ApiResponse.html
similarity index 100%
rename from samples/dynamic-html/docs/models/ApiResponse.html
rename to samples/documentation/dynamic-html/docs/models/ApiResponse.html
diff --git a/samples/dynamic-html/docs/models/Category.html b/samples/documentation/dynamic-html/docs/models/Category.html
similarity index 100%
rename from samples/dynamic-html/docs/models/Category.html
rename to samples/documentation/dynamic-html/docs/models/Category.html
diff --git a/samples/dynamic-html/docs/models/Order.html b/samples/documentation/dynamic-html/docs/models/Order.html
similarity index 100%
rename from samples/dynamic-html/docs/models/Order.html
rename to samples/documentation/dynamic-html/docs/models/Order.html
diff --git a/samples/dynamic-html/docs/models/Pet.html b/samples/documentation/dynamic-html/docs/models/Pet.html
similarity index 100%
rename from samples/dynamic-html/docs/models/Pet.html
rename to samples/documentation/dynamic-html/docs/models/Pet.html
diff --git a/samples/dynamic-html/docs/models/Tag.html b/samples/documentation/dynamic-html/docs/models/Tag.html
similarity index 100%
rename from samples/dynamic-html/docs/models/Tag.html
rename to samples/documentation/dynamic-html/docs/models/Tag.html
diff --git a/samples/dynamic-html/docs/models/User.html b/samples/documentation/dynamic-html/docs/models/User.html
similarity index 100%
rename from samples/dynamic-html/docs/models/User.html
rename to samples/documentation/dynamic-html/docs/models/User.html
diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/documentation/dynamic-html/docs/operations/PetApi.html
similarity index 100%
rename from samples/dynamic-html/docs/operations/PetApi.html
rename to samples/documentation/dynamic-html/docs/operations/PetApi.html
diff --git a/samples/dynamic-html/docs/operations/StoreApi.html b/samples/documentation/dynamic-html/docs/operations/StoreApi.html
similarity index 100%
rename from samples/dynamic-html/docs/operations/StoreApi.html
rename to samples/documentation/dynamic-html/docs/operations/StoreApi.html
diff --git a/samples/dynamic-html/docs/operations/UserApi.html b/samples/documentation/dynamic-html/docs/operations/UserApi.html
similarity index 100%
rename from samples/dynamic-html/docs/operations/UserApi.html
rename to samples/documentation/dynamic-html/docs/operations/UserApi.html
diff --git a/samples/dynamic-html/main.js b/samples/documentation/dynamic-html/main.js
similarity index 100%
rename from samples/dynamic-html/main.js
rename to samples/documentation/dynamic-html/main.js
diff --git a/samples/dynamic-html/package.json b/samples/documentation/dynamic-html/package.json
similarity index 100%
rename from samples/dynamic-html/package.json
rename to samples/documentation/dynamic-html/package.json
diff --git a/samples/html.md/.openapi-generator-ignore b/samples/documentation/html.md/.openapi-generator-ignore
similarity index 100%
rename from samples/html.md/.openapi-generator-ignore
rename to samples/documentation/html.md/.openapi-generator-ignore
diff --git a/samples/dynamic-html/.openapi-generator/VERSION b/samples/documentation/html.md/.openapi-generator/VERSION
similarity index 100%
rename from samples/dynamic-html/.openapi-generator/VERSION
rename to samples/documentation/html.md/.openapi-generator/VERSION
diff --git a/samples/html.md/index.html b/samples/documentation/html.md/index.html
similarity index 100%
rename from samples/html.md/index.html
rename to samples/documentation/html.md/index.html
diff --git a/samples/html/.openapi-generator-ignore b/samples/documentation/html/.openapi-generator-ignore
similarity index 100%
rename from samples/html/.openapi-generator-ignore
rename to samples/documentation/html/.openapi-generator-ignore
diff --git a/samples/documentation/html/.openapi-generator/VERSION b/samples/documentation/html/.openapi-generator/VERSION
new file mode 100644
index 000000000000..14900cee60e8
--- /dev/null
+++ b/samples/documentation/html/.openapi-generator/VERSION
@@ -0,0 +1 @@
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/html/index.html b/samples/documentation/html/index.html
similarity index 99%
rename from samples/html/index.html
rename to samples/documentation/html/index.html
index 0d30f2be00bd..f2a1bfb3f77d 100644
--- a/samples/html/index.html
+++ b/samples/documentation/html/index.html
@@ -181,8 +181,8 @@ font-style: italic;
   
   
OpenAPI Petstore

     
This is a sample server Petstore server. For this sample, you can use the api key special-key to test the authorization filters.

-    
More information: https://helloreverb.com

-    
Contact Info: hello@helloreverb.com

+    
More information: https//openapi-generator.tech

+    
Contact Info: team@openapitools.org

     
Version: 1.0.0

     
BasePath:/v2

     
Apache-2.0

diff --git a/samples/html2/.openapi-generator-ignore b/samples/documentation/html2/.openapi-generator-ignore
similarity index 100%
rename from samples/html2/.openapi-generator-ignore
rename to samples/documentation/html2/.openapi-generator-ignore
diff --git a/samples/documentation/html2/.openapi-generator/VERSION b/samples/documentation/html2/.openapi-generator/VERSION
new file mode 100644
index 000000000000..14900cee60e8
--- /dev/null
+++ b/samples/documentation/html2/.openapi-generator/VERSION
@@ -0,0 +1 @@
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/html2/index.html b/samples/documentation/html2/index.html
similarity index 99%
rename from samples/html2/index.html
rename to samples/documentation/html2/index.html
index 821520080add..5b9ce2fe173c 100644
--- a/samples/html2/index.html
+++ b/samples/documentation/html2/index.html
@@ -8103,7 +8103,7 @@ $(document).ready(function() {
             

               
Suggestions, contact, support and error reporting;
                   
Information URL: https://openapi-generator.tech

-                  
Contact Info: contributors@openapitools.org

+                  
Contact Info: team@openapitools.org

               

                 
Apache-2.0

                 
http://www.apache.org/licenses/LICENSE-2.0.html

diff --git a/samples/html.md/.openapi-generator/VERSION b/samples/html.md/.openapi-generator/VERSION
deleted file mode 100644
index 096bf47efe31..000000000000
--- a/samples/html.md/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/html/.openapi-generator/VERSION b/samples/html/.openapi-generator/VERSION
deleted file mode 100644
index 096bf47efe31..000000000000
--- a/samples/html/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/html2/.openapi-generator/VERSION b/samples/html2/.openapi-generator/VERSION
deleted file mode 100644
index 0f58aa041419..000000000000
--- a/samples/html2/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.1.2-SNAPSHOT
\ No newline at end of file

From b64864f47dc0a9a026ebb2a17dcca394bb1191a6 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Mon, 13 Aug 2018 13:28:22 +0800
Subject: [PATCH 17/27] Fix float/double default value in C# generator (#791)

* fix float/double default value

* better code format

* better CI for openapi3 batch files (C# client)

* update nancyfx samples

* pipe output to /dev/null to reduce log size

* fix windows batch file

* add C# API client generated by OAS3 spec
---
 .../Org.OpenAPITools.Test.csproj              |    0
 appveyor.yml                                  |    6 +
 bin/csharp-petstore.sh                        |    5 +-
 bin/openapi3/csharp-petstore.sh               |    2 +-
 bin/openapi3/run-all-petstore                 |   33 +
 bin/openapi3/windows/csharp-petstore.bat      |   14 +
 bin/openapi3/windows/run-all-petstore.cmd     |   15 +
 bin/run-all-petstore                          |    6 +-
 bin/utils/ensure-up-to-date                   |    1 +
 bin/windows/csharp-petstore-net-40.bat        |    2 +-
 bin/windows/csharp-petstore-netstandard.bat   |    2 +-
 bin/windows/csharp-petstore.bat               |    6 +-
 .../languages/AbstractCSharpCodegen.java      |   55 +-
 .../languages/CSharpClientCodegen.java        |   31 +-
 .../csharp/OpenAPIClient/docs/FakeApi.md      |    8 +-
 .../petstore/csharp/OpenAPIClient/.gitignore  |  186 ++
 .../OpenAPIClient/.openapi-generator-ignore   |   23 +
 .../OpenAPIClient/.openapi-generator/VERSION  |    1 +
 .../petstore/csharp/OpenAPIClient/.travis.yml |    9 +
 .../csharp/OpenAPIClient/Org.OpenAPITools.sln |   27 +
 .../petstore/csharp/OpenAPIClient/README.md   |  207 ++
 .../petstore/csharp/OpenAPIClient/build.bat   |   17 +
 .../petstore/csharp/OpenAPIClient/build.sh    |   68 +
 .../docs/AdditionalPropertiesClass.md         |   10 +
 .../csharp/OpenAPIClient/docs/Animal.md       |   10 +
 .../csharp/OpenAPIClient/docs/AnimalFarm.md   |    8 +
 .../OpenAPIClient/docs/AnotherFakeApi.md      |   70 +
 .../csharp/OpenAPIClient/docs/ApiResponse.md  |   11 +
 .../docs/ArrayOfArrayOfNumberOnly.md          |    9 +
 .../OpenAPIClient/docs/ArrayOfNumberOnly.md   |    9 +
 .../csharp/OpenAPIClient/docs/ArrayTest.md    |   11 +
 .../OpenAPIClient/docs/Capitalization.md      |   14 +
 .../petstore/csharp/OpenAPIClient/docs/Cat.md |   11 +
 .../csharp/OpenAPIClient/docs/Category.md     |   10 +
 .../csharp/OpenAPIClient/docs/ClassModel.md   |    9 +
 .../petstore/csharp/OpenAPIClient/docs/Dog.md |   11 +
 .../csharp/OpenAPIClient/docs/EnumArrays.md   |   10 +
 .../csharp/OpenAPIClient/docs/EnumClass.md    |    8 +
 .../csharp/OpenAPIClient/docs/EnumTest.md     |   13 +
 .../csharp/OpenAPIClient/docs/FakeApi.md      |  720 +++++
 .../docs/FakeClassnameTags123Api.md           |   75 +
 .../csharp/OpenAPIClient/docs/File.md         |    9 +
 .../OpenAPIClient/docs/FileSchemaTestClass.md |   10 +
 .../csharp/OpenAPIClient/docs/FormatTest.md   |   21 +
 .../OpenAPIClient/docs/HasOnlyReadOnly.md     |   10 +
 .../csharp/OpenAPIClient/docs/List.md         |    9 +
 .../csharp/OpenAPIClient/docs/MapTest.md      |   12 +
 ...dPropertiesAndAdditionalPropertiesClass.md |   11 +
 .../OpenAPIClient/docs/Model200Response.md    |   10 +
 .../csharp/OpenAPIClient/docs/ModelClient.md  |    9 +
 .../csharp/OpenAPIClient/docs/Name.md         |   12 +
 .../csharp/OpenAPIClient/docs/NumberOnly.md   |    9 +
 .../csharp/OpenAPIClient/docs/Order.md        |   14 +
 .../OpenAPIClient/docs/OuterComposite.md      |   11 +
 .../csharp/OpenAPIClient/docs/OuterEnum.md    |    8 +
 .../petstore/csharp/OpenAPIClient/docs/Pet.md |   14 +
 .../csharp/OpenAPIClient/docs/PetApi.md       |  593 ++++
 .../OpenAPIClient/docs/ReadOnlyFirst.md       |   10 +
 .../csharp/OpenAPIClient/docs/Return.md       |    9 +
 .../OpenAPIClient/docs/SpecialModelName.md    |    9 +
 .../csharp/OpenAPIClient/docs/StoreApi.md     |  254 ++
 .../OpenAPIClient/docs/StringBooleanMap.md    |    8 +
 .../petstore/csharp/OpenAPIClient/docs/Tag.md |   10 +
 .../csharp/OpenAPIClient/docs/User.md         |   16 +
 .../csharp/OpenAPIClient/docs/UserApi.md      |  488 ++++
 .../petstore/csharp/OpenAPIClient/git_push.sh |   52 +
 .../csharp/OpenAPIClient/mono_nunit_test.sh   |   22 +
 .../Api/AnotherFakeApiTests.cs                |   81 +
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs |  223 ++
 .../Api/FakeClassnameTags123ApiTests.cs       |   81 +
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  184 ++
 .../Api/StoreApiTests.cs                      |  116 +
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  166 ++
 .../Model/AdditionalPropertiesClassTests.cs   |   88 +
 .../Model/AnimalFarmTests.cs                  |   72 +
 .../Model/AnimalTests.cs                      |  106 +
 .../Model/ApiResponseTests.cs                 |   96 +
 .../Model/ArrayOfArrayOfNumberOnlyTests.cs    |   80 +
 .../Model/ArrayOfNumberOnlyTests.cs           |   80 +
 .../Model/ArrayTestTests.cs                   |   96 +
 .../Model/CapitalizationTests.cs              |  120 +
 .../Org.OpenAPITools.Test/Model/CatTests.cs   |   80 +
 .../Model/CategoryTests.cs                    |   88 +
 .../Model/ClassModelTests.cs                  |   80 +
 .../Org.OpenAPITools.Test/Model/DogTests.cs   |   80 +
 .../Model/EnumArraysTests.cs                  |   88 +
 .../Model/EnumClassTests.cs                   |   72 +
 .../Model/EnumTestTests.cs                    |  112 +
 .../Model/FileSchemaTestClassTests.cs         |   88 +
 .../Org.OpenAPITools.Test/Model/FileTests.cs  |   80 +
 .../Model/FormatTestTests.cs                  |  176 ++
 .../Model/HasOnlyReadOnlyTests.cs             |   88 +
 .../Org.OpenAPITools.Test/Model/ListTests.cs  |   80 +
 .../Model/MapTestTests.cs                     |  104 +
 ...ertiesAndAdditionalPropertiesClassTests.cs |   96 +
 .../Model/Model200ResponseTests.cs            |   88 +
 .../Model/ModelClientTests.cs                 |   80 +
 .../Org.OpenAPITools.Test/Model/NameTests.cs  |  104 +
 .../Model/NumberOnlyTests.cs                  |   80 +
 .../Org.OpenAPITools.Test/Model/OrderTests.cs |  120 +
 .../Model/OuterCompositeTests.cs              |   96 +
 .../Model/OuterEnumTests.cs                   |   72 +
 .../Org.OpenAPITools.Test/Model/PetTests.cs   |  120 +
 .../Model/ReadOnlyFirstTests.cs               |   88 +
 .../Model/ReturnTests.cs                      |   80 +
 .../Model/SpecialModelNameTests.cs            |   80 +
 .../Model/StringBooleanMapTests.cs            |   72 +
 .../Org.OpenAPITools.Test/Model/TagTests.cs   |   88 +
 .../Org.OpenAPITools.Test/Model/UserTests.cs  |  136 +
 .../Org.OpenAPITools.Test.csproj              |   89 +
 .../src/Org.OpenAPITools.Test/packages.config |    7 +
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  321 +++
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 2397 +++++++++++++++++
 .../Api/FakeClassnameTags123Api.cs            |  331 +++
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 1919 +++++++++++++
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  840 ++++++
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 1590 +++++++++++
 .../src/Org.OpenAPITools/Client/ApiClient.cs  |  530 ++++
 .../Org.OpenAPITools/Client/ApiException.cs   |   60 +
 .../Org.OpenAPITools/Client/ApiResponse.cs    |   54 +
 .../Org.OpenAPITools/Client/Configuration.cs  |  452 ++++
 .../Client/ExceptionFactory.cs                |   24 +
 .../Client/GlobalConfiguration.cs             |   34 +
 .../Org.OpenAPITools/Client/IApiAccessor.cs   |   42 +
 .../Client/IReadableConfiguration.cs          |   94 +
 .../Client/OpenAPIDateConverter.cs            |   30 +
 .../Model/AdditionalPropertiesClass.cs        |  140 +
 .../src/Org.OpenAPITools/Model/Animal.cs      |  175 ++
 .../src/Org.OpenAPITools/Model/AnimalFarm.cs  |  110 +
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  156 ++
 .../Model/ArrayOfArrayOfNumberOnly.cs         |  124 +
 .../Model/ArrayOfNumberOnly.cs                |  124 +
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  156 ++
 .../Org.OpenAPITools/Model/Capitalization.cs  |  205 ++
 .../src/Org.OpenAPITools/Model/Cat.cs         |  131 +
 .../src/Org.OpenAPITools/Model/Category.cs    |  140 +
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  124 +
 .../src/Org.OpenAPITools/Model/Dog.cs         |  131 +
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  |  181 ++
 .../src/Org.OpenAPITools/Model/EnumClass.cs   |   55 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |  290 ++
 .../src/Org.OpenAPITools/Model/File.cs        |  125 +
 .../Model/FileSchemaTestClass.cs              |  140 +
 .../src/Org.OpenAPITools/Model/FormatTest.cs  |  433 +++
 .../Org.OpenAPITools/Model/HasOnlyReadOnly.cs |  137 +
 .../src/Org.OpenAPITools/Model/List.cs        |  124 +
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  193 ++
 ...dPropertiesAndAdditionalPropertiesClass.cs |  156 ++
 .../Model/Model200Response.cs                 |  140 +
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  124 +
 .../src/Org.OpenAPITools/Model/Name.cs        |  181 ++
 .../src/Org.OpenAPITools/Model/NumberOnly.cs  |  124 +
 .../src/Org.OpenAPITools/Model/Order.cs       |  240 ++
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  156 ++
 .../src/Org.OpenAPITools/Model/OuterEnum.cs   |   55 +
 .../src/Org.OpenAPITools/Model/Pet.cs         |  253 ++
 .../Org.OpenAPITools/Model/ReadOnlyFirst.cs   |  138 +
 .../src/Org.OpenAPITools/Model/Return.cs      |  124 +
 .../Model/SpecialModelName.cs                 |  124 +
 .../Model/StringBooleanMap.cs                 |  110 +
 .../src/Org.OpenAPITools/Model/Tag.cs         |  140 +
 .../src/Org.OpenAPITools/Model/User.cs        |  237 ++
 .../Org.OpenAPITools/Org.OpenAPITools.csproj  |   78 +
 .../Org.OpenAPITools/Org.OpenAPITools.nuspec  |   41 +
 .../Properties/AssemblyInfo.cs                |   32 +
 .../src/Org.OpenAPITools/packages.config      |    6 +
 .../nancyfx/src/IO.Swagger/IO.Swagger.nuspec  |   14 -
 .../Models/ApiResponse.cs                     |    2 +-
 .../Models/Category.cs                        |    2 +-
 .../Models/Order.cs                           |    2 +-
 .../Models/Pet.cs                             |    2 +-
 .../Models/Tag.cs                             |    2 +-
 .../Models/User.cs                            |    2 +-
 .../Modules/PetModule.cs                      |   46 +-
 .../Modules/StoreModule.cs                    |   24 +-
 .../Modules/UserModule.cs                     |   84 +-
 .../Org.OpenAPITools.csproj}                  |    8 +-
 .../Org.OpenAPITools/Org.OpenAPITools.nuspec  |   13 +
 .../Utils/LocalDateConverter.cs               |    2 +-
 .../Utils/Parameters.cs                       |    2 +-
 .../packages.config                           |    0
 shippable.yml                                 |    2 +
 182 files changed, 22328 insertions(+), 134 deletions(-)
 rename CI/{samples => samples.ci}/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj (100%)
 create mode 100755 bin/openapi3/run-all-petstore
 create mode 100755 bin/openapi3/windows/csharp-petstore.bat
 create mode 100644 bin/openapi3/windows/run-all-petstore.cmd
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/.gitignore
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/.travis.yml
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/README.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/build.bat
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/build.sh
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Animal.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnimalFarm.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Cat.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Category.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Dog.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/File.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/List.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Name.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Order.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Pet.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Return.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Tag.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/User.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/git_push.sh
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/mono_nunit_test.sh
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/packages.config
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
 create mode 100644 samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/packages.config
 delete mode 100644 samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.nuspec
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/ApiResponse.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/Category.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/Order.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/Pet.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/Tag.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Models/User.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Modules/PetModule.cs (86%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Modules/StoreModule.cs (85%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Modules/UserModule.cs (75%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger/IO.Swagger.csproj => Org.OpenAPITools/Org.OpenAPITools.csproj} (92%)
 create mode 100644 samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Utils/LocalDateConverter.cs (97%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/Utils/Parameters.cs (99%)
 rename samples/server/petstore/nancyfx/src/{IO.Swagger => Org.OpenAPITools}/packages.config (100%)

diff --git a/CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/appveyor.yml b/appveyor.yml
index 9113aaa1bdae..9b6042162b79 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,6 +35,8 @@ build_script:
   # install openapi-generator locally
   - mvn clean install --quiet
 test_script:
+  # restore test-related files
+  - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client
   - nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)
@@ -42,6 +44,10 @@ test_script:
 
   # generate all petstore clients
   - .\bin\windows\run-all-petstore.cmd
+
+  # generate all petstore clients (openapi3)
+  - .\bin\openapi3\windows\run-all-petstore.cmd
+
 cache:
   - C:\maven\
   - C:\Users\appveyor\.m2
diff --git a/bin/csharp-petstore.sh b/bin/csharp-petstore.sh
index 0502a8fba8c0..b7c90b5a1038 100755
--- a/bin/csharp-petstore.sh
+++ b/bin/csharp-petstore.sh
@@ -29,8 +29,9 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
 
+java $JAVA_OPTS -jar $executable $ags
+
 # restore csproj file
 echo "restore csproject file: CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-cp ./CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/
+cp ./CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/
 
-java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/csharp-petstore.sh b/bin/openapi3/csharp-petstore.sh
index 9a094a0c6521..e8a5e7bb78a3 100755
--- a/bin/openapi3/csharp-petstore.sh
+++ b/bin/openapi3/csharp-petstore.sh
@@ -27,6 +27,6 @@ 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"
-ags="generate $@ -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
+ags="generate $@ -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/openapi3/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/run-all-petstore b/bin/openapi3/run-all-petstore
new file mode 100755
index 000000000000..ece3a1a14be9
--- /dev/null
+++ b/bin/openapi3/run-all-petstore
@@ -0,0 +1,33 @@
+#!/bin/bash
+# this bash script will loop through all the .sh files under bin
+# execute the script and check the result (exit code) to see if
+# there's any error
+
+echo "IMPORTANT: this script should be run by the CI (e.g. Shippable) only. There's no need to run this script to update Petstore samples for all generators."
+echo "Please press CTRL+C to stop or the script will continue in 10 seconds."
+
+sleep 10
+
+successes=0
+failures=0
+for SCRIPT in $(ls -l ./bin/openapi3/*.sh | grep -v all)
+do
+    if [ -f ${SCRIPT} -a -x ${SCRIPT} ]; then
+        echo "Running $SCRIPT (output to /dev/null)"
+        ${SCRIPT} 2>&1 > /dev/null
+        rc=$?
+        if [[ ${rc} != 0 ]]; then
+            >&2 echo "ERROR!! FAILED TO RUN ${SCRIPT}"
+            ((failures+=1))
+        else
+            ((successes+=1))
+        fi
+    fi
+done
+
+if (( failures > 0 )); then
+   >&2 echo "[ERROR] ${failures} out of $((failures+successes)) scripts failed."
+   exit 1
+else
+    echo "[SUCCESS] ${successes} generators finished."
+fi
diff --git a/bin/openapi3/windows/csharp-petstore.bat b/bin/openapi3/windows/csharp-petstore.bat
new file mode 100755
index 000000000000..5e8de764dc27
--- /dev/null
+++ b/bin/openapi3/windows/csharp-petstore.bat
@@ -0,0 +1,14 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test/resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\openapi3\client\petstore\csharp\SwaggerClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}
+
+java %JAVA_OPTS% -jar %executable% %ags%
+
+REM restore csproj file
+echo "restore csproject file: CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj"
+copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\openapi3\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\
diff --git a/bin/openapi3/windows/run-all-petstore.cmd b/bin/openapi3/windows/run-all-petstore.cmd
new file mode 100644
index 000000000000..1e5c0fb4ed8f
--- /dev/null
+++ b/bin/openapi3/windows/run-all-petstore.cmd
@@ -0,0 +1,15 @@
+REM this batch file will loop through all the .bat files under bin\openapi3\windows\
+REM execute the script and check the error level to see if there's any error
+
+echo IMPORTANT: this script should be run by the CI (e.g. appveyor) only. There's no need to run this script to update Petstore samples for all generators.
+echo Please press CTRL+C to stop or the script will continue in 10 seconds.
+
+timeout 10
+
+for /f "delims=" %%i in ('dir /b ".\bin\openapi3\windows\*.bat"') do (
+
+  CALL .\bin\openapi3\windows\%%i
+
+  IF ERRORLEVEL 1 IF NOT ERRORLEVEL 2 exit /b 1
+
+)
diff --git a/bin/run-all-petstore b/bin/run-all-petstore
index 4092352ab4d4..b709a303b476 100755
--- a/bin/run-all-petstore
+++ b/bin/run-all-petstore
@@ -13,8 +13,8 @@ failures=0
 for SCRIPT in $(ls -l ./bin/*.sh | grep -v all)
 do
     if [ -f ${SCRIPT} -a -x ${SCRIPT} ]; then
-        echo "Running $SCRIPT"
-        ${SCRIPT}
+        echo "Running $SCRIPT (output to /dev/null)"
+        ${SCRIPT} 2>&1 > /dev/null
         rc=$?
         if [[ ${rc} != 0 ]]; then
             >&2 echo "ERROR!! FAILED TO RUN ${SCRIPT}"
@@ -30,4 +30,4 @@ if (( failures > 0 )); then
    exit 1
 else
     echo "[SUCCESS] ${successes} generators finished."
-fi
\ No newline at end of file
+fi
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
index e5fc703d5712..d6b719257696 100755
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -31,6 +31,7 @@ sleep 5
 ./bin/typescript-inversify-petstore.sh > /dev/null 2>&1
 ./bin/rust-server-petstore.sh > /dev/null 2>&1
 ./bin/openapi3/haskell-http-client-petstore.sh > /dev/null 2>&1
+./bin/csharp-petstore.sh > /dev/null 2>&1
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then
diff --git a/bin/windows/csharp-petstore-net-40.bat b/bin/windows/csharp-petstore-net-40.bat
index a80ba284587b..f7722c8205ce 100644
--- a/bin/windows/csharp-petstore-net-40.bat
+++ b/bin/windows/csharp-petstore-net-40.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/SwaggerClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-40.json
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\SwaggerClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c .\bin\csharp-petstore-net-40.json
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/csharp-petstore-netstandard.bat b/bin/windows/csharp-petstore-netstandard.bat
index de8abe1a099e..236071868c72 100644
--- a/bin/windows/csharp-petstore-netstandard.bat
+++ b/bin/windows/csharp-petstore-netstandard.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\SwaggerClientNetStandard --additional-properties targetFramework=v5.0,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\SwaggerClientNetStandard --additional-properties targetFramework=v5.0,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/csharp-petstore.bat b/bin/windows/csharp-petstore.bat
index a838f877f845..b64fd2cabf2c 100755
--- a/bin/windows/csharp-petstore.bat
+++ b/bin/windows/csharp-petstore.bat
@@ -9,7 +9,7 @@ set ags=generate -i modules\openapi-generator\src\test/resources\2_0\petstore-wi
 
 java %JAVA_OPTS% -jar %executable% %ags%
 
-# restore csproj file
-echo "restore csproject file: CI\samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj"
-copy .\CI\samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj .\samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\
+REM restore csproj file
+echo "restore csproject file: CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj"
+copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index c5633e0acc2d..023f6f51e12e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -19,6 +19,7 @@ package org.openapitools.codegen.languages;
 
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
+import io.swagger.v3.core.util.Json;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.*;
@@ -713,12 +714,22 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                 return p.getDefault().toString();
             }
         } else if (ModelUtils.isDateSchema(p)) {
-            // TODO
+            if (p.getDefault() != null) {
+                return "\"" + p.getDefault().toString() + "\"";
+            }
         } else if (ModelUtils.isDateTimeSchema(p)) {
-            // TODO
+            if (p.getDefault() != null) {
+                return "\"" + p.getDefault().toString() + "\"";
+            }
         } else if (ModelUtils.isNumberSchema(p)) {
             if (p.getDefault() != null) {
-                return p.getDefault().toString();
+                if (ModelUtils.isFloatSchema(p)) { // float
+                    return p.getDefault().toString() + "F";
+                } else if (ModelUtils.isDoubleSchema(p)) { // double
+                    return p.getDefault().toString() + "D";
+                } else {
+                    return p.getDefault().toString();
+                }
             }
         } else if (ModelUtils.isIntegerSchema(p)) {
             if (p.getDefault() != null) {
@@ -967,4 +978,42 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         // also treat double/decimal/float as "string" in enum so that the values (e.g. 2.8) get double-quoted
         return "String".equalsIgnoreCase(dataType) || "double?".equals(dataType) || "decimal?".equals(dataType) || "float?".equals(dataType);
     }
+
+    @Override
+    public void setParameterExampleValue(CodegenParameter codegenParameter) {
+
+        // set the example value
+        // if not specified in x-example, generate a default value
+        // TODO need to revise how to obtain the example value
+        if (codegenParameter.vendorExtensions != null && codegenParameter.vendorExtensions.containsKey("x-example")) {
+            codegenParameter.example = Json.pretty(codegenParameter.vendorExtensions.get("x-example"));
+        } else if (Boolean.TRUE.equals(codegenParameter.isBoolean)) {
+            codegenParameter.example = "true";
+        } else if (Boolean.TRUE.equals(codegenParameter.isLong)) {
+            codegenParameter.example = "789";
+        } else if (Boolean.TRUE.equals(codegenParameter.isInteger)) {
+            codegenParameter.example = "56";
+        } else if (Boolean.TRUE.equals(codegenParameter.isFloat)) {
+            codegenParameter.example = "3.4F";
+        } else if (Boolean.TRUE.equals(codegenParameter.isDouble)) {
+            codegenParameter.example = "1.2D";
+        } else if (Boolean.TRUE.equals(codegenParameter.isNumber)) {
+            codegenParameter.example = "8.14";
+        } else if (Boolean.TRUE.equals(codegenParameter.isBinary)) {
+            codegenParameter.example = "BINARY_DATA_HERE";
+        } else if (Boolean.TRUE.equals(codegenParameter.isByteArray)) {
+            codegenParameter.example = "BYTE_ARRAY_DATA_HERE";
+        } else if (Boolean.TRUE.equals(codegenParameter.isFile)) {
+            codegenParameter.example = "/path/to/file.txt";
+        } else if (Boolean.TRUE.equals(codegenParameter.isDate)) {
+            codegenParameter.example = "2013-10-20";
+        } else if (Boolean.TRUE.equals(codegenParameter.isDateTime)) {
+            codegenParameter.example = "2013-10-20T19:20:30+01:00";
+        } else if (Boolean.TRUE.equals(codegenParameter.isUuid)) {
+            codegenParameter.example = "38400000-8cf0-11bd-b23e-10b96e4ef00d";
+        } else if (Boolean.TRUE.equals(codegenParameter.isString)) {
+            codegenParameter.example = codegenParameter.paramName + "_example";
+        }
+
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 5420fdf6b620..0e493b932861 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -603,11 +603,11 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     }
 
     /*
-    * The pattern spec follows the Perl convention and style of modifiers. .NET
-    * does not support this syntax directly so we need to convert the pattern to a .NET compatible
-    * format and apply modifiers in a compatible way.
-    * See https://msdn.microsoft.com/en-us/library/yd1hzczs(v=vs.110).aspx for .NET options.
-    */
+     * The pattern spec follows the Perl convention and style of modifiers. .NET
+     * does not support this syntax directly so we need to convert the pattern to a .NET compatible
+     * format and apply modifiers in a compatible way.
+     * See https://msdn.microsoft.com/en-us/library/yd1hzczs(v=vs.110).aspx for .NET options.
+     */
     public void postProcessPattern(String pattern, Map vendorExtensions) {
         if (pattern != null) {
             int i = pattern.lastIndexOf('/');
@@ -707,7 +707,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         }
 
         // number
-        if(datatype.startsWith("int") || datatype.startsWith("long") ||
+        if (datatype.startsWith("int") || datatype.startsWith("long") ||
                 datatype.startsWith("double") || datatype.startsWith("float")) {
             String varName = "NUMBER_" + value;
             varName = varName.replaceAll("-", "MINUS_");
@@ -751,13 +751,18 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
     public String getNameUsingModelPropertyNaming(String name) {
         switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) {
-            case original:    return name;
-            case camelCase:   return camelize(name, true);
-            case PascalCase:  return camelize(name);
-            case snake_case:  return underscore(name);
-            default:          throw new IllegalArgumentException("Invalid model property naming '" +
-                    name + "'. Must be 'original', 'camelCase', " +
-                    "'PascalCase' or 'snake_case'");
+            case original:
+                return name;
+            case camelCase:
+                return camelize(name, true);
+            case PascalCase:
+                return camelize(name);
+            case snake_case:
+                return underscore(name);
+            default:
+                throw new IllegalArgumentException("Invalid model property naming '" +
+                        name + "'. Must be 'original', 'camelCase', " +
+                        "'PascalCase' or 'snake_case'");
         }
     }
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
index 9c91addfad03..d51d29c09a6b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -160,7 +160,7 @@ namespace Example
         public void main()
         {
             var apiInstance = new FakeApi();
-            var body = 1.2;  // decimal? | Input number as post body (optional) 
+            var body = 1.2D;  // decimal? | Input number as post body (optional) 
 
             try
             {
@@ -464,13 +464,13 @@ namespace Example
 
             var apiInstance = new FakeApi();
             var number = 8.14;  // decimal? | None
-            var _double = 1.2;  // double? | None
+            var _double = 1.2D;  // double? | None
             var patternWithoutDelimiter = patternWithoutDelimiter_example;  // string | None
             var _byte = BYTE_ARRAY_DATA_HERE;  // byte[] | None
             var integer = 56;  // int? | None (optional) 
             var int32 = 56;  // int? | None (optional) 
             var int64 = 789;  // long? | None (optional) 
-            var _float = 3.4;  // float? | None (optional) 
+            var _float = 3.4F;  // float? | None (optional) 
             var _string = _string_example;  // string | None (optional) 
             var binary = BINARY_DATA_HERE;  // System.IO.Stream | None (optional) 
             var date = 2013-10-20;  // DateTime? | None (optional) 
@@ -554,7 +554,7 @@ namespace Example
             var enumQueryStringArray = enumQueryStringArray_example;  // List | Query parameter enum test (string array) (optional) 
             var enumQueryString = enumQueryString_example;  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 56;  // int? | Query parameter enum test (double) (optional) 
-            var enumQueryDouble = 1.2;  // double? | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.2D;  // double? | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional)  (default to $)
             var enumFormString = enumFormString_example;  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/.gitignore b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.gitignore
new file mode 100644
index 000000000000..17302c93bf09
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.gitignore
@@ -0,0 +1,186 @@
+# Ref: https://gist.github.com/kmorcinek/2710267
+# Download this file using PowerShell v3 under Windows with the following comand
+# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+./nuget
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# OS generated files #
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+modulesbin/
+tempbin/
+
+# EPiServer Site file (VPP)
+AppData/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# vim
+*.txt~
+*.swp
+*.swo
+
+# svn
+.svn
+
+# SQL Server files
+**/App_Data/*.mdf
+**/App_Data/*.ldf
+**/App_Data/*.sdf
+
+
+#LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac desktop service store files
+.DS_Store
+
+# SASS Compiler cache
+.sass-cache
+
+# Visual Studio 2014 CTP
+**/*.sln.ide
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore
new file mode 100644
index 000000000000..7484ee590a38
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
new file mode 100644
index 000000000000..14900cee60e8
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -0,0 +1 @@
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/.travis.yml b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.travis.yml
new file mode 100644
index 000000000000..e4965fc7e5c8
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/.travis.yml
@@ -0,0 +1,9 @@
+#
+# Generated by: https://github.com/openapitools/openapi-generator.git
+#
+language: csharp
+mono:
+  - latest
+solution: Org.OpenAPITools.sln
+script:
+  - /bin/sh ./mono_nunit_test.sh
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln b/samples/openapi3/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln
new file mode 100644
index 000000000000..5b15451c9dcf
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+VisualStudioVersion = 12.0.0.0
+MinimumVisualStudioVersion = 10.0.0.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools.Test", "src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/README.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/README.md
new file mode 100644
index 000000000000..a2b8a9b17a0f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/README.md
@@ -0,0 +1,207 @@
+# Org.OpenAPITools - the C# library for the OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
+
+
+## Frameworks supported
+- .NET 4.0 or later
+- Windows Phone 7.1 (Mango)
+
+
+## Dependencies
+- [RestSharp](https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
+- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.2.0 or later
+
+The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+Install-Package JsonSubTypes
+```
+
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
+
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] `/bin/sh build.sh`
+- [Windows] `build.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+```
+
+## Packaging
+
+A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
+
+This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
+
+```
+nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
+```
+
+Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
+
+
+## Getting Started
+
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Example
+    {
+        public void main()
+        {
+
+            var apiInstance = new AnotherFakeApi();
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test special tags
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
+            }
+
+        }
+    }
+}
+```
+
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
+*FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
+*FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
+*FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**TestBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
+*FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
+*FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**TestEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**TestInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**TestJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeClassnameTags123Api* | [**TestClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+
+## Documentation for Models
+
+ - [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [Model.Animal](docs/Animal.md)
+ - [Model.AnimalFarm](docs/AnimalFarm.md)
+ - [Model.ApiResponse](docs/ApiResponse.md)
+ - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
+ - [Model.ArrayTest](docs/ArrayTest.md)
+ - [Model.Capitalization](docs/Capitalization.md)
+ - [Model.Cat](docs/Cat.md)
+ - [Model.Category](docs/Category.md)
+ - [Model.ClassModel](docs/ClassModel.md)
+ - [Model.Dog](docs/Dog.md)
+ - [Model.EnumArrays](docs/EnumArrays.md)
+ - [Model.EnumClass](docs/EnumClass.md)
+ - [Model.EnumTest](docs/EnumTest.md)
+ - [Model.File](docs/File.md)
+ - [Model.FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [Model.FormatTest](docs/FormatTest.md)
+ - [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [Model.List](docs/List.md)
+ - [Model.MapTest](docs/MapTest.md)
+ - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model.Model200Response](docs/Model200Response.md)
+ - [Model.ModelClient](docs/ModelClient.md)
+ - [Model.Name](docs/Name.md)
+ - [Model.NumberOnly](docs/NumberOnly.md)
+ - [Model.Order](docs/Order.md)
+ - [Model.OuterComposite](docs/OuterComposite.md)
+ - [Model.OuterEnum](docs/OuterEnum.md)
+ - [Model.Pet](docs/Pet.md)
+ - [Model.ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [Model.Return](docs/Return.md)
+ - [Model.SpecialModelName](docs/SpecialModelName.md)
+ - [Model.StringBooleanMap](docs/StringBooleanMap.md)
+ - [Model.Tag](docs/Tag.md)
+ - [Model.User](docs/User.md)
+
+
+
+## Documentation for Authorization
+
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+
+### api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+
+### http_basic_test
+
+- **Type**: HTTP basic authentication
+
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.bat b/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.bat
new file mode 100644
index 000000000000..88942a71d0f7
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.bat
@@ -0,0 +1,17 @@
+:: Generated by: https://github.com/openapitools/openapi-generator.git
+::
+
+@echo off
+
+SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
+
+if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '.\nuget.exe')"
+.\nuget.exe install src\Org.OpenAPITools\packages.config -o packages
+
+if not exist ".\bin" mkdir bin
+
+copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
+copy packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll bin\JsonSubTypes.dll
+copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
+%CSCPATH%\csc  /reference:bin\Newtonsoft.Json.dll;bin\JsonSubTypes.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll  /target:library /out:bin\Org.OpenAPITools.dll /recurse:src\Org.OpenAPITools\*.cs /doc:bin\Org.OpenAPITools.xml
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.sh b/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.sh
new file mode 100644
index 000000000000..269c087258e9
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/build.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+#
+# Generated by: https://github.com/openapitools/openapi-generator.git
+#
+
+frameworkVersion=net45
+
+# sdk must match installed framworks under PREFIX/lib/mono/[value]
+sdk=4.5.2-api
+
+# langversion refers to C# language features. see man mcs for details.
+langversion=${sdk}
+nuget_cmd=nuget
+
+# Match against our known SDK possibilities
+case "${sdk}" in
+  4)
+    langversion=4
+    ;;
+  4.5*)
+    langversion=5
+    ;;
+  4.6*)
+    langversion=6
+    ;;
+  4.7*)
+    langversion=7 # ignoring 7.1 for now.
+    ;;
+  *)
+    langversion=6
+    ;;
+esac
+
+echo "[INFO] Target framework: ${frameworkVersion}"
+
+if ! type nuget &>/dev/null; then
+    echo "[INFO] Download nuget and packages"
+    wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe;
+    nuget_cmd="mono nuget.exe"
+fi
+
+mozroots --import --sync
+${nuget_cmd} install src/Org.OpenAPITools/packages.config -o packages;
+
+echo "[INFO] Copy DLLs to the 'bin' folder"
+mkdir -p bin;
+cp packages/Newtonsoft.Json.10.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
+cp packages/JsonSubTypes.1.2.0/lib/net45/JsonSubTypes.dll bin/JsonSubTypes.dll
+
+echo "[INFO] Run 'mcs' to build bin/Org.OpenAPITools.dll"
+mcs -langversion:${langversion} -sdk:${sdk} -r:bin/Newtonsoft.Json.dll,bin/JsonSubTypes.dll,\
+bin/RestSharp.dll,\
+System.ComponentModel.DataAnnotations.dll,\
+System.Runtime.Serialization.dll \
+-target:library \
+-out:bin/Org.OpenAPITools.dll \
+-recurse:'src/Org.OpenAPITools/*.cs' \
+-doc:bin/Org.OpenAPITools.xml \
+-platform:anycpu
+
+if [ $? -ne 0 ]
+then
+  echo "[ERROR] Compilation failed with exit code $?"
+  exit 1
+else
+  echo "[INFO] bin/Org.OpenAPITools.dll was created successfully"
+fi
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..057f5bd65dfc
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesClass
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MapProperty** | **Dictionary<string, string>** |  | [optional] 
+**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Animal.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Animal.md
new file mode 100644
index 000000000000..a97ce49b8018
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Animal.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.Animal
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+**Color** | **string** |  | [optional] [default to "red"]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnimalFarm.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnimalFarm.md
new file mode 100644
index 000000000000..69c517258058
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnimalFarm.md
@@ -0,0 +1,8 @@
+# Org.OpenAPITools.Model.AnimalFarm
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
new file mode 100644
index 000000000000..81cc3106d64f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
@@ -0,0 +1,70 @@
+# Org.OpenAPITools.Api.AnotherFakeApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**Call123TestSpecialTags**](AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+
+
+
+# **Call123TestSpecialTags**
+> ModelClient Call123TestSpecialTags (ModelClient modelClient)
+
+To test special tags
+
+To test special tags and operation ID starting with number
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Call123TestSpecialTagsExample
+    {
+        public void main()
+        {
+            var apiInstance = new AnotherFakeApi();
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test special tags
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **modelClient** | [**ModelClient**](ModelClient.md)| client model | 
+
+### Return type
+
+[**ModelClient**](ModelClient.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md
new file mode 100644
index 000000000000..01b35815bd40
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.ApiResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Code** | **int?** |  | [optional] 
+**Type** | **string** |  | [optional] 
+**Message** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
new file mode 100644
index 000000000000..614546d32564
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ArrayArrayNumber** | **List<List<decimal?>>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md
new file mode 100644
index 000000000000..1886a6edcb46
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.ArrayOfNumberOnly
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ArrayNumber** | **List<decimal?>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md
new file mode 100644
index 000000000000..ff6a6cb24b0e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.ArrayTest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List<string>** |  | [optional] 
+**ArrayArrayOfInteger** | **List<List<long?>>** |  | [optional] 
+**ArrayArrayOfModel** | **List<List<ReadOnlyFirst>>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md
new file mode 100644
index 000000000000..74c1ab66db29
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md
@@ -0,0 +1,14 @@
+# Org.OpenAPITools.Model.Capitalization
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SmallCamel** | **string** |  | [optional] 
+**CapitalCamel** | **string** |  | [optional] 
+**SmallSnake** | **string** |  | [optional] 
+**CapitalSnake** | **string** |  | [optional] 
+**SCAETHFlowPoints** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Cat.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Cat.md
new file mode 100644
index 000000000000..4b79315204f3
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Cat.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.Cat
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+**Color** | **string** |  | [optional] [default to "red"]
+**Declawed** | **bool?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Category.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Category.md
new file mode 100644
index 000000000000..860a468e35c8
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Category.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.Category
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md
new file mode 100644
index 000000000000..556b05db2410
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.ClassModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Class** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Dog.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Dog.md
new file mode 100644
index 000000000000..aa5df1a927a1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Dog.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.Dog
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+**Color** | **string** |  | [optional] [default to "red"]
+**Breed** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
new file mode 100644
index 000000000000..2dfe0e223884
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.EnumArrays
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**JustSymbol** | **string** |  | [optional] 
+**ArrayEnum** | **List<string>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md
new file mode 100644
index 000000000000..4fb1eae9c066
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md
@@ -0,0 +1,8 @@
+# Org.OpenAPITools.Model.EnumClass
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md
new file mode 100644
index 000000000000..65bc4d2cb044
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md
@@ -0,0 +1,13 @@
+# Org.OpenAPITools.Model.EnumTest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EnumString** | **string** |  | [optional] 
+**EnumStringRequired** | **string** |  | 
+**EnumInteger** | **int?** |  | [optional] 
+**EnumNumber** | **double?** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
new file mode 100644
index 000000000000..f38493a39df6
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -0,0 +1,720 @@
+# Org.OpenAPITools.Api.FakeApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
+[**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
+[**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
+[**FakeOuterStringSerialize**](FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+[**TestBodyWithFileSchema**](FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
+[**TestBodyWithQueryParams**](FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
+[**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
+[**TestEndpointParameters**](FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**TestEnumParameters**](FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
+[**TestInlineAdditionalProperties**](FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+[**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
+
+
+
+# **FakeOuterBooleanSerialize**
+> bool? FakeOuterBooleanSerialize (bool? body = null)
+
+
+
+Test serialization of outer boolean types
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FakeOuterBooleanSerializeExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var body = true;  // bool? | Input boolean as post body (optional) 
+
+            try
+            {
+                bool? result = apiInstance.FakeOuterBooleanSerialize(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.FakeOuterBooleanSerialize: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **bool?**| Input boolean as post body | [optional] 
+
+### Return type
+
+**bool?**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **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)
+
+
+# **FakeOuterCompositeSerialize**
+> OuterComposite FakeOuterCompositeSerialize (OuterComposite outerComposite = null)
+
+
+
+Test serialization of object with outer number type
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FakeOuterCompositeSerializeExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var outerComposite = new OuterComposite(); // OuterComposite | Input composite as post body (optional) 
+
+            try
+            {
+                OuterComposite result = apiInstance.FakeOuterCompositeSerialize(outerComposite);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.FakeOuterCompositeSerialize: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerComposite** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional] 
+
+### Return type
+
+[**OuterComposite**](OuterComposite.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **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)
+
+
+# **FakeOuterNumberSerialize**
+> decimal? FakeOuterNumberSerialize (decimal? body = null)
+
+
+
+Test serialization of outer number types
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FakeOuterNumberSerializeExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var body = 1.2D;  // decimal? | Input number as post body (optional) 
+
+            try
+            {
+                decimal? result = apiInstance.FakeOuterNumberSerialize(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.FakeOuterNumberSerialize: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **decimal?**| Input number as post body | [optional] 
+
+### Return type
+
+**decimal?**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **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)
+
+
+# **FakeOuterStringSerialize**
+> string FakeOuterStringSerialize (string body = null)
+
+
+
+Test serialization of outer string types
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FakeOuterStringSerializeExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var body = body_example;  // string | Input string as post body (optional) 
+
+            try
+            {
+                string result = apiInstance.FakeOuterStringSerialize(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.FakeOuterStringSerialize: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **string**| Input string as post body | [optional] 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **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)
+
+
+# **TestBodyWithFileSchema**
+> void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass)
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestBodyWithFileSchemaExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var fileSchemaTestClass = new FileSchemaTestClass(); // FileSchemaTestClass | 
+
+            try
+            {
+                apiInstance.TestBodyWithFileSchema(fileSchemaTestClass);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestBodyWithFileSchema: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestBodyWithQueryParams**
+> void TestBodyWithQueryParams (string query, User user)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestBodyWithQueryParamsExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var query = query_example;  // string | 
+            var user = new User(); // User | 
+
+            try
+            {
+                apiInstance.TestBodyWithQueryParams(query, user);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestBodyWithQueryParams: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **string**|  | 
+ **user** | [**User**](User.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestClientModel**
+> ModelClient TestClientModel (ModelClient modelClient)
+
+To test \"client\" model
+
+To test \"client\" model
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestClientModelExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test \"client\" model
+                ModelClient result = apiInstance.TestClientModel(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestClientModel: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **modelClient** | [**ModelClient**](ModelClient.md)| client model | 
+
+### Return type
+
+[**ModelClient**](ModelClient.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestEndpointParameters**
+> void TestEndpointParameters (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null)
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestEndpointParametersExample
+    {
+        public void main()
+        {
+            // Configure HTTP basic authorization: http_basic_test
+            Configuration.Default.Username = "YOUR_USERNAME";
+            Configuration.Default.Password = "YOUR_PASSWORD";
+
+            var apiInstance = new FakeApi();
+            var number = 1.2D;  // decimal? | None
+            var _double = 1.2D;  // double? | None
+            var patternWithoutDelimiter = patternWithoutDelimiter_example;  // string | None
+            var _byte = BYTE_ARRAY_DATA_HERE;  // byte[] | None
+            var integer = 56;  // int? | None (optional) 
+            var int32 = 56;  // int? | None (optional) 
+            var int64 = 789;  // long? | None (optional) 
+            var _float = 3.4F;  // float? | None (optional) 
+            var _string = _string_example;  // string | None (optional) 
+            var binary = BINARY_DATA_HERE;  // System.IO.Stream | None (optional) 
+            var date = 2013-10-20;  // DateTime? | None (optional) 
+            var dateTime = 2013-10-20T19:20:30+01:00;  // DateTime? | None (optional) 
+            var password = password_example;  // string | None (optional) 
+            var callback = callback_example;  // string | None (optional) 
+
+            try
+            {
+                // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestEndpointParameters: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **decimal?**| None | 
+ **_double** | **double?**| None | 
+ **patternWithoutDelimiter** | **string**| None | 
+ **_byte** | **byte[]**| None | 
+ **integer** | **int?**| None | [optional] 
+ **int32** | **int?**| None | [optional] 
+ **int64** | **long?**| None | [optional] 
+ **_float** | **float?**| None | [optional] 
+ **_string** | **string**| None | [optional] 
+ **binary** | **System.IO.Stream**| None | [optional] 
+ **date** | **DateTime?**| None | [optional] 
+ **dateTime** | **DateTime?**| None | [optional] 
+ **password** | **string**| None | [optional] 
+ **callback** | **string**| None | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[http_basic_test](../README.md#http_basic_test)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestEnumParameters**
+> void TestEnumParameters (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null)
+
+To test enum parameters
+
+To test enum parameters
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestEnumParametersExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var enumHeaderStringArray = enumHeaderStringArray_example;  // List | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = enumHeaderString_example;  // string | Header parameter enum test (string) (optional)  (default to -efg)
+            var enumQueryStringArray = enumQueryStringArray_example;  // List | Query parameter enum test (string array) (optional) 
+            var enumQueryString = enumQueryString_example;  // string | Query parameter enum test (string) (optional)  (default to -efg)
+            var enumQueryInteger = 56;  // int? | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.2D;  // double? | Query parameter enum test (double) (optional) 
+            var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional)  (default to $)
+            var enumFormString = enumFormString_example;  // string | Form parameter enum test (string) (optional)  (default to -efg)
+
+            try
+            {
+                // To test enum parameters
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestEnumParameters: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **enumHeaderStringArray** | **List<string>**| Header parameter enum test (string array) | [optional] 
+ **enumHeaderString** | **string**| Header parameter enum test (string) | [optional] [default to -efg]
+ **enumQueryStringArray** | **List<string>**| Query parameter enum test (string array) | [optional] 
+ **enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg]
+ **enumQueryInteger** | **int?**| Query parameter enum test (double) | [optional] 
+ **enumQueryDouble** | **double?**| Query parameter enum test (double) | [optional] 
+ **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] [default to $]
+ **enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestInlineAdditionalProperties**
+> void TestInlineAdditionalProperties (Dictionary requestBody)
+
+test inline additionalProperties
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestInlineAdditionalPropertiesExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var requestBody = new Dictionary(); // Dictionary | request body
+
+            try
+            {
+                // test inline additionalProperties
+                apiInstance.TestInlineAdditionalProperties(requestBody);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestInlineAdditionalProperties: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **requestBody** | [**Dictionary<string, string>**](string.md)| request body | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **TestJsonFormData**
+> void TestJsonFormData (string param, string param2)
+
+test json serialization of form data
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestJsonFormDataExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var param = param_example;  // string | field1
+            var param2 = param2_example;  // string | field2
+
+            try
+            {
+                // test json serialization of form data
+                apiInstance.TestJsonFormData(param, param2);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.TestJsonFormData: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | **string**| field1 | 
+ **param2** | **string**| field2 | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
new file mode 100644
index 000000000000..f069b0983997
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
@@ -0,0 +1,75 @@
+# Org.OpenAPITools.Api.FakeClassnameTags123Api
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**TestClassname**](FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
+
+
+
+# **TestClassname**
+> ModelClient TestClassname (ModelClient modelClient)
+
+To test class name in snake case
+
+To test class name in snake case
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class TestClassnameExample
+    {
+        public void main()
+        {
+            // Configure API key authorization: api_key_query
+            Configuration.Default.AddApiKey("api_key_query", "YOUR_API_KEY");
+            // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+            // Configuration.Default.AddApiKeyPrefix("api_key_query", "Bearer");
+
+            var apiInstance = new FakeClassnameTags123Api();
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test class name in snake case
+                ModelClient result = apiInstance.TestClassname(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeClassnameTags123Api.TestClassname: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **modelClient** | [**ModelClient**](ModelClient.md)| client model | 
+
+### Return type
+
+[**ModelClient**](ModelClient.md)
+
+### Authorization
+
+[api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/File.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/File.md
new file mode 100644
index 000000000000..acf85a4c001a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/File.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.File
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SourceURI** | **string** | Test capitalization | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
new file mode 100644
index 000000000000..e0820fa4e650
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.FileSchemaTestClass
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**File** | **System.IO.Stream** |  | [optional] 
+**Files** | **List<System.IO.Stream>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md
new file mode 100644
index 000000000000..f82c08bd75bd
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md
@@ -0,0 +1,21 @@
+# Org.OpenAPITools.Model.FormatTest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Integer** | **int?** |  | [optional] 
+**Int32** | **int?** |  | [optional] 
+**Int64** | **long?** |  | [optional] 
+**Number** | **decimal?** |  | 
+**Float** | **float?** |  | [optional] 
+**Double** | **double?** |  | [optional] 
+**String** | **string** |  | [optional] 
+**Byte** | **byte[]** |  | 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**Date** | **DateTime?** |  | 
+**DateTime** | **DateTime?** |  | [optional] 
+**Uuid** | **Guid?** |  | [optional] 
+**Password** | **string** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md
new file mode 100644
index 000000000000..95f49de194c1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.HasOnlyReadOnly
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Bar** | **string** |  | [optional] 
+**Foo** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/List.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/List.md
new file mode 100644
index 000000000000..484c2a0992c6
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/List.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.List
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_123List** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MapTest.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
new file mode 100644
index 000000000000..ee62dbf135fa
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
@@ -0,0 +1,12 @@
+# Org.OpenAPITools.Model.MapTest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MapMapOfString** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapOfEnumString** | **Dictionary<string, string>** |  | [optional] 
+**DirectMap** | **Dictionary<string, bool?>** |  | [optional] 
+**IndirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..9b8e2e3434c1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Uuid** | **Guid?** |  | [optional] 
+**DateTime** | **DateTime?** |  | [optional] 
+**Map** | [**Dictionary<string, Animal>**](Animal.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md
new file mode 100644
index 000000000000..16337f9b6b2d
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.Model200Response
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **int?** |  | [optional] 
+**Class** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
new file mode 100644
index 000000000000..ecc7b60ce558
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.ModelClient
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**__Client** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Name.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Name.md
new file mode 100644
index 000000000000..e22fef95673d
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Name.md
@@ -0,0 +1,12 @@
+# Org.OpenAPITools.Model.Name
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_Name** | **int?** |  | 
+**SnakeCase** | **int?** |  | [optional] 
+**Property** | **string** |  | [optional] 
+**_123Number** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md
new file mode 100644
index 000000000000..5f00dedf1c39
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.NumberOnly
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**JustNumber** | **decimal?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Order.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Order.md
new file mode 100644
index 000000000000..984bd5ca063e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Order.md
@@ -0,0 +1,14 @@
+# Org.OpenAPITools.Model.Order
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**PetId** | **long?** |  | [optional] 
+**Quantity** | **int?** |  | [optional] 
+**ShipDate** | **DateTime?** |  | [optional] 
+**Status** | **string** | Order Status | [optional] 
+**Complete** | **bool?** |  | [optional] [default to false]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md
new file mode 100644
index 000000000000..4091cd23f2e1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.OuterComposite
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MyNumber** | **decimal?** |  | [optional] 
+**MyString** | **string** |  | [optional] 
+**MyBoolean** | **bool?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md
new file mode 100644
index 000000000000..22713352ca08
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md
@@ -0,0 +1,8 @@
+# Org.OpenAPITools.Model.OuterEnum
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Pet.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Pet.md
new file mode 100644
index 000000000000..0ac711337aa8
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Pet.md
@@ -0,0 +1,14 @@
+# Org.OpenAPITools.Model.Pet
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Category** | [**Category**](Category.md) |  | [optional] 
+**Name** | **string** |  | 
+**PhotoUrls** | **List<string>** |  | 
+**Tags** | [**List<Tag>**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/PetApi.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
new file mode 100644
index 000000000000..dd23df9b3683
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
@@ -0,0 +1,593 @@
+# Org.OpenAPITools.Api.PetApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+[**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+[**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+[**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+[**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+[**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**UploadFileWithRequiredFile**](PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+
+
+
+# **AddPet**
+> void AddPet (Pet pet)
+
+Add a new pet to the store
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class AddPetExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+
+            try
+            {
+                // Add a new pet to the store
+                apiInstance.AddPet(pet);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.AddPet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **DeletePet**
+> void DeletePet (long? petId, string apiKey = null)
+
+Deletes a pet
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class DeletePetExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | Pet id to delete
+            var apiKey = apiKey_example;  // string |  (optional) 
+
+            try
+            {
+                // Deletes a pet
+                apiInstance.DeletePet(petId, apiKey);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| Pet id to delete | 
+ **apiKey** | **string**|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **FindPetsByStatus**
+> List FindPetsByStatus (List status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FindPetsByStatusExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var status = status_example;  // List | Status values that need to be considered for filter
+
+            try
+            {
+                // Finds Pets by status
+                List<Pet> result = apiInstance.FindPetsByStatus(status);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **List<string>**| Status values that need to be considered for filter | 
+
+### Return type
+
+[**List**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **FindPetsByTags**
+> List FindPetsByTags (List tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FindPetsByTagsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var tags = new List(); // List | Tags to filter by
+
+            try
+            {
+                // Finds Pets by tags
+                List<Pet> result = apiInstance.FindPetsByTags(tags);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List<string>**](string.md)| Tags to filter by | 
+
+### Return type
+
+[**List**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **GetPetById**
+> Pet GetPetById (long? petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class GetPetByIdExample
+    {
+        public void main()
+        {
+            // Configure API key authorization: api_key
+            Configuration.Default.AddApiKey("api_key", "YOUR_API_KEY");
+            // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+            // Configuration.Default.AddApiKeyPrefix("api_key", "Bearer");
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to return
+
+            try
+            {
+                // Find pet by ID
+                Pet result = apiInstance.GetPetById(petId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to return | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **UpdatePet**
+> void UpdatePet (Pet pet)
+
+Update an existing pet
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UpdatePetExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+
+            try
+            {
+                // Update an existing pet
+                apiInstance.UpdatePet(pet);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **UpdatePetWithForm**
+> void UpdatePetWithForm (long? petId, string name = null, string status = null)
+
+Updates a pet in the store with form data
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UpdatePetWithFormExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet that needs to be updated
+            var name = name_example;  // string | Updated name of the pet (optional) 
+            var status = status_example;  // string | Updated status of the pet (optional) 
+
+            try
+            {
+                // Updates a pet in the store with form data
+                apiInstance.UpdatePetWithForm(petId, name, status);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet that needs to be updated | 
+ **name** | **string**| Updated name of the pet | [optional] 
+ **status** | **string**| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **UploadFile**
+> ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+
+uploads an image
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UploadFileExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to update
+            var additionalMetadata = additionalMetadata_example;  // string | Additional data to pass to server (optional) 
+            var file = BINARY_DATA_HERE;  // System.IO.Stream | file to upload (optional) 
+
+            try
+            {
+                // uploads an image
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to update | 
+ **additionalMetadata** | **string**| Additional data to pass to server | [optional] 
+ **file** | **System.IO.Stream**| file to upload | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **UploadFileWithRequiredFile**
+> ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+
+uploads an image (required)
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UploadFileWithRequiredFileExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to update
+            var requiredFile = BINARY_DATA_HERE;  // System.IO.Stream | file to upload
+            var additionalMetadata = additionalMetadata_example;  // string | Additional data to pass to server (optional) 
+
+            try
+            {
+                // uploads an image (required)
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UploadFileWithRequiredFile: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to update | 
+ **requiredFile** | **System.IO.Stream**| file to upload | 
+ **additionalMetadata** | **string**| Additional data to pass to server | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..6c2571cb48f5
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.ReadOnlyFirst
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Bar** | **string** |  | [optional] 
+**Baz** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Return.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Return.md
new file mode 100644
index 000000000000..21a269c63f4b
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Return.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.Return
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_Return** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md
new file mode 100644
index 000000000000..306e65392a2e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.SpecialModelName
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SpecialPropertyName** | **long?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
new file mode 100644
index 000000000000..f8b4d3422db4
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
@@ -0,0 +1,254 @@
+# Org.OpenAPITools.Api.StoreApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+[**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+[**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
+[**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+
+
+
+# **DeleteOrder**
+> void DeleteOrder (string orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class DeleteOrderExample
+    {
+        public void main()
+        {
+            var apiInstance = new StoreApi();
+            var orderId = orderId_example;  // string | ID of the order that needs to be deleted
+
+            try
+            {
+                // Delete purchase order by ID
+                apiInstance.DeleteOrder(orderId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **string**| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **GetInventory**
+> Dictionary GetInventory ()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class GetInventoryExample
+    {
+        public void main()
+        {
+            // Configure API key authorization: api_key
+            Configuration.Default.AddApiKey("api_key", "YOUR_API_KEY");
+            // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+            // Configuration.Default.AddApiKeyPrefix("api_key", "Bearer");
+
+            var apiInstance = new StoreApi();
+
+            try
+            {
+                // Returns pet inventories by status
+                Dictionary<string, int?> result = apiInstance.GetInventory();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Dictionary**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **GetOrderById**
+> Order GetOrderById (long? orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class GetOrderByIdExample
+    {
+        public void main()
+        {
+            var apiInstance = new StoreApi();
+            var orderId = 789;  // long? | ID of pet that needs to be fetched
+
+            try
+            {
+                // Find purchase order by ID
+                Order result = apiInstance.GetOrderById(orderId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **long?**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **PlaceOrder**
+> Order PlaceOrder (Order order)
+
+Place an order for a pet
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class PlaceOrderExample
+    {
+        public void main()
+        {
+            var apiInstance = new StoreApi();
+            var order = new Order(); // Order | order placed for purchasing the pet
+
+            try
+            {
+                // Place an order for a pet
+                Order result = apiInstance.PlaceOrder(order);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order** | [**Order**](Order.md)| order placed for purchasing the pet | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **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/openapi3/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
new file mode 100644
index 000000000000..6e7a71368df7
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/StringBooleanMap.md
@@ -0,0 +1,8 @@
+# Org.OpenAPITools.Model.StringBooleanMap
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Tag.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Tag.md
new file mode 100644
index 000000000000..6a76c28595f7
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/Tag.md
@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.Tag
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/User.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/User.md
new file mode 100644
index 000000000000..04dd24a3423c
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/User.md
@@ -0,0 +1,16 @@
+# Org.OpenAPITools.Model.User
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Username** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**Email** | **string** |  | [optional] 
+**Password** | **string** |  | [optional] 
+**Phone** | **string** |  | [optional] 
+**UserStatus** | **int?** | User Status | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/UserApi.md b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
new file mode 100644
index 000000000000..2fb4c422cf56
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
@@ -0,0 +1,488 @@
+# Org.OpenAPITools.Api.UserApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user
+[**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+[**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+[**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+[**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+[**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+[**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+
+# **CreateUser**
+> void CreateUser (User user)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class CreateUserExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var user = new User(); // User | Created user object
+
+            try
+            {
+                // Create user
+                apiInstance.CreateUser(user);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**User**](User.md)| Created user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **CreateUsersWithArrayInput**
+> void CreateUsersWithArrayInput (List user)
+
+Creates list of users with given input array
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class CreateUsersWithArrayInputExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var user = new List(); // List | List of user object
+
+            try
+            {
+                // Creates list of users with given input array
+                apiInstance.CreateUsersWithArrayInput(user);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**List<User>**](List.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **CreateUsersWithListInput**
+> void CreateUsersWithListInput (List user)
+
+Creates list of users with given input array
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class CreateUsersWithListInputExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var user = new List(); // List | List of user object
+
+            try
+            {
+                // Creates list of users with given input array
+                apiInstance.CreateUsersWithListInput(user);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**List<User>**](List.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **DeleteUser**
+> void DeleteUser (string username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class DeleteUserExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The name that needs to be deleted
+
+            try
+            {
+                // Delete user
+                apiInstance.DeleteUser(username);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **GetUserByName**
+> User GetUserByName (string username)
+
+Get user by user name
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class GetUserByNameExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The name that needs to be fetched. Use user1 for testing.
+
+            try
+            {
+                // Get user by user name
+                User result = apiInstance.GetUserByName(username);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **LoginUser**
+> string LoginUser (string username, string password)
+
+Logs user into the system
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class LoginUserExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The user name for login
+            var password = password_example;  // string | The password for login in clear text
+
+            try
+            {
+                // Logs user into the system
+                string result = apiInstance.LoginUser(username, password);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The user name for login | 
+ **password** | **string**| The password for login in clear text | 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **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)
+
+
+# **LogoutUser**
+> void LogoutUser ()
+
+Logs out current logged in user session
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class LogoutUserExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+
+            try
+            {
+                // Logs out current logged in user session
+                apiInstance.LogoutUser();
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+
+# **UpdateUser**
+> void UpdateUser (string username, User user)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class UpdateUserExample
+    {
+        public void main()
+        {
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
+
+            try
+            {
+                // Updated user
+                apiInstance.UpdateUser(username, user);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| name that need to be deleted | 
+ **user** | [**User**](User.md)| Updated user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/git_push.sh b/samples/openapi3/client/petstore/csharp/OpenAPIClient/git_push.sh
new file mode 100644
index 000000000000..4d22bfef4d71
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/mono_nunit_test.sh b/samples/openapi3/client/petstore/csharp/OpenAPIClient/mono_nunit_test.sh
new file mode 100644
index 000000000000..039eba8ed42a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/mono_nunit_test.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# Generated by: https://github.com/openapitools/openapi-generator.git
+#
+
+wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+mozroots --import --sync
+
+echo "[INFO] remove bin/Debug/Org.OpenAPITools.Test.dll"
+rm src/Org.OpenAPITools.Test/bin/Debug/Org.OpenAPITools.Test.dll 2> /dev/null
+
+echo "[INFO] install NUnit runners via NuGet"
+wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+mozroots --import --sync
+mono nuget.exe install src/Org.OpenAPITools.Test/packages.config -o packages
+
+echo "[INFO] Install NUnit runners via NuGet"
+mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory packages 
+
+echo "[INFO] Build the solution and run the unit test"
+xbuild Org.OpenAPITools.sln && \
+    mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe src/Org.OpenAPITools.Test/bin/Debug/Org.OpenAPITools.Test.dll
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
new file mode 100644
index 000000000000..e888d01f4462
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -0,0 +1,81 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing AnotherFakeApi
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class AnotherFakeApiTests
+    {
+        private AnotherFakeApi instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new AnotherFakeApi();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of AnotherFakeApi
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' AnotherFakeApi
+            //Assert.IsInstanceOfType(typeof(AnotherFakeApi), instance, "instance is a AnotherFakeApi");
+        }
+
+        
+        /// 
+        /// Test Call123TestSpecialTags
+        /// 
+        [Test]
+        public void Call123TestSpecialTagsTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //ModelClient modelClient = null;
+            //var response = instance.Call123TestSpecialTags(modelClient);
+            //Assert.IsInstanceOf (response, "response is ModelClient");
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
new file mode 100644
index 000000000000..79feb5e5d8f1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -0,0 +1,223 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing FakeApi
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class FakeApiTests
+    {
+        private FakeApi instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new FakeApi();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of FakeApi
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' FakeApi
+            //Assert.IsInstanceOfType(typeof(FakeApi), instance, "instance is a FakeApi");
+        }
+
+        
+        /// 
+        /// Test FakeOuterBooleanSerialize
+        /// 
+        [Test]
+        public void FakeOuterBooleanSerializeTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //bool? body = null;
+            //var response = instance.FakeOuterBooleanSerialize(body);
+            //Assert.IsInstanceOf (response, "response is bool?");
+        }
+        
+        /// 
+        /// Test FakeOuterCompositeSerialize
+        /// 
+        [Test]
+        public void FakeOuterCompositeSerializeTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //OuterComposite outerComposite = null;
+            //var response = instance.FakeOuterCompositeSerialize(outerComposite);
+            //Assert.IsInstanceOf (response, "response is OuterComposite");
+        }
+        
+        /// 
+        /// Test FakeOuterNumberSerialize
+        /// 
+        [Test]
+        public void FakeOuterNumberSerializeTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //decimal? body = null;
+            //var response = instance.FakeOuterNumberSerialize(body);
+            //Assert.IsInstanceOf (response, "response is decimal?");
+        }
+        
+        /// 
+        /// Test FakeOuterStringSerialize
+        /// 
+        [Test]
+        public void FakeOuterStringSerializeTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string body = null;
+            //var response = instance.FakeOuterStringSerialize(body);
+            //Assert.IsInstanceOf (response, "response is string");
+        }
+        
+        /// 
+        /// Test TestBodyWithFileSchema
+        /// 
+        [Test]
+        public void TestBodyWithFileSchemaTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //FileSchemaTestClass fileSchemaTestClass = null;
+            //instance.TestBodyWithFileSchema(fileSchemaTestClass);
+            
+        }
+        
+        /// 
+        /// Test TestBodyWithQueryParams
+        /// 
+        [Test]
+        public void TestBodyWithQueryParamsTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string query = null;
+            //User user = null;
+            //instance.TestBodyWithQueryParams(query, user);
+            
+        }
+        
+        /// 
+        /// Test TestClientModel
+        /// 
+        [Test]
+        public void TestClientModelTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //ModelClient modelClient = null;
+            //var response = instance.TestClientModel(modelClient);
+            //Assert.IsInstanceOf (response, "response is ModelClient");
+        }
+        
+        /// 
+        /// Test TestEndpointParameters
+        /// 
+        [Test]
+        public void TestEndpointParametersTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //decimal? number = null;
+            //double? _double = null;
+            //string patternWithoutDelimiter = null;
+            //byte[] _byte = null;
+            //int? integer = null;
+            //int? int32 = null;
+            //long? int64 = null;
+            //float? _float = null;
+            //string _string = null;
+            //System.IO.Stream binary = null;
+            //DateTime? date = null;
+            //DateTime? dateTime = null;
+            //string password = null;
+            //string callback = null;
+            //instance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback);
+            
+        }
+        
+        /// 
+        /// Test TestEnumParameters
+        /// 
+        [Test]
+        public void TestEnumParametersTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //List enumHeaderStringArray = null;
+            //string enumHeaderString = null;
+            //List enumQueryStringArray = null;
+            //string enumQueryString = null;
+            //int? enumQueryInteger = null;
+            //double? enumQueryDouble = null;
+            //List enumFormStringArray = null;
+            //string enumFormString = null;
+            //instance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            
+        }
+        
+        /// 
+        /// Test TestInlineAdditionalProperties
+        /// 
+        [Test]
+        public void TestInlineAdditionalPropertiesTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //Dictionary requestBody = null;
+            //instance.TestInlineAdditionalProperties(requestBody);
+            
+        }
+        
+        /// 
+        /// Test TestJsonFormData
+        /// 
+        [Test]
+        public void TestJsonFormDataTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string param = null;
+            //string param2 = null;
+            //instance.TestJsonFormData(param, param2);
+            
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
new file mode 100644
index 000000000000..57afc7f80adc
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -0,0 +1,81 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing FakeClassnameTags123Api
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class FakeClassnameTags123ApiTests
+    {
+        private FakeClassnameTags123Api instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new FakeClassnameTags123Api();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of FakeClassnameTags123Api
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' FakeClassnameTags123Api
+            //Assert.IsInstanceOfType(typeof(FakeClassnameTags123Api), instance, "instance is a FakeClassnameTags123Api");
+        }
+
+        
+        /// 
+        /// Test TestClassname
+        /// 
+        [Test]
+        public void TestClassnameTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //ModelClient modelClient = null;
+            //var response = instance.TestClassname(modelClient);
+            //Assert.IsInstanceOf (response, "response is ModelClient");
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
new file mode 100644
index 000000000000..1b78d0a12f9e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -0,0 +1,184 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing PetApi
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class PetApiTests
+    {
+        private PetApi instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new PetApi();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of PetApi
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' PetApi
+            //Assert.IsInstanceOfType(typeof(PetApi), instance, "instance is a PetApi");
+        }
+
+        
+        /// 
+        /// Test AddPet
+        /// 
+        [Test]
+        public void AddPetTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //Pet pet = null;
+            //instance.AddPet(pet);
+            
+        }
+        
+        /// 
+        /// Test DeletePet
+        /// 
+        [Test]
+        public void DeletePetTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? petId = null;
+            //string apiKey = null;
+            //instance.DeletePet(petId, apiKey);
+            
+        }
+        
+        /// 
+        /// Test FindPetsByStatus
+        /// 
+        [Test]
+        public void FindPetsByStatusTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //List status = null;
+            //var response = instance.FindPetsByStatus(status);
+            //Assert.IsInstanceOf> (response, "response is List");
+        }
+        
+        /// 
+        /// Test FindPetsByTags
+        /// 
+        [Test]
+        public void FindPetsByTagsTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //List tags = null;
+            //var response = instance.FindPetsByTags(tags);
+            //Assert.IsInstanceOf> (response, "response is List");
+        }
+        
+        /// 
+        /// Test GetPetById
+        /// 
+        [Test]
+        public void GetPetByIdTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? petId = null;
+            //var response = instance.GetPetById(petId);
+            //Assert.IsInstanceOf (response, "response is Pet");
+        }
+        
+        /// 
+        /// Test UpdatePet
+        /// 
+        [Test]
+        public void UpdatePetTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //Pet pet = null;
+            //instance.UpdatePet(pet);
+            
+        }
+        
+        /// 
+        /// Test UpdatePetWithForm
+        /// 
+        [Test]
+        public void UpdatePetWithFormTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? petId = null;
+            //string name = null;
+            //string status = null;
+            //instance.UpdatePetWithForm(petId, name, status);
+            
+        }
+        
+        /// 
+        /// Test UploadFile
+        /// 
+        [Test]
+        public void UploadFileTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? petId = null;
+            //string additionalMetadata = null;
+            //System.IO.Stream file = null;
+            //var response = instance.UploadFile(petId, additionalMetadata, file);
+            //Assert.IsInstanceOf (response, "response is ApiResponse");
+        }
+        
+        /// 
+        /// Test UploadFileWithRequiredFile
+        /// 
+        [Test]
+        public void UploadFileWithRequiredFileTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? petId = null;
+            //System.IO.Stream requiredFile = null;
+            //string additionalMetadata = null;
+            //var response = instance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+            //Assert.IsInstanceOf (response, "response is ApiResponse");
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
new file mode 100644
index 000000000000..20a28424ae0a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing StoreApi
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class StoreApiTests
+    {
+        private StoreApi instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new StoreApi();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of StoreApi
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' StoreApi
+            //Assert.IsInstanceOfType(typeof(StoreApi), instance, "instance is a StoreApi");
+        }
+
+        
+        /// 
+        /// Test DeleteOrder
+        /// 
+        [Test]
+        public void DeleteOrderTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string orderId = null;
+            //instance.DeleteOrder(orderId);
+            
+        }
+        
+        /// 
+        /// Test GetInventory
+        /// 
+        [Test]
+        public void GetInventoryTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //var response = instance.GetInventory();
+            //Assert.IsInstanceOf> (response, "response is Dictionary");
+        }
+        
+        /// 
+        /// Test GetOrderById
+        /// 
+        [Test]
+        public void GetOrderByIdTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //long? orderId = null;
+            //var response = instance.GetOrderById(orderId);
+            //Assert.IsInstanceOf (response, "response is Order");
+        }
+        
+        /// 
+        /// Test PlaceOrder
+        /// 
+        [Test]
+        public void PlaceOrderTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //Order order = null;
+            //var response = instance.PlaceOrder(order);
+            //Assert.IsInstanceOf (response, "response is Order");
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
new file mode 100644
index 000000000000..6abe2c9b5420
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -0,0 +1,166 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing UserApi
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// 
+    [TestFixture]
+    public class UserApiTests
+    {
+        private UserApi instance;
+
+        /// 
+        /// Setup before each unit test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            instance = new UserApi();
+        }
+
+        /// 
+        /// Clean up after each unit test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of UserApi
+        /// 
+        [Test]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsInstanceOfType' UserApi
+            //Assert.IsInstanceOfType(typeof(UserApi), instance, "instance is a UserApi");
+        }
+
+        
+        /// 
+        /// Test CreateUser
+        /// 
+        [Test]
+        public void CreateUserTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //User user = null;
+            //instance.CreateUser(user);
+            
+        }
+        
+        /// 
+        /// Test CreateUsersWithArrayInput
+        /// 
+        [Test]
+        public void CreateUsersWithArrayInputTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //List user = null;
+            //instance.CreateUsersWithArrayInput(user);
+            
+        }
+        
+        /// 
+        /// Test CreateUsersWithListInput
+        /// 
+        [Test]
+        public void CreateUsersWithListInputTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //List user = null;
+            //instance.CreateUsersWithListInput(user);
+            
+        }
+        
+        /// 
+        /// Test DeleteUser
+        /// 
+        [Test]
+        public void DeleteUserTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string username = null;
+            //instance.DeleteUser(username);
+            
+        }
+        
+        /// 
+        /// Test GetUserByName
+        /// 
+        [Test]
+        public void GetUserByNameTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string username = null;
+            //var response = instance.GetUserByName(username);
+            //Assert.IsInstanceOf (response, "response is User");
+        }
+        
+        /// 
+        /// Test LoginUser
+        /// 
+        [Test]
+        public void LoginUserTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string username = null;
+            //string password = null;
+            //var response = instance.LoginUser(username, password);
+            //Assert.IsInstanceOf (response, "response is string");
+        }
+        
+        /// 
+        /// Test LogoutUser
+        /// 
+        [Test]
+        public void LogoutUserTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //instance.LogoutUser();
+            
+        }
+        
+        /// 
+        /// Test UpdateUser
+        /// 
+        [Test]
+        public void UpdateUserTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //string username = null;
+            //User user = null;
+            //instance.UpdateUser(username, user);
+            
+        }
+        
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
new file mode 100644
index 000000000000..e4435f13ab21
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing AdditionalPropertiesClass
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class AdditionalPropertiesClassTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesClass
+        //private AdditionalPropertiesClass instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesClass
+            //instance = new AdditionalPropertiesClass();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of AdditionalPropertiesClass
+        /// 
+        [Test]
+        public void AdditionalPropertiesClassInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesClass
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesClass");
+        }
+
+
+        /// 
+        /// Test the property 'MapProperty'
+        /// 
+        [Test]
+        public void MapPropertyTest()
+        {
+            // TODO unit test for the property 'MapProperty'
+        }
+        /// 
+        /// Test the property 'MapOfMapProperty'
+        /// 
+        [Test]
+        public void MapOfMapPropertyTest()
+        {
+            // TODO unit test for the property 'MapOfMapProperty'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
new file mode 100644
index 000000000000..cf61e423436d
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
@@ -0,0 +1,72 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing AnimalFarm
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class AnimalFarmTests
+    {
+        // TODO uncomment below to declare an instance variable for AnimalFarm
+        //private AnimalFarm instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AnimalFarm
+            //instance = new AnimalFarm();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of AnimalFarm
+        /// 
+        [Test]
+        public void AnimalFarmInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AnimalFarm
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a AnimalFarm");
+        }
+
+
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
new file mode 100644
index 000000000000..2849d780c8d9
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
@@ -0,0 +1,106 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Animal
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class AnimalTests
+    {
+        // TODO uncomment below to declare an instance variable for Animal
+        //private Animal instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Animal
+            //instance = new Animal();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Animal
+        /// 
+        [Test]
+        public void AnimalInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Animal
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Animal");
+        }
+
+        /// 
+        /// Test deserialize a Dog from type Animal
+        /// 
+        [Test]
+        public void DogDeserializeFromAnimalTest()
+        {
+            // TODO uncomment below to test deserialize a Dog from type Animal
+            //Assert.IsInstanceOf(JsonConvert.DeserializeObject(new Dog().ToJson()));
+        }
+        /// 
+        /// Test deserialize a Cat from type Animal
+        /// 
+        [Test]
+        public void CatDeserializeFromAnimalTest()
+        {
+            // TODO uncomment below to test deserialize a Cat from type Animal
+            //Assert.IsInstanceOf(JsonConvert.DeserializeObject(new Cat().ToJson()));
+        }
+
+        /// 
+        /// Test the property 'ClassName'
+        /// 
+        [Test]
+        public void ClassNameTest()
+        {
+            // TODO unit test for the property 'ClassName'
+        }
+        /// 
+        /// Test the property 'Color'
+        /// 
+        [Test]
+        public void ColorTest()
+        {
+            // TODO unit test for the property 'Color'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
new file mode 100644
index 000000000000..70c075751452
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
@@ -0,0 +1,96 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ApiResponse
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ApiResponseTests
+    {
+        // TODO uncomment below to declare an instance variable for ApiResponse
+        //private ApiResponse instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ApiResponse
+            //instance = new ApiResponse();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ApiResponse
+        /// 
+        [Test]
+        public void ApiResponseInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ApiResponse
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ApiResponse");
+        }
+
+
+        /// 
+        /// Test the property 'Code'
+        /// 
+        [Test]
+        public void CodeTest()
+        {
+            // TODO unit test for the property 'Code'
+        }
+        /// 
+        /// Test the property 'Type'
+        /// 
+        [Test]
+        public void TypeTest()
+        {
+            // TODO unit test for the property 'Type'
+        }
+        /// 
+        /// Test the property 'Message'
+        /// 
+        [Test]
+        public void MessageTest()
+        {
+            // TODO unit test for the property 'Message'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
new file mode 100644
index 000000000000..5eb86a385735
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ArrayOfArrayOfNumberOnly
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ArrayOfArrayOfNumberOnlyTests
+    {
+        // TODO uncomment below to declare an instance variable for ArrayOfArrayOfNumberOnly
+        //private ArrayOfArrayOfNumberOnly instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ArrayOfArrayOfNumberOnly
+            //instance = new ArrayOfArrayOfNumberOnly();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ArrayOfArrayOfNumberOnly
+        /// 
+        [Test]
+        public void ArrayOfArrayOfNumberOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ArrayOfArrayOfNumberOnly
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ArrayOfArrayOfNumberOnly");
+        }
+
+
+        /// 
+        /// Test the property 'ArrayArrayNumber'
+        /// 
+        [Test]
+        public void ArrayArrayNumberTest()
+        {
+            // TODO unit test for the property 'ArrayArrayNumber'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
new file mode 100644
index 000000000000..cd7074afaa10
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ArrayOfNumberOnly
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ArrayOfNumberOnlyTests
+    {
+        // TODO uncomment below to declare an instance variable for ArrayOfNumberOnly
+        //private ArrayOfNumberOnly instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ArrayOfNumberOnly
+            //instance = new ArrayOfNumberOnly();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ArrayOfNumberOnly
+        /// 
+        [Test]
+        public void ArrayOfNumberOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ArrayOfNumberOnly
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ArrayOfNumberOnly");
+        }
+
+
+        /// 
+        /// Test the property 'ArrayNumber'
+        /// 
+        [Test]
+        public void ArrayNumberTest()
+        {
+            // TODO unit test for the property 'ArrayNumber'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
new file mode 100644
index 000000000000..f1f286ce448e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
@@ -0,0 +1,96 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ArrayTest
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ArrayTestTests
+    {
+        // TODO uncomment below to declare an instance variable for ArrayTest
+        //private ArrayTest instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ArrayTest
+            //instance = new ArrayTest();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ArrayTest
+        /// 
+        [Test]
+        public void ArrayTestInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ArrayTest
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ArrayTest");
+        }
+
+
+        /// 
+        /// Test the property 'ArrayOfString'
+        /// 
+        [Test]
+        public void ArrayOfStringTest()
+        {
+            // TODO unit test for the property 'ArrayOfString'
+        }
+        /// 
+        /// Test the property 'ArrayArrayOfInteger'
+        /// 
+        [Test]
+        public void ArrayArrayOfIntegerTest()
+        {
+            // TODO unit test for the property 'ArrayArrayOfInteger'
+        }
+        /// 
+        /// Test the property 'ArrayArrayOfModel'
+        /// 
+        [Test]
+        public void ArrayArrayOfModelTest()
+        {
+            // TODO unit test for the property 'ArrayArrayOfModel'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
new file mode 100644
index 000000000000..cb003b2abee0
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
@@ -0,0 +1,120 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Capitalization
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class CapitalizationTests
+    {
+        // TODO uncomment below to declare an instance variable for Capitalization
+        //private Capitalization instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Capitalization
+            //instance = new Capitalization();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Capitalization
+        /// 
+        [Test]
+        public void CapitalizationInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Capitalization
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Capitalization");
+        }
+
+
+        /// 
+        /// Test the property 'SmallCamel'
+        /// 
+        [Test]
+        public void SmallCamelTest()
+        {
+            // TODO unit test for the property 'SmallCamel'
+        }
+        /// 
+        /// Test the property 'CapitalCamel'
+        /// 
+        [Test]
+        public void CapitalCamelTest()
+        {
+            // TODO unit test for the property 'CapitalCamel'
+        }
+        /// 
+        /// Test the property 'SmallSnake'
+        /// 
+        [Test]
+        public void SmallSnakeTest()
+        {
+            // TODO unit test for the property 'SmallSnake'
+        }
+        /// 
+        /// Test the property 'CapitalSnake'
+        /// 
+        [Test]
+        public void CapitalSnakeTest()
+        {
+            // TODO unit test for the property 'CapitalSnake'
+        }
+        /// 
+        /// Test the property 'SCAETHFlowPoints'
+        /// 
+        [Test]
+        public void SCAETHFlowPointsTest()
+        {
+            // TODO unit test for the property 'SCAETHFlowPoints'
+        }
+        /// 
+        /// Test the property 'ATT_NAME'
+        /// 
+        [Test]
+        public void ATT_NAMETest()
+        {
+            // TODO unit test for the property 'ATT_NAME'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
new file mode 100644
index 000000000000..6cd18d546ed3
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Cat
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class CatTests
+    {
+        // TODO uncomment below to declare an instance variable for Cat
+        //private Cat instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Cat
+            //instance = new Cat();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Cat
+        /// 
+        [Test]
+        public void CatInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Cat
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Cat");
+        }
+
+
+        /// 
+        /// Test the property 'Declawed'
+        /// 
+        [Test]
+        public void DeclawedTest()
+        {
+            // TODO unit test for the property 'Declawed'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
new file mode 100644
index 000000000000..f964723517e3
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Category
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class CategoryTests
+    {
+        // TODO uncomment below to declare an instance variable for Category
+        //private Category instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Category
+            //instance = new Category();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Category
+        /// 
+        [Test]
+        public void CategoryInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Category
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Category");
+        }
+
+
+        /// 
+        /// Test the property 'Id'
+        /// 
+        [Test]
+        public void IdTest()
+        {
+            // TODO unit test for the property 'Id'
+        }
+        /// 
+        /// Test the property 'Name'
+        /// 
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
new file mode 100644
index 000000000000..0a6de083da59
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ClassModel
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ClassModelTests
+    {
+        // TODO uncomment below to declare an instance variable for ClassModel
+        //private ClassModel instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ClassModel
+            //instance = new ClassModel();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ClassModel
+        /// 
+        [Test]
+        public void ClassModelInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ClassModel
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ClassModel");
+        }
+
+
+        /// 
+        /// Test the property 'Class'
+        /// 
+        [Test]
+        public void ClassTest()
+        {
+            // TODO unit test for the property 'Class'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
new file mode 100644
index 000000000000..fbae571470b0
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Dog
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class DogTests
+    {
+        // TODO uncomment below to declare an instance variable for Dog
+        //private Dog instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Dog
+            //instance = new Dog();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Dog
+        /// 
+        [Test]
+        public void DogInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Dog
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Dog");
+        }
+
+
+        /// 
+        /// Test the property 'Breed'
+        /// 
+        [Test]
+        public void BreedTest()
+        {
+            // TODO unit test for the property 'Breed'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
new file mode 100644
index 000000000000..1760e0d4ef3c
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing EnumArrays
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class EnumArraysTests
+    {
+        // TODO uncomment below to declare an instance variable for EnumArrays
+        //private EnumArrays instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of EnumArrays
+            //instance = new EnumArrays();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of EnumArrays
+        /// 
+        [Test]
+        public void EnumArraysInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" EnumArrays
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a EnumArrays");
+        }
+
+
+        /// 
+        /// Test the property 'JustSymbol'
+        /// 
+        [Test]
+        public void JustSymbolTest()
+        {
+            // TODO unit test for the property 'JustSymbol'
+        }
+        /// 
+        /// Test the property 'ArrayEnum'
+        /// 
+        [Test]
+        public void ArrayEnumTest()
+        {
+            // TODO unit test for the property 'ArrayEnum'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
new file mode 100644
index 000000000000..f1c67fe19145
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
@@ -0,0 +1,72 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing EnumClass
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class EnumClassTests
+    {
+        // TODO uncomment below to declare an instance variable for EnumClass
+        //private EnumClass instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of EnumClass
+            //instance = new EnumClass();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of EnumClass
+        /// 
+        [Test]
+        public void EnumClassInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" EnumClass
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a EnumClass");
+        }
+
+
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
new file mode 100644
index 000000000000..6ba0c31db416
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
@@ -0,0 +1,112 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing EnumTest
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class EnumTestTests
+    {
+        // TODO uncomment below to declare an instance variable for EnumTest
+        //private EnumTest instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of EnumTest
+            //instance = new EnumTest();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of EnumTest
+        /// 
+        [Test]
+        public void EnumTestInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" EnumTest
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a EnumTest");
+        }
+
+
+        /// 
+        /// Test the property 'EnumString'
+        /// 
+        [Test]
+        public void EnumStringTest()
+        {
+            // TODO unit test for the property 'EnumString'
+        }
+        /// 
+        /// Test the property 'EnumStringRequired'
+        /// 
+        [Test]
+        public void EnumStringRequiredTest()
+        {
+            // TODO unit test for the property 'EnumStringRequired'
+        }
+        /// 
+        /// Test the property 'EnumInteger'
+        /// 
+        [Test]
+        public void EnumIntegerTest()
+        {
+            // TODO unit test for the property 'EnumInteger'
+        }
+        /// 
+        /// Test the property 'EnumNumber'
+        /// 
+        [Test]
+        public void EnumNumberTest()
+        {
+            // TODO unit test for the property 'EnumNumber'
+        }
+        /// 
+        /// Test the property 'OuterEnum'
+        /// 
+        [Test]
+        public void OuterEnumTest()
+        {
+            // TODO unit test for the property 'OuterEnum'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
new file mode 100644
index 000000000000..bb47c43dc7a1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing FileSchemaTestClass
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class FileSchemaTestClassTests
+    {
+        // TODO uncomment below to declare an instance variable for FileSchemaTestClass
+        //private FileSchemaTestClass instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of FileSchemaTestClass
+            //instance = new FileSchemaTestClass();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of FileSchemaTestClass
+        /// 
+        [Test]
+        public void FileSchemaTestClassInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" FileSchemaTestClass
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a FileSchemaTestClass");
+        }
+
+
+        /// 
+        /// Test the property 'File'
+        /// 
+        [Test]
+        public void FileTest()
+        {
+            // TODO unit test for the property 'File'
+        }
+        /// 
+        /// Test the property 'Files'
+        /// 
+        [Test]
+        public void FilesTest()
+        {
+            // TODO unit test for the property 'Files'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
new file mode 100644
index 000000000000..f1cf54c22e4d
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing File
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class FileTests
+    {
+        // TODO uncomment below to declare an instance variable for File
+        //private File instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of File
+            //instance = new File();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of File
+        /// 
+        [Test]
+        public void FileInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" File
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a File");
+        }
+
+
+        /// 
+        /// Test the property 'SourceURI'
+        /// 
+        [Test]
+        public void SourceURITest()
+        {
+            // TODO unit test for the property 'SourceURI'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
new file mode 100644
index 000000000000..cca85ec5b2af
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
@@ -0,0 +1,176 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing FormatTest
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class FormatTestTests
+    {
+        // TODO uncomment below to declare an instance variable for FormatTest
+        //private FormatTest instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of FormatTest
+            //instance = new FormatTest();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of FormatTest
+        /// 
+        [Test]
+        public void FormatTestInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" FormatTest
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a FormatTest");
+        }
+
+
+        /// 
+        /// Test the property 'Integer'
+        /// 
+        [Test]
+        public void IntegerTest()
+        {
+            // TODO unit test for the property 'Integer'
+        }
+        /// 
+        /// Test the property 'Int32'
+        /// 
+        [Test]
+        public void Int32Test()
+        {
+            // TODO unit test for the property 'Int32'
+        }
+        /// 
+        /// Test the property 'Int64'
+        /// 
+        [Test]
+        public void Int64Test()
+        {
+            // TODO unit test for the property 'Int64'
+        }
+        /// 
+        /// Test the property 'Number'
+        /// 
+        [Test]
+        public void NumberTest()
+        {
+            // TODO unit test for the property 'Number'
+        }
+        /// 
+        /// Test the property 'Float'
+        /// 
+        [Test]
+        public void FloatTest()
+        {
+            // TODO unit test for the property 'Float'
+        }
+        /// 
+        /// Test the property 'Double'
+        /// 
+        [Test]
+        public void DoubleTest()
+        {
+            // TODO unit test for the property 'Double'
+        }
+        /// 
+        /// Test the property 'String'
+        /// 
+        [Test]
+        public void StringTest()
+        {
+            // TODO unit test for the property 'String'
+        }
+        /// 
+        /// Test the property 'Byte'
+        /// 
+        [Test]
+        public void ByteTest()
+        {
+            // TODO unit test for the property 'Byte'
+        }
+        /// 
+        /// Test the property 'Binary'
+        /// 
+        [Test]
+        public void BinaryTest()
+        {
+            // TODO unit test for the property 'Binary'
+        }
+        /// 
+        /// Test the property 'Date'
+        /// 
+        [Test]
+        public void DateTest()
+        {
+            // TODO unit test for the property 'Date'
+        }
+        /// 
+        /// Test the property 'DateTime'
+        /// 
+        [Test]
+        public void DateTimeTest()
+        {
+            // TODO unit test for the property 'DateTime'
+        }
+        /// 
+        /// Test the property 'Uuid'
+        /// 
+        [Test]
+        public void UuidTest()
+        {
+            // TODO unit test for the property 'Uuid'
+        }
+        /// 
+        /// Test the property 'Password'
+        /// 
+        [Test]
+        public void PasswordTest()
+        {
+            // TODO unit test for the property 'Password'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
new file mode 100644
index 000000000000..1fef4b1371ee
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing HasOnlyReadOnly
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class HasOnlyReadOnlyTests
+    {
+        // TODO uncomment below to declare an instance variable for HasOnlyReadOnly
+        //private HasOnlyReadOnly instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of HasOnlyReadOnly
+            //instance = new HasOnlyReadOnly();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of HasOnlyReadOnly
+        /// 
+        [Test]
+        public void HasOnlyReadOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" HasOnlyReadOnly
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a HasOnlyReadOnly");
+        }
+
+
+        /// 
+        /// Test the property 'Bar'
+        /// 
+        [Test]
+        public void BarTest()
+        {
+            // TODO unit test for the property 'Bar'
+        }
+        /// 
+        /// Test the property 'Foo'
+        /// 
+        [Test]
+        public void FooTest()
+        {
+            // TODO unit test for the property 'Foo'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
new file mode 100644
index 000000000000..983fd757c32a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing List
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ListTests
+    {
+        // TODO uncomment below to declare an instance variable for List
+        //private List instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of List
+            //instance = new List();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of List
+        /// 
+        [Test]
+        public void ListInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" List
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a List");
+        }
+
+
+        /// 
+        /// Test the property '_123List'
+        /// 
+        [Test]
+        public void _123ListTest()
+        {
+            // TODO unit test for the property '_123List'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
new file mode 100644
index 000000000000..9bb76bde2392
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
@@ -0,0 +1,104 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing MapTest
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class MapTestTests
+    {
+        // TODO uncomment below to declare an instance variable for MapTest
+        //private MapTest instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of MapTest
+            //instance = new MapTest();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of MapTest
+        /// 
+        [Test]
+        public void MapTestInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" MapTest
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a MapTest");
+        }
+
+
+        /// 
+        /// Test the property 'MapMapOfString'
+        /// 
+        [Test]
+        public void MapMapOfStringTest()
+        {
+            // TODO unit test for the property 'MapMapOfString'
+        }
+        /// 
+        /// Test the property 'MapOfEnumString'
+        /// 
+        [Test]
+        public void MapOfEnumStringTest()
+        {
+            // TODO unit test for the property 'MapOfEnumString'
+        }
+        /// 
+        /// Test the property 'DirectMap'
+        /// 
+        [Test]
+        public void DirectMapTest()
+        {
+            // TODO unit test for the property 'DirectMap'
+        }
+        /// 
+        /// Test the property 'IndirectMap'
+        /// 
+        [Test]
+        public void IndirectMapTest()
+        {
+            // TODO unit test for the property 'IndirectMap'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
new file mode 100644
index 000000000000..72e5a9130b9e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
@@ -0,0 +1,96 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing MixedPropertiesAndAdditionalPropertiesClass
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class MixedPropertiesAndAdditionalPropertiesClassTests
+    {
+        // TODO uncomment below to declare an instance variable for MixedPropertiesAndAdditionalPropertiesClass
+        //private MixedPropertiesAndAdditionalPropertiesClass instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of MixedPropertiesAndAdditionalPropertiesClass
+            //instance = new MixedPropertiesAndAdditionalPropertiesClass();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of MixedPropertiesAndAdditionalPropertiesClass
+        /// 
+        [Test]
+        public void MixedPropertiesAndAdditionalPropertiesClassInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" MixedPropertiesAndAdditionalPropertiesClass
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a MixedPropertiesAndAdditionalPropertiesClass");
+        }
+
+
+        /// 
+        /// Test the property 'Uuid'
+        /// 
+        [Test]
+        public void UuidTest()
+        {
+            // TODO unit test for the property 'Uuid'
+        }
+        /// 
+        /// Test the property 'DateTime'
+        /// 
+        [Test]
+        public void DateTimeTest()
+        {
+            // TODO unit test for the property 'DateTime'
+        }
+        /// 
+        /// Test the property 'Map'
+        /// 
+        [Test]
+        public void MapTest()
+        {
+            // TODO unit test for the property 'Map'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
new file mode 100644
index 000000000000..f85a9a6a5817
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Model200Response
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class Model200ResponseTests
+    {
+        // TODO uncomment below to declare an instance variable for Model200Response
+        //private Model200Response instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Model200Response
+            //instance = new Model200Response();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Model200Response
+        /// 
+        [Test]
+        public void Model200ResponseInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Model200Response
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Model200Response");
+        }
+
+
+        /// 
+        /// Test the property 'Name'
+        /// 
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+        /// 
+        /// Test the property 'Class'
+        /// 
+        [Test]
+        public void ClassTest()
+        {
+            // TODO unit test for the property 'Class'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
new file mode 100644
index 000000000000..db4530153a85
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ModelClient
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ModelClientTests
+    {
+        // TODO uncomment below to declare an instance variable for ModelClient
+        //private ModelClient instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ModelClient
+            //instance = new ModelClient();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ModelClient
+        /// 
+        [Test]
+        public void ModelClientInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ModelClient
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ModelClient");
+        }
+
+
+        /// 
+        /// Test the property '__Client'
+        /// 
+        [Test]
+        public void __ClientTest()
+        {
+            // TODO unit test for the property '__Client'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
new file mode 100644
index 000000000000..5575f11af517
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
@@ -0,0 +1,104 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Name
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class NameTests
+    {
+        // TODO uncomment below to declare an instance variable for Name
+        //private Name instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Name
+            //instance = new Name();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Name
+        /// 
+        [Test]
+        public void NameInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Name
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Name");
+        }
+
+
+        /// 
+        /// Test the property '_Name'
+        /// 
+        [Test]
+        public void _NameTest()
+        {
+            // TODO unit test for the property '_Name'
+        }
+        /// 
+        /// Test the property 'SnakeCase'
+        /// 
+        [Test]
+        public void SnakeCaseTest()
+        {
+            // TODO unit test for the property 'SnakeCase'
+        }
+        /// 
+        /// Test the property 'Property'
+        /// 
+        [Test]
+        public void PropertyTest()
+        {
+            // TODO unit test for the property 'Property'
+        }
+        /// 
+        /// Test the property '_123Number'
+        /// 
+        [Test]
+        public void _123NumberTest()
+        {
+            // TODO unit test for the property '_123Number'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
new file mode 100644
index 000000000000..d9b5c4ea4994
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing NumberOnly
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class NumberOnlyTests
+    {
+        // TODO uncomment below to declare an instance variable for NumberOnly
+        //private NumberOnly instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of NumberOnly
+            //instance = new NumberOnly();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of NumberOnly
+        /// 
+        [Test]
+        public void NumberOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" NumberOnly
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a NumberOnly");
+        }
+
+
+        /// 
+        /// Test the property 'JustNumber'
+        /// 
+        [Test]
+        public void JustNumberTest()
+        {
+            // TODO unit test for the property 'JustNumber'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
new file mode 100644
index 000000000000..36853bd0d17f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
@@ -0,0 +1,120 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Order
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class OrderTests
+    {
+        // TODO uncomment below to declare an instance variable for Order
+        //private Order instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Order
+            //instance = new Order();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Order
+        /// 
+        [Test]
+        public void OrderInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Order
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Order");
+        }
+
+
+        /// 
+        /// Test the property 'Id'
+        /// 
+        [Test]
+        public void IdTest()
+        {
+            // TODO unit test for the property 'Id'
+        }
+        /// 
+        /// Test the property 'PetId'
+        /// 
+        [Test]
+        public void PetIdTest()
+        {
+            // TODO unit test for the property 'PetId'
+        }
+        /// 
+        /// Test the property 'Quantity'
+        /// 
+        [Test]
+        public void QuantityTest()
+        {
+            // TODO unit test for the property 'Quantity'
+        }
+        /// 
+        /// Test the property 'ShipDate'
+        /// 
+        [Test]
+        public void ShipDateTest()
+        {
+            // TODO unit test for the property 'ShipDate'
+        }
+        /// 
+        /// Test the property 'Status'
+        /// 
+        [Test]
+        public void StatusTest()
+        {
+            // TODO unit test for the property 'Status'
+        }
+        /// 
+        /// Test the property 'Complete'
+        /// 
+        [Test]
+        public void CompleteTest()
+        {
+            // TODO unit test for the property 'Complete'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
new file mode 100644
index 000000000000..7069f4e9554f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
@@ -0,0 +1,96 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing OuterComposite
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class OuterCompositeTests
+    {
+        // TODO uncomment below to declare an instance variable for OuterComposite
+        //private OuterComposite instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of OuterComposite
+            //instance = new OuterComposite();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of OuterComposite
+        /// 
+        [Test]
+        public void OuterCompositeInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" OuterComposite
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a OuterComposite");
+        }
+
+
+        /// 
+        /// Test the property 'MyNumber'
+        /// 
+        [Test]
+        public void MyNumberTest()
+        {
+            // TODO unit test for the property 'MyNumber'
+        }
+        /// 
+        /// Test the property 'MyString'
+        /// 
+        [Test]
+        public void MyStringTest()
+        {
+            // TODO unit test for the property 'MyString'
+        }
+        /// 
+        /// Test the property 'MyBoolean'
+        /// 
+        [Test]
+        public void MyBooleanTest()
+        {
+            // TODO unit test for the property 'MyBoolean'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
new file mode 100644
index 000000000000..f482ff479ec5
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
@@ -0,0 +1,72 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing OuterEnum
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class OuterEnumTests
+    {
+        // TODO uncomment below to declare an instance variable for OuterEnum
+        //private OuterEnum instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of OuterEnum
+            //instance = new OuterEnum();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of OuterEnum
+        /// 
+        [Test]
+        public void OuterEnumInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" OuterEnum
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a OuterEnum");
+        }
+
+
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
new file mode 100644
index 000000000000..20b3ab12dbb2
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
@@ -0,0 +1,120 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Pet
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class PetTests
+    {
+        // TODO uncomment below to declare an instance variable for Pet
+        //private Pet instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Pet
+            //instance = new Pet();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Pet
+        /// 
+        [Test]
+        public void PetInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Pet
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Pet");
+        }
+
+
+        /// 
+        /// Test the property 'Id'
+        /// 
+        [Test]
+        public void IdTest()
+        {
+            // TODO unit test for the property 'Id'
+        }
+        /// 
+        /// Test the property 'Category'
+        /// 
+        [Test]
+        public void CategoryTest()
+        {
+            // TODO unit test for the property 'Category'
+        }
+        /// 
+        /// Test the property 'Name'
+        /// 
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+        /// 
+        /// Test the property 'PhotoUrls'
+        /// 
+        [Test]
+        public void PhotoUrlsTest()
+        {
+            // TODO unit test for the property 'PhotoUrls'
+        }
+        /// 
+        /// Test the property 'Tags'
+        /// 
+        [Test]
+        public void TagsTest()
+        {
+            // TODO unit test for the property 'Tags'
+        }
+        /// 
+        /// Test the property 'Status'
+        /// 
+        [Test]
+        public void StatusTest()
+        {
+            // TODO unit test for the property 'Status'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
new file mode 100644
index 000000000000..cf1a8f54bb84
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing ReadOnlyFirst
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ReadOnlyFirstTests
+    {
+        // TODO uncomment below to declare an instance variable for ReadOnlyFirst
+        //private ReadOnlyFirst instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of ReadOnlyFirst
+            //instance = new ReadOnlyFirst();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of ReadOnlyFirst
+        /// 
+        [Test]
+        public void ReadOnlyFirstInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" ReadOnlyFirst
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a ReadOnlyFirst");
+        }
+
+
+        /// 
+        /// Test the property 'Bar'
+        /// 
+        [Test]
+        public void BarTest()
+        {
+            // TODO unit test for the property 'Bar'
+        }
+        /// 
+        /// Test the property 'Baz'
+        /// 
+        [Test]
+        public void BazTest()
+        {
+            // TODO unit test for the property 'Baz'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
new file mode 100644
index 000000000000..1ac79a9f9100
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Return
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class ReturnTests
+    {
+        // TODO uncomment below to declare an instance variable for Return
+        //private Return instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Return
+            //instance = new Return();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Return
+        /// 
+        [Test]
+        public void ReturnInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Return
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Return");
+        }
+
+
+        /// 
+        /// Test the property '_Return'
+        /// 
+        [Test]
+        public void _ReturnTest()
+        {
+            // TODO unit test for the property '_Return'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
new file mode 100644
index 000000000000..0a4dcb6a7bcd
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing SpecialModelName
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class SpecialModelNameTests
+    {
+        // TODO uncomment below to declare an instance variable for SpecialModelName
+        //private SpecialModelName instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of SpecialModelName
+            //instance = new SpecialModelName();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of SpecialModelName
+        /// 
+        [Test]
+        public void SpecialModelNameInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" SpecialModelName
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a SpecialModelName");
+        }
+
+
+        /// 
+        /// Test the property 'SpecialPropertyName'
+        /// 
+        [Test]
+        public void SpecialPropertyNameTest()
+        {
+            // TODO unit test for the property 'SpecialPropertyName'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
new file mode 100644
index 000000000000..efc4cd907733
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
@@ -0,0 +1,72 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing StringBooleanMap
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class StringBooleanMapTests
+    {
+        // TODO uncomment below to declare an instance variable for StringBooleanMap
+        //private StringBooleanMap instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of StringBooleanMap
+            //instance = new StringBooleanMap();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of StringBooleanMap
+        /// 
+        [Test]
+        public void StringBooleanMapInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" StringBooleanMap
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a StringBooleanMap");
+        }
+
+
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
new file mode 100644
index 000000000000..52ee4ca988fe
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
@@ -0,0 +1,88 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing Tag
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class TagTests
+    {
+        // TODO uncomment below to declare an instance variable for Tag
+        //private Tag instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of Tag
+            //instance = new Tag();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of Tag
+        /// 
+        [Test]
+        public void TagInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" Tag
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a Tag");
+        }
+
+
+        /// 
+        /// Test the property 'Id'
+        /// 
+        [Test]
+        public void IdTest()
+        {
+            // TODO unit test for the property 'Id'
+        }
+        /// 
+        /// Test the property 'Name'
+        /// 
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
new file mode 100644
index 000000000000..8e073d2aa0ea
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
@@ -0,0 +1,136 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// 
+    ///  Class for testing User
+    /// 
+    /// 
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// 
+    [TestFixture]
+    public class UserTests
+    {
+        // TODO uncomment below to declare an instance variable for User
+        //private User instance;
+
+        /// 
+        /// Setup before each test
+        /// 
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of User
+            //instance = new User();
+        }
+
+        /// 
+        /// Clean up after each test
+        /// 
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// 
+        /// Test an instance of User
+        /// 
+        [Test]
+        public void UserInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" User
+            //Assert.IsInstanceOfType (instance, "variable 'instance' is a User");
+        }
+
+
+        /// 
+        /// Test the property 'Id'
+        /// 
+        [Test]
+        public void IdTest()
+        {
+            // TODO unit test for the property 'Id'
+        }
+        /// 
+        /// Test the property 'Username'
+        /// 
+        [Test]
+        public void UsernameTest()
+        {
+            // TODO unit test for the property 'Username'
+        }
+        /// 
+        /// Test the property 'FirstName'
+        /// 
+        [Test]
+        public void FirstNameTest()
+        {
+            // TODO unit test for the property 'FirstName'
+        }
+        /// 
+        /// Test the property 'LastName'
+        /// 
+        [Test]
+        public void LastNameTest()
+        {
+            // TODO unit test for the property 'LastName'
+        }
+        /// 
+        /// Test the property 'Email'
+        /// 
+        [Test]
+        public void EmailTest()
+        {
+            // TODO unit test for the property 'Email'
+        }
+        /// 
+        /// Test the property 'Password'
+        /// 
+        [Test]
+        public void PasswordTest()
+        {
+            // TODO unit test for the property 'Password'
+        }
+        /// 
+        /// Test the property 'Phone'
+        /// 
+        [Test]
+        public void PhoneTest()
+        {
+            // TODO unit test for the property 'Phone'
+        }
+        /// 
+        /// Test the property 'UserStatus'
+        /// 
+        [Test]
+        public void UserStatusTest()
+        {
+            // TODO unit test for the property 'UserStatus'
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
new file mode 100644
index 000000000000..48ec5e0f7c18
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -0,0 +1,89 @@
+
+
+
+  
+    Debug
+    AnyCPU
+    {19F1DEBC-DE5E-4517-8062-F000CD499087}
+    Library
+    Properties
+    Org.OpenAPITools.Test
+    Org.OpenAPITools.Test
+    v4.5
+    512
+  
+  
+    true
+    full
+    false
+    bin\Debug\
+    DEBUG;TRACE
+    prompt
+    4
+  
+  
+    pdbonly
+    true
+    bin\Release\
+    TRACE
+    prompt
+    4
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+        $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+        ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+        ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+        ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+    
+    
+        $(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+        ..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+        ..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+        ..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+    
+    
+        $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+        ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+        ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+        ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll
+    
+    
+        $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll
+        ..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+        ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+        ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll
+    
+  
+  
+    
+  
+  
+      
+  
+  
+  
+      
+          {321C8C3F-0156-40C1-AE42-D59761FB9B6C}
+          Org.OpenAPITools
+      
+  
+
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/packages.config b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/packages.config
new file mode 100644
index 000000000000..ac390c1dcb3c
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/packages.config
@@ -0,0 +1,7 @@
+
+
+  
+  
+  
+  
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
new file mode 100644
index 000000000000..aacccf92ca50
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -0,0 +1,321 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IAnotherFakeApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// To test special tags
+        /// 
+        /// 
+        /// To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        ModelClient Call123TestSpecialTags (ModelClient modelClient);
+
+        /// 
+        /// To test special tags
+        /// 
+        /// 
+        /// To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        ApiResponse Call123TestSpecialTagsWithHttpInfo (ModelClient modelClient);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// To test special tags
+        /// 
+        /// 
+        /// To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        System.Threading.Tasks.Task Call123TestSpecialTagsAsync (ModelClient modelClient);
+
+        /// 
+        /// To test special tags
+        /// 
+        /// 
+        /// To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        System.Threading.Tasks.Task> Call123TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class AnotherFakeApi : IAnotherFakeApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public AnotherFakeApi(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public AnotherFakeApi(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        /// To test special tags To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        public ModelClient Call123TestSpecialTags (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = Call123TestSpecialTagsWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// To test special tags To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        public ApiResponse< ModelClient > Call123TestSpecialTagsWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags");
+
+            var localVarPath = "/another-fake/dummy";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Call123TestSpecialTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+        /// 
+        /// To test special tags To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        public async System.Threading.Tasks.Task Call123TestSpecialTagsAsync (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = await Call123TestSpecialTagsAsyncWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// To test special tags To test special tags and operation ID starting with number
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        public async System.Threading.Tasks.Task> Call123TestSpecialTagsAsyncWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags");
+
+            var localVarPath = "/another-fake/dummy";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Call123TestSpecialTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
new file mode 100644
index 000000000000..d282e13d4d08
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -0,0 +1,2397 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IFakeApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// bool?
+        bool? FakeOuterBooleanSerialize (bool? body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// ApiResponse of bool?
+        ApiResponse FakeOuterBooleanSerializeWithHttpInfo (bool? body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// OuterComposite
+        OuterComposite FakeOuterCompositeSerialize (OuterComposite outerComposite = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// ApiResponse of OuterComposite
+        ApiResponse FakeOuterCompositeSerializeWithHttpInfo (OuterComposite outerComposite = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// decimal?
+        decimal? FakeOuterNumberSerialize (decimal? body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// ApiResponse of decimal?
+        ApiResponse FakeOuterNumberSerializeWithHttpInfo (decimal? body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// string
+        string FakeOuterStringSerialize (string body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// ApiResponse of string
+        ApiResponse FakeOuterStringSerializeWithHttpInfo (string body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// ApiResponse of Object(void)
+        ApiResponse TestBodyWithFileSchemaWithHttpInfo (FileSchemaTestClass fileSchemaTestClass);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// 
+        void TestBodyWithQueryParams (string query, User user);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// ApiResponse of Object(void)
+        ApiResponse TestBodyWithQueryParamsWithHttpInfo (string query, User user);
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        ModelClient TestClientModel (ModelClient modelClient);
+
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        ApiResponse TestClientModelWithHttpInfo (ModelClient modelClient);
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// 
+        void TestEndpointParameters (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null);
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// ApiResponse of Object(void)
+        ApiResponse TestEndpointParametersWithHttpInfo (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null);
+        /// 
+        /// To test enum parameters
+        /// 
+        /// 
+        /// To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// 
+        void TestEnumParameters (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null);
+
+        /// 
+        /// To test enum parameters
+        /// 
+        /// 
+        /// To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// ApiResponse of Object(void)
+        ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null);
+        /// 
+        /// test inline additionalProperties
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// 
+        void TestInlineAdditionalProperties (Dictionary requestBody);
+
+        /// 
+        /// test inline additionalProperties
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// ApiResponse of Object(void)
+        ApiResponse TestInlineAdditionalPropertiesWithHttpInfo (Dictionary requestBody);
+        /// 
+        /// test json serialization of form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// 
+        void TestJsonFormData (string param, string param2);
+
+        /// 
+        /// test json serialization of form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// ApiResponse of Object(void)
+        ApiResponse TestJsonFormDataWithHttpInfo (string param, string param2);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// Task of bool?
+        System.Threading.Tasks.Task FakeOuterBooleanSerializeAsync (bool? body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// Task of ApiResponse (bool?)
+        System.Threading.Tasks.Task> FakeOuterBooleanSerializeAsyncWithHttpInfo (bool? body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// Task of OuterComposite
+        System.Threading.Tasks.Task FakeOuterCompositeSerializeAsync (OuterComposite outerComposite = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// Task of ApiResponse (OuterComposite)
+        System.Threading.Tasks.Task> FakeOuterCompositeSerializeAsyncWithHttpInfo (OuterComposite outerComposite = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// Task of decimal?
+        System.Threading.Tasks.Task FakeOuterNumberSerializeAsync (decimal? body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// Task of ApiResponse (decimal?)
+        System.Threading.Tasks.Task> FakeOuterNumberSerializeAsyncWithHttpInfo (decimal? body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// Task of string
+        System.Threading.Tasks.Task FakeOuterStringSerializeAsync (string body = null);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// Task of ApiResponse (string)
+        System.Threading.Tasks.Task> FakeOuterStringSerializeAsyncWithHttpInfo (string body = null);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of void
+        System.Threading.Tasks.Task TestBodyWithFileSchemaAsync (FileSchemaTestClass fileSchemaTestClass);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestBodyWithFileSchemaAsyncWithHttpInfo (FileSchemaTestClass fileSchemaTestClass);
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// Task of void
+        System.Threading.Tasks.Task TestBodyWithQueryParamsAsync (string query, User user);
+
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestBodyWithQueryParamsAsyncWithHttpInfo (string query, User user);
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        System.Threading.Tasks.Task TestClientModelAsync (ModelClient modelClient);
+
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// 
+        /// To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        System.Threading.Tasks.Task> TestClientModelAsyncWithHttpInfo (ModelClient modelClient);
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// Task of void
+        System.Threading.Tasks.Task TestEndpointParametersAsync (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null);
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestEndpointParametersAsyncWithHttpInfo (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null);
+        /// 
+        /// To test enum parameters
+        /// 
+        /// 
+        /// To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// Task of void
+        System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null);
+
+        /// 
+        /// To test enum parameters
+        /// 
+        /// 
+        /// To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null);
+        /// 
+        /// test inline additionalProperties
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// Task of void
+        System.Threading.Tasks.Task TestInlineAdditionalPropertiesAsync (Dictionary requestBody);
+
+        /// 
+        /// test inline additionalProperties
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestInlineAdditionalPropertiesAsyncWithHttpInfo (Dictionary requestBody);
+        /// 
+        /// test json serialization of form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// Task of void
+        System.Threading.Tasks.Task TestJsonFormDataAsync (string param, string param2);
+
+        /// 
+        /// test json serialization of form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> TestJsonFormDataAsyncWithHttpInfo (string param, string param2);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class FakeApi : IFakeApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public FakeApi(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public FakeApi(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        ///  Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// bool?
+        public bool? FakeOuterBooleanSerialize (bool? body = null)
+        {
+             ApiResponse localVarResponse = FakeOuterBooleanSerializeWithHttpInfo(body);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        ///  Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// ApiResponse of bool?
+        public ApiResponse< bool? > FakeOuterBooleanSerializeWithHttpInfo (bool? body = null)
+        {
+
+            var localVarPath = "/fake/outer/boolean";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterBooleanSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (bool?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(bool?)));
+        }
+
+        /// 
+        ///  Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// Task of bool?
+        public async System.Threading.Tasks.Task FakeOuterBooleanSerializeAsync (bool? body = null)
+        {
+             ApiResponse localVarResponse = await FakeOuterBooleanSerializeAsyncWithHttpInfo(body);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        ///  Test serialization of outer boolean types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input boolean as post body (optional)
+        /// Task of ApiResponse (bool?)
+        public async System.Threading.Tasks.Task> FakeOuterBooleanSerializeAsyncWithHttpInfo (bool? body = null)
+        {
+
+            var localVarPath = "/fake/outer/boolean";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterBooleanSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (bool?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(bool?)));
+        }
+
+        /// 
+        ///  Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// OuterComposite
+        public OuterComposite FakeOuterCompositeSerialize (OuterComposite outerComposite = null)
+        {
+             ApiResponse localVarResponse = FakeOuterCompositeSerializeWithHttpInfo(outerComposite);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        ///  Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// ApiResponse of OuterComposite
+        public ApiResponse< OuterComposite > FakeOuterCompositeSerializeWithHttpInfo (OuterComposite outerComposite = null)
+        {
+
+            var localVarPath = "/fake/outer/composite";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (outerComposite != null && outerComposite.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(outerComposite); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = outerComposite; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterCompositeSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (OuterComposite) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterComposite)));
+        }
+
+        /// 
+        ///  Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// Task of OuterComposite
+        public async System.Threading.Tasks.Task FakeOuterCompositeSerializeAsync (OuterComposite outerComposite = null)
+        {
+             ApiResponse localVarResponse = await FakeOuterCompositeSerializeAsyncWithHttpInfo(outerComposite);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        ///  Test serialization of object with outer number type
+        /// 
+        /// Thrown when fails to make API call
+        /// Input composite as post body (optional)
+        /// Task of ApiResponse (OuterComposite)
+        public async System.Threading.Tasks.Task> FakeOuterCompositeSerializeAsyncWithHttpInfo (OuterComposite outerComposite = null)
+        {
+
+            var localVarPath = "/fake/outer/composite";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (outerComposite != null && outerComposite.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(outerComposite); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = outerComposite; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterCompositeSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (OuterComposite) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterComposite)));
+        }
+
+        /// 
+        ///  Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// decimal?
+        public decimal? FakeOuterNumberSerialize (decimal? body = null)
+        {
+             ApiResponse localVarResponse = FakeOuterNumberSerializeWithHttpInfo(body);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        ///  Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// ApiResponse of decimal?
+        public ApiResponse< decimal? > FakeOuterNumberSerializeWithHttpInfo (decimal? body = null)
+        {
+
+            var localVarPath = "/fake/outer/number";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterNumberSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (decimal?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(decimal?)));
+        }
+
+        /// 
+        ///  Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// Task of decimal?
+        public async System.Threading.Tasks.Task FakeOuterNumberSerializeAsync (decimal? body = null)
+        {
+             ApiResponse localVarResponse = await FakeOuterNumberSerializeAsyncWithHttpInfo(body);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        ///  Test serialization of outer number types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input number as post body (optional)
+        /// Task of ApiResponse (decimal?)
+        public async System.Threading.Tasks.Task> FakeOuterNumberSerializeAsyncWithHttpInfo (decimal? body = null)
+        {
+
+            var localVarPath = "/fake/outer/number";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterNumberSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (decimal?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(decimal?)));
+        }
+
+        /// 
+        ///  Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// string
+        public string FakeOuterStringSerialize (string body = null)
+        {
+             ApiResponse localVarResponse = FakeOuterStringSerializeWithHttpInfo(body);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        ///  Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// ApiResponse of string
+        public ApiResponse< string > FakeOuterStringSerializeWithHttpInfo (string body = null)
+        {
+
+            var localVarPath = "/fake/outer/string";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterStringSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// 
+        ///  Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// Task of string
+        public async System.Threading.Tasks.Task FakeOuterStringSerializeAsync (string body = null)
+        {
+             ApiResponse localVarResponse = await FakeOuterStringSerializeAsyncWithHttpInfo(body);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        ///  Test serialization of outer string types
+        /// 
+        /// Thrown when fails to make API call
+        /// Input string as post body (optional)
+        /// Task of ApiResponse (string)
+        public async System.Threading.Tasks.Task> FakeOuterStringSerializeAsyncWithHttpInfo (string body = null)
+        {
+
+            var localVarPath = "/fake/outer/string";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (body != null && body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakeOuterStringSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        public void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass)
+        {
+             TestBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass);
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// ApiResponse of Object(void)
+        public ApiResponse TestBodyWithFileSchemaWithHttpInfo (FileSchemaTestClass fileSchemaTestClass)
+        {
+            // verify the required parameter 'fileSchemaTestClass' is set
+            if (fileSchemaTestClass == null)
+                throw new ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema");
+
+            var localVarPath = "/fake/body-with-file-schema";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (fileSchemaTestClass != null && fileSchemaTestClass.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(fileSchemaTestClass); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = fileSchemaTestClass; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithFileSchema", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of void
+        public async System.Threading.Tasks.Task TestBodyWithFileSchemaAsync (FileSchemaTestClass fileSchemaTestClass)
+        {
+             await TestBodyWithFileSchemaAsyncWithHttpInfo(fileSchemaTestClass);
+
+        }
+
+        /// 
+        ///  For this test, the body for this request much reference a schema named `File`.
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestBodyWithFileSchemaAsyncWithHttpInfo (FileSchemaTestClass fileSchemaTestClass)
+        {
+            // verify the required parameter 'fileSchemaTestClass' is set
+            if (fileSchemaTestClass == null)
+                throw new ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema");
+
+            var localVarPath = "/fake/body-with-file-schema";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (fileSchemaTestClass != null && fileSchemaTestClass.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(fileSchemaTestClass); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = fileSchemaTestClass; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithFileSchema", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        ///  
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// 
+        public void TestBodyWithQueryParams (string query, User user)
+        {
+             TestBodyWithQueryParamsWithHttpInfo(query, user);
+        }
+
+        /// 
+        ///  
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// ApiResponse of Object(void)
+        public ApiResponse TestBodyWithQueryParamsWithHttpInfo (string query, User user)
+        {
+            // verify the required parameter 'query' is set
+            if (query == null)
+                throw new ApiException(400, "Missing required parameter 'query' when calling FakeApi->TestBodyWithQueryParams");
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling FakeApi->TestBodyWithQueryParams");
+
+            var localVarPath = "/fake/body-with-query-params";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (query != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "query", query)); // query parameter
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithQueryParams", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        ///  
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// Task of void
+        public async System.Threading.Tasks.Task TestBodyWithQueryParamsAsync (string query, User user)
+        {
+             await TestBodyWithQueryParamsAsyncWithHttpInfo(query, user);
+
+        }
+
+        /// 
+        ///  
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        /// 
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestBodyWithQueryParamsAsyncWithHttpInfo (string query, User user)
+        {
+            // verify the required parameter 'query' is set
+            if (query == null)
+                throw new ApiException(400, "Missing required parameter 'query' when calling FakeApi->TestBodyWithQueryParams");
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling FakeApi->TestBodyWithQueryParams");
+
+            var localVarPath = "/fake/body-with-query-params";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (query != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "query", query)); // query parameter
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestBodyWithQueryParams", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// To test \"client\" model To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        public ModelClient TestClientModel (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = TestClientModelWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// To test \"client\" model To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        public ApiResponse< ModelClient > TestClientModelWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling FakeApi->TestClientModel");
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestClientModel", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+        /// 
+        /// To test \"client\" model To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        public async System.Threading.Tasks.Task TestClientModelAsync (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = await TestClientModelAsyncWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// To test \"client\" model To test \"client\" model
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        public async System.Threading.Tasks.Task> TestClientModelAsyncWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling FakeApi->TestClientModel");
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestClientModel", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// 
+        public void TestEndpointParameters (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null)
+        {
+             TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback);
+        }
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// ApiResponse of Object(void)
+        public ApiResponse TestEndpointParametersWithHttpInfo (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null)
+        {
+            // verify the required parameter 'number' is set
+            if (number == null)
+                throw new ApiException(400, "Missing required parameter 'number' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter '_double' is set
+            if (_double == null)
+                throw new ApiException(400, "Missing required parameter '_double' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter 'patternWithoutDelimiter' is set
+            if (patternWithoutDelimiter == null)
+                throw new ApiException(400, "Missing required parameter 'patternWithoutDelimiter' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter '_byte' is set
+            if (_byte == null)
+                throw new ApiException(400, "Missing required parameter '_byte' when calling FakeApi->TestEndpointParameters");
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (integer != null) localVarFormParams.Add("integer", this.Configuration.ApiClient.ParameterToString(integer)); // form parameter
+            if (int32 != null) localVarFormParams.Add("int32", this.Configuration.ApiClient.ParameterToString(int32)); // form parameter
+            if (int64 != null) localVarFormParams.Add("int64", this.Configuration.ApiClient.ParameterToString(int64)); // form parameter
+            if (number != null) localVarFormParams.Add("number", this.Configuration.ApiClient.ParameterToString(number)); // form parameter
+            if (_float != null) localVarFormParams.Add("float", this.Configuration.ApiClient.ParameterToString(_float)); // form parameter
+            if (_double != null) localVarFormParams.Add("double", this.Configuration.ApiClient.ParameterToString(_double)); // form parameter
+            if (_string != null) localVarFormParams.Add("string", this.Configuration.ApiClient.ParameterToString(_string)); // form parameter
+            if (patternWithoutDelimiter != null) localVarFormParams.Add("pattern_without_delimiter", this.Configuration.ApiClient.ParameterToString(patternWithoutDelimiter)); // form parameter
+            if (_byte != null) localVarFormParams.Add("byte", this.Configuration.ApiClient.ParameterToString(_byte)); // form parameter
+            if (binary != null) localVarFileParams.Add("binary", this.Configuration.ApiClient.ParameterToFile("binary", binary));
+            if (date != null) localVarFormParams.Add("date", this.Configuration.ApiClient.ParameterToString(date)); // form parameter
+            if (dateTime != null) localVarFormParams.Add("dateTime", this.Configuration.ApiClient.ParameterToString(dateTime)); // form parameter
+            if (password != null) localVarFormParams.Add("password", this.Configuration.ApiClient.ParameterToString(password)); // form parameter
+            if (callback != null) localVarFormParams.Add("callback", this.Configuration.ApiClient.ParameterToString(callback)); // form parameter
+
+            // authentication (http_basic_test) required
+            // http basic authentication required
+            if (!String.IsNullOrEmpty(this.Configuration.Username) || !String.IsNullOrEmpty(this.Configuration.Password))
+            {
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password);
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEndpointParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// Task of void
+        public async System.Threading.Tasks.Task TestEndpointParametersAsync (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null)
+        {
+             await TestEndpointParametersAsyncWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback);
+
+        }
+
+        /// 
+        /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+        /// 
+        /// Thrown when fails to make API call
+        /// None
+        /// None
+        /// None
+        /// None
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// None (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestEndpointParametersAsyncWithHttpInfo (decimal? number, double? _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null)
+        {
+            // verify the required parameter 'number' is set
+            if (number == null)
+                throw new ApiException(400, "Missing required parameter 'number' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter '_double' is set
+            if (_double == null)
+                throw new ApiException(400, "Missing required parameter '_double' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter 'patternWithoutDelimiter' is set
+            if (patternWithoutDelimiter == null)
+                throw new ApiException(400, "Missing required parameter 'patternWithoutDelimiter' when calling FakeApi->TestEndpointParameters");
+            // verify the required parameter '_byte' is set
+            if (_byte == null)
+                throw new ApiException(400, "Missing required parameter '_byte' when calling FakeApi->TestEndpointParameters");
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (integer != null) localVarFormParams.Add("integer", this.Configuration.ApiClient.ParameterToString(integer)); // form parameter
+            if (int32 != null) localVarFormParams.Add("int32", this.Configuration.ApiClient.ParameterToString(int32)); // form parameter
+            if (int64 != null) localVarFormParams.Add("int64", this.Configuration.ApiClient.ParameterToString(int64)); // form parameter
+            if (number != null) localVarFormParams.Add("number", this.Configuration.ApiClient.ParameterToString(number)); // form parameter
+            if (_float != null) localVarFormParams.Add("float", this.Configuration.ApiClient.ParameterToString(_float)); // form parameter
+            if (_double != null) localVarFormParams.Add("double", this.Configuration.ApiClient.ParameterToString(_double)); // form parameter
+            if (_string != null) localVarFormParams.Add("string", this.Configuration.ApiClient.ParameterToString(_string)); // form parameter
+            if (patternWithoutDelimiter != null) localVarFormParams.Add("pattern_without_delimiter", this.Configuration.ApiClient.ParameterToString(patternWithoutDelimiter)); // form parameter
+            if (_byte != null) localVarFormParams.Add("byte", this.Configuration.ApiClient.ParameterToString(_byte)); // form parameter
+            if (binary != null) localVarFileParams.Add("binary", this.Configuration.ApiClient.ParameterToFile("binary", binary));
+            if (date != null) localVarFormParams.Add("date", this.Configuration.ApiClient.ParameterToString(date)); // form parameter
+            if (dateTime != null) localVarFormParams.Add("dateTime", this.Configuration.ApiClient.ParameterToString(dateTime)); // form parameter
+            if (password != null) localVarFormParams.Add("password", this.Configuration.ApiClient.ParameterToString(password)); // form parameter
+            if (callback != null) localVarFormParams.Add("callback", this.Configuration.ApiClient.ParameterToString(callback)); // form parameter
+
+            // authentication (http_basic_test) required
+            // http basic authentication required
+            if (!String.IsNullOrEmpty(this.Configuration.Username) || !String.IsNullOrEmpty(this.Configuration.Password))
+            {
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password);
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEndpointParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// To test enum parameters To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// 
+        public void TestEnumParameters (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null)
+        {
+             TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        }
+
+        /// 
+        /// To test enum parameters To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// ApiResponse of Object(void)
+        public ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null)
+        {
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (enumQueryStringArray != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "enum_query_string_array", enumQueryStringArray)); // query parameter
+            if (enumQueryString != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_string", enumQueryString)); // query parameter
+            if (enumQueryInteger != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_integer", enumQueryInteger)); // query parameter
+            if (enumQueryDouble != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_double", enumQueryDouble)); // query parameter
+            if (enumHeaderStringArray != null) localVarHeaderParams.Add("enum_header_string_array", this.Configuration.ApiClient.ParameterToString(enumHeaderStringArray)); // header parameter
+            if (enumHeaderString != null) localVarHeaderParams.Add("enum_header_string", this.Configuration.ApiClient.ParameterToString(enumHeaderString)); // header parameter
+            if (enumFormStringArray != null) localVarFormParams.Add("enum_form_string_array", this.Configuration.ApiClient.ParameterToString(enumFormStringArray)); // form parameter
+            if (enumFormString != null) localVarFormParams.Add("enum_form_string", this.Configuration.ApiClient.ParameterToString(enumFormString)); // form parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEnumParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// To test enum parameters To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// Task of void
+        public async System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null)
+        {
+             await TestEnumParametersAsyncWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
+        }
+
+        /// 
+        /// To test enum parameters To test enum parameters
+        /// 
+        /// Thrown when fails to make API call
+        /// Header parameter enum test (string array) (optional)
+        /// Header parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (string array) (optional)
+        /// Query parameter enum test (string) (optional, default to -efg)
+        /// Query parameter enum test (double) (optional)
+        /// Query parameter enum test (double) (optional)
+        /// Form parameter enum test (string array) (optional, default to $)
+        /// Form parameter enum test (string) (optional, default to -efg)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null)
+        {
+
+            var localVarPath = "/fake";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (enumQueryStringArray != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "enum_query_string_array", enumQueryStringArray)); // query parameter
+            if (enumQueryString != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_string", enumQueryString)); // query parameter
+            if (enumQueryInteger != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_integer", enumQueryInteger)); // query parameter
+            if (enumQueryDouble != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enum_query_double", enumQueryDouble)); // query parameter
+            if (enumHeaderStringArray != null) localVarHeaderParams.Add("enum_header_string_array", this.Configuration.ApiClient.ParameterToString(enumHeaderStringArray)); // header parameter
+            if (enumHeaderString != null) localVarHeaderParams.Add("enum_header_string", this.Configuration.ApiClient.ParameterToString(enumHeaderString)); // header parameter
+            if (enumFormStringArray != null) localVarFormParams.Add("enum_form_string_array", this.Configuration.ApiClient.ParameterToString(enumFormStringArray)); // form parameter
+            if (enumFormString != null) localVarFormParams.Add("enum_form_string", this.Configuration.ApiClient.ParameterToString(enumFormString)); // form parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEnumParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// test inline additionalProperties 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// 
+        public void TestInlineAdditionalProperties (Dictionary requestBody)
+        {
+             TestInlineAdditionalPropertiesWithHttpInfo(requestBody);
+        }
+
+        /// 
+        /// test inline additionalProperties 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// ApiResponse of Object(void)
+        public ApiResponse TestInlineAdditionalPropertiesWithHttpInfo (Dictionary requestBody)
+        {
+            // verify the required parameter 'requestBody' is set
+            if (requestBody == null)
+                throw new ApiException(400, "Missing required parameter 'requestBody' when calling FakeApi->TestInlineAdditionalProperties");
+
+            var localVarPath = "/fake/inline-additionalProperties";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (requestBody != null && requestBody.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(requestBody); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = requestBody; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestInlineAdditionalProperties", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// test inline additionalProperties 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// Task of void
+        public async System.Threading.Tasks.Task TestInlineAdditionalPropertiesAsync (Dictionary requestBody)
+        {
+             await TestInlineAdditionalPropertiesAsyncWithHttpInfo(requestBody);
+
+        }
+
+        /// 
+        /// test inline additionalProperties 
+        /// 
+        /// Thrown when fails to make API call
+        /// request body
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestInlineAdditionalPropertiesAsyncWithHttpInfo (Dictionary requestBody)
+        {
+            // verify the required parameter 'requestBody' is set
+            if (requestBody == null)
+                throw new ApiException(400, "Missing required parameter 'requestBody' when calling FakeApi->TestInlineAdditionalProperties");
+
+            var localVarPath = "/fake/inline-additionalProperties";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (requestBody != null && requestBody.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(requestBody); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = requestBody; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestInlineAdditionalProperties", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// test json serialization of form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// 
+        public void TestJsonFormData (string param, string param2)
+        {
+             TestJsonFormDataWithHttpInfo(param, param2);
+        }
+
+        /// 
+        /// test json serialization of form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// ApiResponse of Object(void)
+        public ApiResponse TestJsonFormDataWithHttpInfo (string param, string param2)
+        {
+            // verify the required parameter 'param' is set
+            if (param == null)
+                throw new ApiException(400, "Missing required parameter 'param' when calling FakeApi->TestJsonFormData");
+            // verify the required parameter 'param2' is set
+            if (param2 == null)
+                throw new ApiException(400, "Missing required parameter 'param2' when calling FakeApi->TestJsonFormData");
+
+            var localVarPath = "/fake/jsonFormData";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (param != null) localVarFormParams.Add("param", this.Configuration.ApiClient.ParameterToString(param)); // form parameter
+            if (param2 != null) localVarFormParams.Add("param2", this.Configuration.ApiClient.ParameterToString(param2)); // form parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestJsonFormData", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// test json serialization of form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// Task of void
+        public async System.Threading.Tasks.Task TestJsonFormDataAsync (string param, string param2)
+        {
+             await TestJsonFormDataAsyncWithHttpInfo(param, param2);
+
+        }
+
+        /// 
+        /// test json serialization of form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// field1
+        /// field2
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> TestJsonFormDataAsyncWithHttpInfo (string param, string param2)
+        {
+            // verify the required parameter 'param' is set
+            if (param == null)
+                throw new ApiException(400, "Missing required parameter 'param' when calling FakeApi->TestJsonFormData");
+            // verify the required parameter 'param2' is set
+            if (param2 == null)
+                throw new ApiException(400, "Missing required parameter 'param2' when calling FakeApi->TestJsonFormData");
+
+            var localVarPath = "/fake/jsonFormData";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (param != null) localVarFormParams.Add("param", this.Configuration.ApiClient.ParameterToString(param)); // form parameter
+            if (param2 != null) localVarFormParams.Add("param2", this.Configuration.ApiClient.ParameterToString(param2)); // form parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestJsonFormData", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
new file mode 100644
index 000000000000..cba038ef1336
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -0,0 +1,331 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IFakeClassnameTags123Api : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        ModelClient TestClassname (ModelClient modelClient);
+
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        ApiResponse TestClassnameWithHttpInfo (ModelClient modelClient);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        System.Threading.Tasks.Task TestClassnameAsync (ModelClient modelClient);
+
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// 
+        /// To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        System.Threading.Tasks.Task> TestClassnameAsyncWithHttpInfo (ModelClient modelClient);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class FakeClassnameTags123Api : IFakeClassnameTags123Api
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public FakeClassnameTags123Api(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public FakeClassnameTags123Api(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        /// To test class name in snake case To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ModelClient
+        public ModelClient TestClassname (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = TestClassnameWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// To test class name in snake case To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// ApiResponse of ModelClient
+        public ApiResponse< ModelClient > TestClassnameWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling FakeClassnameTags123Api->TestClassname");
+
+            var localVarPath = "/fake_classname_test";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+            // authentication (api_key_query) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key_query")))
+            {
+                localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "api_key_query", this.Configuration.GetApiKeyWithPrefix("api_key_query")));
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestClassname", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+        /// 
+        /// To test class name in snake case To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ModelClient
+        public async System.Threading.Tasks.Task TestClassnameAsync (ModelClient modelClient)
+        {
+             ApiResponse localVarResponse = await TestClassnameAsyncWithHttpInfo(modelClient);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// To test class name in snake case To test class name in snake case
+        /// 
+        /// Thrown when fails to make API call
+        /// client model
+        /// Task of ApiResponse (ModelClient)
+        public async System.Threading.Tasks.Task> TestClassnameAsyncWithHttpInfo (ModelClient modelClient)
+        {
+            // verify the required parameter 'modelClient' is set
+            if (modelClient == null)
+                throw new ApiException(400, "Missing required parameter 'modelClient' when calling FakeClassnameTags123Api->TestClassname");
+
+            var localVarPath = "/fake_classname_test";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (modelClient != null && modelClient.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(modelClient); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = modelClient; // byte array
+            }
+
+            // authentication (api_key_query) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key_query")))
+            {
+                localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "api_key_query", this.Configuration.GetApiKeyWithPrefix("api_key_query")));
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestClassname", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
new file mode 100644
index 000000000000..2fb6528b32e2
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
@@ -0,0 +1,1919 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IPetApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// Add a new pet to the store
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// 
+        void AddPet (Pet pet);
+
+        /// 
+        /// Add a new pet to the store
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// ApiResponse of Object(void)
+        ApiResponse AddPetWithHttpInfo (Pet pet);
+        /// 
+        /// Deletes a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// 
+        void DeletePet (long? petId, string apiKey = null);
+
+        /// 
+        /// Deletes a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// ApiResponse of Object(void)
+        ApiResponse DeletePetWithHttpInfo (long? petId, string apiKey = null);
+        /// 
+        /// Finds Pets by status
+        /// 
+        /// 
+        /// Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// List<Pet>
+        List FindPetsByStatus (List status);
+
+        /// 
+        /// Finds Pets by status
+        /// 
+        /// 
+        /// Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// ApiResponse of List<Pet>
+        ApiResponse> FindPetsByStatusWithHttpInfo (List status);
+        /// 
+        /// Finds Pets by tags
+        /// 
+        /// 
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// List<Pet>
+        List FindPetsByTags (List tags);
+
+        /// 
+        /// Finds Pets by tags
+        /// 
+        /// 
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// ApiResponse of List<Pet>
+        ApiResponse> FindPetsByTagsWithHttpInfo (List tags);
+        /// 
+        /// Find pet by ID
+        /// 
+        /// 
+        /// Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Pet
+        Pet GetPetById (long? petId);
+
+        /// 
+        /// Find pet by ID
+        /// 
+        /// 
+        /// Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// ApiResponse of Pet
+        ApiResponse GetPetByIdWithHttpInfo (long? petId);
+        /// 
+        /// Update an existing pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// 
+        void UpdatePet (Pet pet);
+
+        /// 
+        /// Update an existing pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// ApiResponse of Object(void)
+        ApiResponse UpdatePetWithHttpInfo (Pet pet);
+        /// 
+        /// Updates a pet in the store with form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// 
+        void UpdatePetWithForm (long? petId, string name = null, string status = null);
+
+        /// 
+        /// Updates a pet in the store with form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// ApiResponse of Object(void)
+        ApiResponse UpdatePetWithFormWithHttpInfo (long? petId, string name = null, string status = null);
+        /// 
+        /// uploads an image
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// ApiResponse
+        ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+
+        /// 
+        /// uploads an image
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// ApiResponse of ApiResponse
+        ApiResponse UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse
+        ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse of ApiResponse
+        ApiResponse UploadFileWithRequiredFileWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// Add a new pet to the store
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of void
+        System.Threading.Tasks.Task AddPetAsync (Pet pet);
+
+        /// 
+        /// Add a new pet to the store
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> AddPetAsyncWithHttpInfo (Pet pet);
+        /// 
+        /// Deletes a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// Task of void
+        System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey = null);
+
+        /// 
+        /// Deletes a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null);
+        /// 
+        /// Finds Pets by status
+        /// 
+        /// 
+        /// Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// Task of List<Pet>
+        System.Threading.Tasks.Task> FindPetsByStatusAsync (List status);
+
+        /// 
+        /// Finds Pets by status
+        /// 
+        /// 
+        /// Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// Task of ApiResponse (List<Pet>)
+        System.Threading.Tasks.Task>> FindPetsByStatusAsyncWithHttpInfo (List status);
+        /// 
+        /// Finds Pets by tags
+        /// 
+        /// 
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// Task of List<Pet>
+        System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags);
+
+        /// 
+        /// Finds Pets by tags
+        /// 
+        /// 
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// Task of ApiResponse (List<Pet>)
+        System.Threading.Tasks.Task>> FindPetsByTagsAsyncWithHttpInfo (List tags);
+        /// 
+        /// Find pet by ID
+        /// 
+        /// 
+        /// Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Task of Pet
+        System.Threading.Tasks.Task GetPetByIdAsync (long? petId);
+
+        /// 
+        /// Find pet by ID
+        /// 
+        /// 
+        /// Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Task of ApiResponse (Pet)
+        System.Threading.Tasks.Task> GetPetByIdAsyncWithHttpInfo (long? petId);
+        /// 
+        /// Update an existing pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of void
+        System.Threading.Tasks.Task UpdatePetAsync (Pet pet);
+
+        /// 
+        /// Update an existing pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> UpdatePetAsyncWithHttpInfo (Pet pet);
+        /// 
+        /// Updates a pet in the store with form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// Task of void
+        System.Threading.Tasks.Task UpdatePetWithFormAsync (long? petId, string name = null, string status = null);
+
+        /// 
+        /// Updates a pet in the store with form data
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> UpdatePetWithFormAsyncWithHttpInfo (long? petId, string name = null, string status = null);
+        /// 
+        /// uploads an image
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+
+        /// 
+        /// uploads an image
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// Task of ApiResponse (ApiResponse)
+        System.Threading.Tasks.Task> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task UploadFileWithRequiredFileAsync (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+
+        /// 
+        /// uploads an image (required)
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse (ApiResponse)
+        System.Threading.Tasks.Task> UploadFileWithRequiredFileAsyncWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class PetApi : IPetApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public PetApi(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public PetApi(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        /// Add a new pet to the store 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// 
+        public void AddPet (Pet pet)
+        {
+             AddPetWithHttpInfo(pet);
+        }
+
+        /// 
+        /// Add a new pet to the store 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// ApiResponse of Object(void)
+        public ApiResponse AddPetWithHttpInfo (Pet pet)
+        {
+            // verify the required parameter 'pet' is set
+            if (pet == null)
+                throw new ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet");
+
+            var localVarPath = "/pet";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "application/xml"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (pet != null && pet.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(pet); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = pet; // byte array
+            }
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddPet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Add a new pet to the store 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of void
+        public async System.Threading.Tasks.Task AddPetAsync (Pet pet)
+        {
+             await AddPetAsyncWithHttpInfo(pet);
+
+        }
+
+        /// 
+        /// Add a new pet to the store 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> AddPetAsyncWithHttpInfo (Pet pet)
+        {
+            // verify the required parameter 'pet' is set
+            if (pet == null)
+                throw new ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet");
+
+            var localVarPath = "/pet";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "application/xml"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (pet != null && pet.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(pet); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = pet; // byte array
+            }
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddPet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Deletes a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// 
+        public void DeletePet (long? petId, string apiKey = null)
+        {
+             DeletePetWithHttpInfo(petId, apiKey);
+        }
+
+        /// 
+        /// Deletes a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// ApiResponse of Object(void)
+        public ApiResponse DeletePetWithHttpInfo (long? petId, string apiKey = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->DeletePet");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (apiKey != null) localVarHeaderParams.Add("api_key", this.Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Deletes a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// Task of void
+        public async System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey = null)
+        {
+             await DeletePetAsyncWithHttpInfo(petId, apiKey);
+
+        }
+
+        /// 
+        /// Deletes a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet id to delete
+        ///  (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->DeletePet");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (apiKey != null) localVarHeaderParams.Add("api_key", this.Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// List<Pet>
+        public List FindPetsByStatus (List status)
+        {
+             ApiResponse> localVarResponse = FindPetsByStatusWithHttpInfo(status);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// ApiResponse of List<Pet>
+        public ApiResponse< List > FindPetsByStatusWithHttpInfo (List status)
+        {
+            // verify the required parameter 'status' is set
+            if (status == null)
+                throw new ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus");
+
+            var localVarPath = "/pet/findByStatus";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (status != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "status", status)); // query parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List)));
+        }
+
+        /// 
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// Task of List<Pet>
+        public async System.Threading.Tasks.Task> FindPetsByStatusAsync (List status)
+        {
+             ApiResponse> localVarResponse = await FindPetsByStatusAsyncWithHttpInfo(status);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// 
+        /// Thrown when fails to make API call
+        /// Status values that need to be considered for filter
+        /// Task of ApiResponse (List<Pet>)
+        public async System.Threading.Tasks.Task>> FindPetsByStatusAsyncWithHttpInfo (List status)
+        {
+            // verify the required parameter 'status' is set
+            if (status == null)
+                throw new ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus");
+
+            var localVarPath = "/pet/findByStatus";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (status != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "status", status)); // query parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List)));
+        }
+
+        /// 
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// List<Pet>
+        public List FindPetsByTags (List tags)
+        {
+             ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// ApiResponse of List<Pet>
+        public ApiResponse< List > FindPetsByTagsWithHttpInfo (List tags)
+        {
+            // verify the required parameter 'tags' is set
+            if (tags == null)
+                throw new ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags");
+
+            var localVarPath = "/pet/findByTags";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (tags != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "tags", tags)); // query parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List)));
+        }
+
+        /// 
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// Task of List<Pet>
+        public async System.Threading.Tasks.Task> FindPetsByTagsAsync (List tags)
+        {
+             ApiResponse> localVarResponse = await FindPetsByTagsAsyncWithHttpInfo(tags);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// 
+        /// Thrown when fails to make API call
+        /// Tags to filter by
+        /// Task of ApiResponse (List<Pet>)
+        public async System.Threading.Tasks.Task>> FindPetsByTagsAsyncWithHttpInfo (List tags)
+        {
+            // verify the required parameter 'tags' is set
+            if (tags == null)
+                throw new ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags");
+
+            var localVarPath = "/pet/findByTags";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (tags != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "tags", tags)); // query parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List)));
+        }
+
+        /// 
+        /// Find pet by ID Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Pet
+        public Pet GetPetById (long? petId)
+        {
+             ApiResponse localVarResponse = GetPetByIdWithHttpInfo(petId);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Find pet by ID Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// ApiResponse of Pet
+        public ApiResponse< Pet > GetPetByIdWithHttpInfo (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetById");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+
+            // authentication (api_key) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = this.Configuration.GetApiKeyWithPrefix("api_key");
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPetById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Pet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
+        }
+
+        /// 
+        /// Find pet by ID Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Task of Pet
+        public async System.Threading.Tasks.Task GetPetByIdAsync (long? petId)
+        {
+             ApiResponse localVarResponse = await GetPetByIdAsyncWithHttpInfo(petId);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Find pet by ID Returns a single pet
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to return
+        /// Task of ApiResponse (Pet)
+        public async System.Threading.Tasks.Task> GetPetByIdAsyncWithHttpInfo (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetById");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+
+            // authentication (api_key) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = this.Configuration.GetApiKeyWithPrefix("api_key");
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPetById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Pet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
+        }
+
+        /// 
+        /// Update an existing pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// 
+        public void UpdatePet (Pet pet)
+        {
+             UpdatePetWithHttpInfo(pet);
+        }
+
+        /// 
+        /// Update an existing pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// ApiResponse of Object(void)
+        public ApiResponse UpdatePetWithHttpInfo (Pet pet)
+        {
+            // verify the required parameter 'pet' is set
+            if (pet == null)
+                throw new ApiException(400, "Missing required parameter 'pet' when calling PetApi->UpdatePet");
+
+            var localVarPath = "/pet";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "application/xml"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (pet != null && pet.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(pet); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = pet; // byte array
+            }
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Update an existing pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of void
+        public async System.Threading.Tasks.Task UpdatePetAsync (Pet pet)
+        {
+             await UpdatePetAsyncWithHttpInfo(pet);
+
+        }
+
+        /// 
+        /// Update an existing pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// Pet object that needs to be added to the store
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> UpdatePetAsyncWithHttpInfo (Pet pet)
+        {
+            // verify the required parameter 'pet' is set
+            if (pet == null)
+                throw new ApiException(400, "Missing required parameter 'pet' when calling PetApi->UpdatePet");
+
+            var localVarPath = "/pet";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "application/xml"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (pet != null && pet.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(pet); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = pet; // byte array
+            }
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Updates a pet in the store with form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// 
+        public void UpdatePetWithForm (long? petId, string name = null, string status = null)
+        {
+             UpdatePetWithFormWithHttpInfo(petId, name, status);
+        }
+
+        /// 
+        /// Updates a pet in the store with form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// ApiResponse of Object(void)
+        public ApiResponse UpdatePetWithFormWithHttpInfo (long? petId, string name = null, string status = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (name != null) localVarFormParams.Add("name", this.Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", this.Configuration.ApiClient.ParameterToString(status)); // form parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePetWithForm", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Updates a pet in the store with form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// Task of void
+        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (long? petId, string name = null, string status = null)
+        {
+             await UpdatePetWithFormAsyncWithHttpInfo(petId, name, status);
+
+        }
+
+        /// 
+        /// Updates a pet in the store with form data 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be updated
+        /// Updated name of the pet (optional)
+        /// Updated status of the pet (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> UpdatePetWithFormAsyncWithHttpInfo (long? petId, string name = null, string status = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm");
+
+            var localVarPath = "/pet/{petId}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (name != null) localVarFormParams.Add("name", this.Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", this.Configuration.ApiClient.ParameterToString(status)); // form parameter
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePetWithForm", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// uploads an image 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// ApiResponse
+        public ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+        {
+             ApiResponse localVarResponse = UploadFileWithHttpInfo(petId, additionalMetadata, file);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// uploads an image 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// ApiResponse of ApiResponse
+        public ApiResponse< ApiResponse > UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFile");
+
+            var localVarPath = "/pet/{petId}/uploadImage";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", this.Configuration.ApiClient.ParameterToFile("file", file));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
+        /// 
+        /// uploads an image 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+        {
+             ApiResponse localVarResponse = await UploadFileAsyncWithHttpInfo(petId, additionalMetadata, file);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// uploads an image 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// Additional data to pass to server (optional)
+        /// file to upload (optional)
+        /// Task of ApiResponse (ApiResponse)
+        public async System.Threading.Tasks.Task> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFile");
+
+            var localVarPath = "/pet/{petId}/uploadImage";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", this.Configuration.ApiClient.ParameterToFile("file", file));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse
+        public ApiResponse UploadFileWithRequiredFile (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+             ApiResponse localVarResponse = UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// ApiResponse of ApiResponse
+        public ApiResponse< ApiResponse > UploadFileWithRequiredFileWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFileWithRequiredFile");
+            // verify the required parameter 'requiredFile' is set
+            if (requiredFile == null)
+                throw new ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile");
+
+            var localVarPath = "/fake/{petId}/uploadImageWithRequiredFile";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (requiredFile != null) localVarFileParams.Add("requiredFile", this.Configuration.ApiClient.ParameterToFile("requiredFile", requiredFile));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFileWithRequiredFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task UploadFileWithRequiredFileAsync (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+             ApiResponse localVarResponse = await UploadFileWithRequiredFileAsyncWithHttpInfo(petId, requiredFile, additionalMetadata);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// uploads an image (required) 
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet to update
+        /// file to upload
+        /// Additional data to pass to server (optional)
+        /// Task of ApiResponse (ApiResponse)
+        public async System.Threading.Tasks.Task> UploadFileWithRequiredFileAsyncWithHttpInfo (long? petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFileWithRequiredFile");
+            // verify the required parameter 'requiredFile' is set
+            if (requiredFile == null)
+                throw new ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile");
+
+            var localVarPath = "/fake/{petId}/uploadImageWithRequiredFile";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (petId != null) localVarPathParams.Add("petId", this.Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", this.Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (requiredFile != null) localVarFileParams.Add("requiredFile", this.Configuration.ApiClient.ParameterToFile("requiredFile", requiredFile));
+
+            // authentication (petstore_auth) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFileWithRequiredFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
new file mode 100644
index 000000000000..716f7a7797f9
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -0,0 +1,840 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IStoreApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// Delete purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// 
+        void DeleteOrder (string orderId);
+
+        /// 
+        /// Delete purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// ApiResponse of Object(void)
+        ApiResponse DeleteOrderWithHttpInfo (string orderId);
+        /// 
+        /// Returns pet inventories by status
+        /// 
+        /// 
+        /// Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Dictionary<string, int?>
+        Dictionary GetInventory ();
+
+        /// 
+        /// Returns pet inventories by status
+        /// 
+        /// 
+        /// Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// ApiResponse of Dictionary<string, int?>
+        ApiResponse> GetInventoryWithHttpInfo ();
+        /// 
+        /// Find purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Order
+        Order GetOrderById (long? orderId);
+
+        /// 
+        /// Find purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// ApiResponse of Order
+        ApiResponse GetOrderByIdWithHttpInfo (long? orderId);
+        /// 
+        /// Place an order for a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Order
+        Order PlaceOrder (Order order);
+
+        /// 
+        /// Place an order for a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// ApiResponse of Order
+        ApiResponse PlaceOrderWithHttpInfo (Order order);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// Delete purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// Task of void
+        System.Threading.Tasks.Task DeleteOrderAsync (string orderId);
+
+        /// 
+        /// Delete purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> DeleteOrderAsyncWithHttpInfo (string orderId);
+        /// 
+        /// Returns pet inventories by status
+        /// 
+        /// 
+        /// Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of Dictionary<string, int?>
+        System.Threading.Tasks.Task> GetInventoryAsync ();
+
+        /// 
+        /// Returns pet inventories by status
+        /// 
+        /// 
+        /// Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of ApiResponse (Dictionary<string, int?>)
+        System.Threading.Tasks.Task>> GetInventoryAsyncWithHttpInfo ();
+        /// 
+        /// Find purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Task of Order
+        System.Threading.Tasks.Task GetOrderByIdAsync (long? orderId);
+
+        /// 
+        /// Find purchase order by ID
+        /// 
+        /// 
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Task of ApiResponse (Order)
+        System.Threading.Tasks.Task> GetOrderByIdAsyncWithHttpInfo (long? orderId);
+        /// 
+        /// Place an order for a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Task of Order
+        System.Threading.Tasks.Task PlaceOrderAsync (Order order);
+
+        /// 
+        /// Place an order for a pet
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Task of ApiResponse (Order)
+        System.Threading.Tasks.Task> PlaceOrderAsyncWithHttpInfo (Order order);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class StoreApi : IStoreApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public StoreApi(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public StoreApi(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// 
+        public void DeleteOrder (string orderId)
+        {
+             DeleteOrderWithHttpInfo(orderId);
+        }
+
+        /// 
+        /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// ApiResponse of Object(void)
+        public ApiResponse DeleteOrderWithHttpInfo (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder");
+
+            var localVarPath = "/store/order/{order_id}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("order_id", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// Task of void
+        public async System.Threading.Tasks.Task DeleteOrderAsync (string orderId)
+        {
+             await DeleteOrderAsyncWithHttpInfo(orderId);
+
+        }
+
+        /// 
+        /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of the order that needs to be deleted
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> DeleteOrderAsyncWithHttpInfo (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder");
+
+            var localVarPath = "/store/order/{order_id}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("order_id", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Dictionary<string, int?>
+        public Dictionary GetInventory ()
+        {
+             ApiResponse> localVarResponse = GetInventoryWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// ApiResponse of Dictionary<string, int?>
+        public ApiResponse< Dictionary > GetInventoryWithHttpInfo ()
+        {
+
+            var localVarPath = "/store/inventory";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (api_key) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = this.Configuration.GetApiKeyWithPrefix("api_key");
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInventory", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Dictionary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary)));
+        }
+
+        /// 
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of Dictionary<string, int?>
+        public async System.Threading.Tasks.Task> GetInventoryAsync ()
+        {
+             ApiResponse> localVarResponse = await GetInventoryAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of ApiResponse (Dictionary<string, int?>)
+        public async System.Threading.Tasks.Task>> GetInventoryAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "/store/inventory";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (api_key) required
+            if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = this.Configuration.GetApiKeyWithPrefix("api_key");
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInventory", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Dictionary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary)));
+        }
+
+        /// 
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Order
+        public Order GetOrderById (long? orderId)
+        {
+             ApiResponse localVarResponse = GetOrderByIdWithHttpInfo(orderId);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// ApiResponse of Order
+        public ApiResponse< Order > GetOrderByIdWithHttpInfo (long? orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->GetOrderById");
+
+            var localVarPath = "/store/order/{order_id}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("order_id", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrderById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+        }
+
+        /// 
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Task of Order
+        public async System.Threading.Tasks.Task GetOrderByIdAsync (long? orderId)
+        {
+             ApiResponse localVarResponse = await GetOrderByIdAsyncWithHttpInfo(orderId);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// 
+        /// Thrown when fails to make API call
+        /// ID of pet that needs to be fetched
+        /// Task of ApiResponse (Order)
+        public async System.Threading.Tasks.Task> GetOrderByIdAsyncWithHttpInfo (long? orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->GetOrderById");
+
+            var localVarPath = "/store/order/{order_id}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("order_id", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrderById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+        }
+
+        /// 
+        /// Place an order for a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Order
+        public Order PlaceOrder (Order order)
+        {
+             ApiResponse localVarResponse = PlaceOrderWithHttpInfo(order);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Place an order for a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// ApiResponse of Order
+        public ApiResponse< Order > PlaceOrderWithHttpInfo (Order order)
+        {
+            // verify the required parameter 'order' is set
+            if (order == null)
+                throw new ApiException(400, "Missing required parameter 'order' when calling StoreApi->PlaceOrder");
+
+            var localVarPath = "/store/order";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (order != null && order.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(order); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = order; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PlaceOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+        }
+
+        /// 
+        /// Place an order for a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Task of Order
+        public async System.Threading.Tasks.Task PlaceOrderAsync (Order order)
+        {
+             ApiResponse localVarResponse = await PlaceOrderAsyncWithHttpInfo(order);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Place an order for a pet 
+        /// 
+        /// Thrown when fails to make API call
+        /// order placed for purchasing the pet
+        /// Task of ApiResponse (Order)
+        public async System.Threading.Tasks.Task> PlaceOrderAsyncWithHttpInfo (Order order)
+        {
+            // verify the required parameter 'order' is set
+            if (order == null)
+                throw new ApiException(400, "Missing required parameter 'order' when calling StoreApi->PlaceOrder");
+
+            var localVarPath = "/store/order";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (order != null && order.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(order); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = order; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PlaceOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
new file mode 100644
index 000000000000..213cda005595
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
@@ -0,0 +1,1590 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public interface IUserApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// 
+        /// Create user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// 
+        void CreateUser (User user);
+
+        /// 
+        /// Create user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// ApiResponse of Object(void)
+        ApiResponse CreateUserWithHttpInfo (User user);
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// 
+        void CreateUsersWithArrayInput (List user);
+
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// ApiResponse of Object(void)
+        ApiResponse CreateUsersWithArrayInputWithHttpInfo (List user);
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// 
+        void CreateUsersWithListInput (List user);
+
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// ApiResponse of Object(void)
+        ApiResponse CreateUsersWithListInputWithHttpInfo (List user);
+        /// 
+        /// Delete user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// 
+        void DeleteUser (string username);
+
+        /// 
+        /// Delete user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// ApiResponse of Object(void)
+        ApiResponse DeleteUserWithHttpInfo (string username);
+        /// 
+        /// Get user by user name
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// User
+        User GetUserByName (string username);
+
+        /// 
+        /// Get user by user name
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// ApiResponse of User
+        ApiResponse GetUserByNameWithHttpInfo (string username);
+        /// 
+        /// Logs user into the system
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// string
+        string LoginUser (string username, string password);
+
+        /// 
+        /// Logs user into the system
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// ApiResponse of string
+        ApiResponse LoginUserWithHttpInfo (string username, string password);
+        /// 
+        /// Logs out current logged in user session
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        void LogoutUser ();
+
+        /// 
+        /// Logs out current logged in user session
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// ApiResponse of Object(void)
+        ApiResponse LogoutUserWithHttpInfo ();
+        /// 
+        /// Updated user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// 
+        void UpdateUser (string username, User user);
+
+        /// 
+        /// Updated user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// ApiResponse of Object(void)
+        ApiResponse UpdateUserWithHttpInfo (string username, User user);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// 
+        /// Create user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// Task of void
+        System.Threading.Tasks.Task CreateUserAsync (User user);
+
+        /// 
+        /// Create user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> CreateUserAsyncWithHttpInfo (User user);
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of void
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List user);
+
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> CreateUsersWithArrayInputAsyncWithHttpInfo (List user);
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of void
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List user);
+
+        /// 
+        /// Creates list of users with given input array
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> CreateUsersWithListInputAsyncWithHttpInfo (List user);
+        /// 
+        /// Delete user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// Task of void
+        System.Threading.Tasks.Task DeleteUserAsync (string username);
+
+        /// 
+        /// Delete user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> DeleteUserAsyncWithHttpInfo (string username);
+        /// 
+        /// Get user by user name
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// Task of User
+        System.Threading.Tasks.Task GetUserByNameAsync (string username);
+
+        /// 
+        /// Get user by user name
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// Task of ApiResponse (User)
+        System.Threading.Tasks.Task> GetUserByNameAsyncWithHttpInfo (string username);
+        /// 
+        /// Logs user into the system
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// Task of string
+        System.Threading.Tasks.Task LoginUserAsync (string username, string password);
+
+        /// 
+        /// Logs user into the system
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// Task of ApiResponse (string)
+        System.Threading.Tasks.Task> LoginUserAsyncWithHttpInfo (string username, string password);
+        /// 
+        /// Logs out current logged in user session
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of void
+        System.Threading.Tasks.Task LogoutUserAsync ();
+
+        /// 
+        /// Logs out current logged in user session
+        /// 
+        /// 
+        /// 
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> LogoutUserAsyncWithHttpInfo ();
+        /// 
+        /// Updated user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// Task of void
+        System.Threading.Tasks.Task UpdateUserAsync (string username, User user);
+
+        /// 
+        /// Updated user
+        /// 
+        /// 
+        /// This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// Task of ApiResponse
+        System.Threading.Tasks.Task> UpdateUserAsyncWithHttpInfo (string username, User user);
+        #endregion Asynchronous Operations
+    }
+
+    /// 
+    /// Represents a collection of functions to interact with the API endpoints
+    /// 
+    public partial class UserApi : IUserApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// 
+        public UserApi(String basePath)
+        {
+            this.Configuration = new Org.OpenAPITools.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// using Configuration object
+        /// 
+        /// An instance of Configuration
+        /// 
+        public UserApi(Org.OpenAPITools.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// 
+        /// Sets the base path of the API client.
+        /// 
+        /// The base path
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        public Org.OpenAPITools.Client.Configuration Configuration {get; set;}
+
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Dictionary of HTTP header
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary DefaultHeader()
+        {
+            return new ReadOnlyDictionary(this.Configuration.DefaultHeader);
+        }
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// 
+        /// Create user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// 
+        public void CreateUser (User user)
+        {
+             CreateUserWithHttpInfo(user);
+        }
+
+        /// 
+        /// Create user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// ApiResponse of Object(void)
+        public ApiResponse CreateUserWithHttpInfo (User user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUser");
+
+            var localVarPath = "/user";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Create user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// Task of void
+        public async System.Threading.Tasks.Task CreateUserAsync (User user)
+        {
+             await CreateUserAsyncWithHttpInfo(user);
+
+        }
+
+        /// 
+        /// Create user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// Created user object
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> CreateUserAsyncWithHttpInfo (User user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUser");
+
+            var localVarPath = "/user";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// 
+        public void CreateUsersWithArrayInput (List user)
+        {
+             CreateUsersWithArrayInputWithHttpInfo(user);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// ApiResponse of Object(void)
+        public ApiResponse CreateUsersWithArrayInputWithHttpInfo (List user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithArrayInput");
+
+            var localVarPath = "/user/createWithArray";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithArrayInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of void
+        public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List user)
+        {
+             await CreateUsersWithArrayInputAsyncWithHttpInfo(user);
+
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> CreateUsersWithArrayInputAsyncWithHttpInfo (List user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithArrayInput");
+
+            var localVarPath = "/user/createWithArray";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithArrayInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// 
+        public void CreateUsersWithListInput (List user)
+        {
+             CreateUsersWithListInputWithHttpInfo(user);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// ApiResponse of Object(void)
+        public ApiResponse CreateUsersWithListInputWithHttpInfo (List user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithListInput");
+
+            var localVarPath = "/user/createWithList";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithListInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of void
+        public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List user)
+        {
+             await CreateUsersWithListInputAsyncWithHttpInfo(user);
+
+        }
+
+        /// 
+        /// Creates list of users with given input array 
+        /// 
+        /// Thrown when fails to make API call
+        /// List of user object
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> CreateUsersWithListInputAsyncWithHttpInfo (List user)
+        {
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithListInput");
+
+            var localVarPath = "/user/createWithList";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithListInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Delete user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// 
+        public void DeleteUser (string username)
+        {
+             DeleteUserWithHttpInfo(username);
+        }
+
+        /// 
+        /// Delete user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// ApiResponse of Object(void)
+        public ApiResponse DeleteUserWithHttpInfo (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Delete user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// Task of void
+        public async System.Threading.Tasks.Task DeleteUserAsync (string username)
+        {
+             await DeleteUserAsyncWithHttpInfo(username);
+
+        }
+
+        /// 
+        /// Delete user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be deleted
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> DeleteUserAsyncWithHttpInfo (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Get user by user name 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// User
+        public User GetUserByName (string username)
+        {
+             ApiResponse localVarResponse = GetUserByNameWithHttpInfo(username);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Get user by user name 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// ApiResponse of User
+        public ApiResponse< User > GetUserByNameWithHttpInfo (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserByName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (User) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
+        }
+
+        /// 
+        /// Get user by user name 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// Task of User
+        public async System.Threading.Tasks.Task GetUserByNameAsync (string username)
+        {
+             ApiResponse localVarResponse = await GetUserByNameAsyncWithHttpInfo(username);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Get user by user name 
+        /// 
+        /// Thrown when fails to make API call
+        /// The name that needs to be fetched. Use user1 for testing.
+        /// Task of ApiResponse (User)
+        public async System.Threading.Tasks.Task> GetUserByNameAsyncWithHttpInfo (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserByName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (User) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
+        }
+
+        /// 
+        /// Logs user into the system 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// string
+        public string LoginUser (string username, string password)
+        {
+             ApiResponse localVarResponse = LoginUserWithHttpInfo(username, password);
+             return localVarResponse.Data;
+        }
+
+        /// 
+        /// Logs user into the system 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// ApiResponse of string
+        public ApiResponse< string > LoginUserWithHttpInfo (string username, string password)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser");
+            // verify the required parameter 'password' is set
+            if (password == null)
+                throw new ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser");
+
+            var localVarPath = "/user/login";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "username", username)); // query parameter
+            if (password != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "password", password)); // query parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LoginUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// 
+        /// Logs user into the system 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// Task of string
+        public async System.Threading.Tasks.Task LoginUserAsync (string username, string password)
+        {
+             ApiResponse localVarResponse = await LoginUserAsyncWithHttpInfo(username, password);
+             return localVarResponse.Data;
+
+        }
+
+        /// 
+        /// Logs user into the system 
+        /// 
+        /// Thrown when fails to make API call
+        /// The user name for login
+        /// The password for login in clear text
+        /// Task of ApiResponse (string)
+        public async System.Threading.Tasks.Task> LoginUserAsyncWithHttpInfo (string username, string password)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser");
+            // verify the required parameter 'password' is set
+            if (password == null)
+                throw new ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser");
+
+            var localVarPath = "/user/login";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/xml",
+                "application/json"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "username", username)); // query parameter
+            if (password != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "password", password)); // query parameter
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LoginUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// 
+        /// Logs out current logged in user session 
+        /// 
+        /// Thrown when fails to make API call
+        /// 
+        public void LogoutUser ()
+        {
+             LogoutUserWithHttpInfo();
+        }
+
+        /// 
+        /// Logs out current logged in user session 
+        /// 
+        /// Thrown when fails to make API call
+        /// ApiResponse of Object(void)
+        public ApiResponse LogoutUserWithHttpInfo ()
+        {
+
+            var localVarPath = "/user/logout";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LogoutUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Logs out current logged in user session 
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of void
+        public async System.Threading.Tasks.Task LogoutUserAsync ()
+        {
+             await LogoutUserAsyncWithHttpInfo();
+
+        }
+
+        /// 
+        /// Logs out current logged in user session 
+        /// 
+        /// Thrown when fails to make API call
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> LogoutUserAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "/user/logout";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LogoutUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Updated user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// 
+        public void UpdateUser (string username, User user)
+        {
+             UpdateUserWithHttpInfo(username, user);
+        }
+
+        /// 
+        /// Updated user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// ApiResponse of Object(void)
+        public ApiResponse UpdateUserWithHttpInfo (string username, User user)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser");
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->UpdateUser");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        /// 
+        /// Updated user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// Task of void
+        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User user)
+        {
+             await UpdateUserAsyncWithHttpInfo(username, user);
+
+        }
+
+        /// 
+        /// Updated user This can only be done by the logged in user.
+        /// 
+        /// Thrown when fails to make API call
+        /// name that need to be deleted
+        /// Updated user object
+        /// Task of ApiResponse
+        public async System.Threading.Tasks.Task> UpdateUserAsyncWithHttpInfo (string username, User user)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser");
+            // verify the required parameter 'user' is set
+            if (user == null)
+                throw new ApiException(400, "Missing required parameter 'user' when calling UserApi->UpdateUser");
+
+            var localVarPath = "/user/{username}";
+            var localVarPathParams = new Dictionary();
+            var localVarQueryParams = new List>();
+            var localVarHeaderParams = new Dictionary(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary();
+            var localVarFileParams = new Dictionary();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (username != null) localVarPathParams.Add("username", this.Configuration.ApiClient.ParameterToString(username)); // path parameter
+            if (user != null && user.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(user); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = user; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
new file mode 100644
index 000000000000..030d56543c4b
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -0,0 +1,530 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Web;
+using System.Linq;
+using System.Net;
+using System.Text;
+using Newtonsoft.Json;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// API client is mainly responsible for making the HTTP call to the API backend.
+    /// 
+    public partial class ApiClient
+    {
+        private JsonSerializerSettings serializerSettings = new JsonSerializerSettings
+        {
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
+        };
+
+        /// 
+        /// Allows for extending request processing for  generated code.
+        /// 
+        /// The RestSharp request object
+        partial void InterceptRequest(IRestRequest request);
+
+        /// 
+        /// Allows for extending response processing for  generated code.
+        /// 
+        /// The RestSharp request object
+        /// The RestSharp response object
+        partial void InterceptResponse(IRestRequest request, IRestResponse response);
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// with default configuration.
+        /// 
+        public ApiClient()
+        {
+            Configuration = Org.OpenAPITools.Client.Configuration.Default;
+            RestClient = new RestClient("http://petstore.swagger.io:80/v2");
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// with default base path (http://petstore.swagger.io:80/v2).
+        /// 
+        /// An instance of Configuration.
+        public ApiClient(Configuration config)
+        {
+            Configuration = config ?? Org.OpenAPITools.Client.Configuration.Default;
+
+            RestClient = new RestClient(Configuration.BasePath);
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// with default configuration.
+        /// 
+        /// The base path.
+        public ApiClient(String basePath = "http://petstore.swagger.io:80/v2")
+        {
+           if (String.IsNullOrEmpty(basePath))
+                throw new ArgumentException("basePath cannot be empty");
+
+            RestClient = new RestClient(basePath);
+            Configuration = Client.Configuration.Default;
+        }
+
+        /// 
+        /// Gets or sets the default API client for making HTTP calls.
+        /// 
+        /// The default API client.
+        [Obsolete("ApiClient.Default is deprecated, please use 'Configuration.Default.ApiClient' instead.")]
+        public static ApiClient Default;
+
+        /// 
+        /// Gets or sets an instance of the IReadableConfiguration.
+        /// 
+        /// An instance of the IReadableConfiguration.
+        /// 
+        ///  helps us to avoid modifying possibly global
+        /// configuration values from within a given client. It does not guarantee thread-safety
+        /// of the  instance in any way.
+        /// 
+        public IReadableConfiguration Configuration { get; set; }
+
+        /// 
+        /// Gets or sets the RestClient.
+        /// 
+        /// An instance of the RestClient
+        public RestClient RestClient { get; set; }
+
+        // Creates and sets up a RestRequest prior to a call.
+        private RestRequest PrepareRequest(
+            String path, RestSharp.Method method, List> queryParams, Object postBody,
+            Dictionary headerParams, Dictionary formParams,
+            Dictionary fileParams, Dictionary pathParams,
+            String contentType)
+        {
+            var request = new RestRequest(path, method);
+
+            // add path parameter, if any
+            foreach(var param in pathParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
+
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
+
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
+
+            // add file parameter, if any
+            foreach(var param in fileParams)
+            {
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+            }
+
+            if (postBody != null) // http body (model or byte[]) parameter
+            {
+                request.AddParameter(contentType, postBody, ParameterType.RequestBody);
+            }
+
+            return request;
+        }
+
+        /// 
+        /// Makes the HTTP request (Sync).
+        /// 
+        /// URL path.
+        /// HTTP method.
+        /// Query parameters.
+        /// HTTP body (POST request).
+        /// Header parameters.
+        /// Form parameters.
+        /// File parameters.
+        /// Path parameters.
+        /// Content Type of the request
+        /// Object
+        public Object CallApi(
+            String path, RestSharp.Method method, List> queryParams, Object postBody,
+            Dictionary headerParams, Dictionary formParams,
+            Dictionary fileParams, Dictionary pathParams,
+            String contentType)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
+
+            // set timeout
+            
+            RestClient.Timeout = Configuration.Timeout;
+            // set user agent
+            RestClient.UserAgent = Configuration.UserAgent;
+
+            InterceptRequest(request);
+            var response = RestClient.Execute(request);
+            InterceptResponse(request, response);
+
+            return (Object) response;
+        }
+        /// 
+        /// Makes the asynchronous HTTP request.
+        /// 
+        /// URL path.
+        /// HTTP method.
+        /// Query parameters.
+        /// HTTP body (POST request).
+        /// Header parameters.
+        /// Form parameters.
+        /// File parameters.
+        /// Path parameters.
+        /// Content type.
+        /// The Task instance.
+        public async System.Threading.Tasks.Task CallApiAsync(
+            String path, RestSharp.Method method, List> queryParams, Object postBody,
+            Dictionary headerParams, Dictionary formParams,
+            Dictionary fileParams, Dictionary pathParams,
+            String contentType)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
+            InterceptRequest(request);
+            var response = await RestClient.ExecuteTaskAsync(request);
+            InterceptResponse(request, response);
+            return (Object)response;
+        }
+
+        /// 
+        /// Escape string (url-encoded).
+        /// 
+        /// String to be escaped.
+        /// Escaped string.
+        public string EscapeString(string str)
+        {
+            return UrlEncode(str);
+        }
+
+        /// 
+        /// Create FileParameter based on Stream.
+        /// 
+        /// Parameter name.
+        /// Input stream.
+        /// FileParameter.
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, ReadAsBytes(stream), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, ReadAsBytes(stream), "no_file_name_provided");
+        }
+
+        /// 
+        /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime.
+        /// If parameter is a list, join the list with ",".
+        /// Otherwise just return the string.
+        /// 
+        /// The parameter (header, path, query, form).
+        /// Formatted string.
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
+            else if (obj is DateTimeOffset)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat);
+            else if (obj is IList)
+            {
+                var flattenedString = new StringBuilder();
+                foreach (var param in (IList)obj)
+                {
+                    if (flattenedString.Length > 0)
+                        flattenedString.Append(",");
+                    flattenedString.Append(param);
+                }
+                return flattenedString.ToString();
+            }
+            else
+                return Convert.ToString (obj);
+        }
+
+        /// 
+        /// Deserialize the JSON string into a proper object.
+        /// 
+        /// The HTTP response.
+        /// Object type.
+        /// Object representation of the JSON string.
+        public object Deserialize(IRestResponse response, Type type)
+        {
+            IList headers = response.Headers;
+            if (type == typeof(byte[])) // return byte array
+            {
+                return response.RawBytes;
+            }
+
+            // TODO: ? if (type.IsAssignableFrom(typeof(Stream)))
+            if (type == typeof(Stream))
+            {
+                if (headers != null)
+                {
+                    var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                        ? Path.GetTempPath()
+                        : Configuration.TempFolderPath;
+                    var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
+                    foreach (var header in headers)
+                    {
+                        var match = regex.Match(header.ToString());
+                        if (match.Success)
+                        {
+                            string fileName = filePath + SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
+                            File.WriteAllBytes(fileName, response.RawBytes);
+                            return new FileStream(fileName, FileMode.Open);
+                        }
+                    }
+                }
+                var stream = new MemoryStream(response.RawBytes);
+                return stream;
+            }
+
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(response.Content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
+
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(response.Content, type);
+            }
+
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(response.Content, type, serializerSettings);
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+
+        /// 
+        /// Serialize an input (model) into JSON string
+        /// 
+        /// Object.
+        /// JSON string.
+        public String Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+
+        /// 
+        ///Check if the given MIME is a JSON MIME.
+        ///JSON MIME examples:
+        ///    application/json
+        ///    application/json; charset=UTF8
+        ///    APPLICATION/JSON
+        ///    application/vnd.company+json
+        /// 
+        /// MIME
+        /// Returns True if MIME type is json.
+        public bool IsJsonMime(String mime)
+        {
+            var jsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
+            return mime != null && (jsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json"));
+        }
+
+        /// 
+        /// Select the Content-Type header's value from the given content-type array:
+        /// if JSON type exists in the given array, use it;
+        /// otherwise use the first one defined in 'consumes'
+        /// 
+        /// The Content-Type array to select from.
+        /// The Content-Type header to use.
+        public String SelectHeaderContentType(String[] contentTypes)
+        {
+            if (contentTypes.Length == 0)
+                return "application/json";
+
+            foreach (var contentType in contentTypes)
+            {
+                if (IsJsonMime(contentType.ToLower()))
+                    return contentType;
+            }
+
+            return contentTypes[0]; // use the first content type specified in 'consumes'
+        }
+
+        /// 
+        /// Select the Accept header's value from the given accepts array:
+        /// if JSON exists in the given array, use it;
+        /// otherwise use all of them (joining into a string)
+        /// 
+        /// The accepts array to select from.
+        /// The Accept header to use.
+        public String SelectHeaderAccept(String[] accepts)
+        {
+            if (accepts.Length == 0)
+                return null;
+
+            if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
+                return "application/json";
+
+            return String.Join(",", accepts);
+        }
+
+        /// 
+        /// Encode string in base64 format.
+        /// 
+        /// String to be encoded.
+        /// Encoded string.
+        public static string Base64Encode(string text)
+        {
+            return System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
+        }
+
+        /// 
+        /// Dynamically cast the object into target type.
+        /// 
+        /// Object to be casted
+        /// Target type
+        /// Casted object
+        public static dynamic ConvertType(dynamic fromObject, Type toObject)
+        {
+            return Convert.ChangeType(fromObject, toObject);
+        }
+
+        /// 
+        /// Convert stream to byte array
+        /// 
+        /// Input stream to be converted
+        /// Byte array
+        public static byte[] ReadAsBytes(Stream inputStream)
+        {
+            byte[] buf = new byte[16*1024];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                int count;
+                while ((count = inputStream.Read(buf, 0, buf.Length)) > 0)
+                {
+                    ms.Write(buf, 0, count);
+                }
+                return ms.ToArray();
+            }
+        }
+
+        /// 
+        /// URL encode a string
+        /// Credit/Ref: https://github.com/restsharp/RestSharp/blob/master/RestSharp/Extensions/StringExtensions.cs#L50
+        /// 
+        /// String to be URL encoded
+        /// Byte array
+        public static string UrlEncode(string input)
+        {
+            const int maxLength = 32766;
+
+            if (input == null)
+            {
+                throw new ArgumentNullException("input");
+            }
+
+            if (input.Length <= maxLength)
+            {
+                return Uri.EscapeDataString(input);
+            }
+
+            StringBuilder sb = new StringBuilder(input.Length * 2);
+            int index = 0;
+
+            while (index < input.Length)
+            {
+                int length = Math.Min(input.Length - index, maxLength);
+                string subString = input.Substring(index, length);
+
+                sb.Append(Uri.EscapeDataString(subString));
+                index += subString.Length;
+            }
+
+            return sb.ToString();
+        }
+
+        /// 
+        /// Sanitize filename by removing the path
+        /// 
+        /// Filename
+        /// Filename
+        public static string SanitizeFilename(string filename)
+        {
+            Match match = Regex.Match(filename, @".*[/\\](.*)$");
+
+            if (match.Success)
+            {
+                return match.Groups[1].Value;
+            }
+            else
+            {
+                return filename;
+            }
+        }
+
+        /// 
+        /// Convert params to key/value pairs. 
+        /// Use collectionFormat to properly format lists and collections.
+        /// 
+        /// Key name.
+        /// Value object.
+        /// A list of KeyValuePairs
+        public IEnumerable> ParameterToKeyValuePairs(string collectionFormat, string name, object value)
+        {
+            var parameters = new List>();
+
+            if (IsCollection(value) && collectionFormat == "multi")
+            {
+                var valueCollection = value as IEnumerable;
+                parameters.AddRange(from object item in valueCollection select new KeyValuePair(name, ParameterToString(item)));
+            }
+            else
+            {
+                parameters.Add(new KeyValuePair(name, ParameterToString(value)));
+            }
+
+            return parameters;
+        }
+
+        /// 
+        /// Check if generic object is a collection.
+        /// 
+        /// 
+        /// True if object is a collection type
+        private static bool IsCollection(object value)
+        {
+            return value is IList || value is ICollection;
+        }
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
new file mode 100644
index 000000000000..875026e65f41
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
@@ -0,0 +1,60 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// API Exception
+    /// 
+    public class ApiException : Exception
+    {
+        /// 
+        /// Gets or sets the error code (HTTP status code)
+        /// 
+        /// The error code (HTTP status code).
+        public int ErrorCode { get; set; }
+
+        /// 
+        /// Gets or sets the error content (body json object)
+        /// 
+        /// The error content (Http response body).
+        public dynamic ErrorContent { get; private set; }
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        public ApiException() {}
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// HTTP status code.
+        /// Error message.
+        public ApiException(int errorCode, string message) : base(message)
+        {
+            this.ErrorCode = errorCode;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// HTTP status code.
+        /// Error message.
+        /// Error content.
+        public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message)
+        {
+            this.ErrorCode = errorCode;
+            this.ErrorContent = errorContent;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
new file mode 100644
index 000000000000..3e395de9dfbb
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
@@ -0,0 +1,54 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// API Response
+    /// 
+    public class ApiResponse
+    {
+        /// 
+        /// Gets or sets the status code (HTTP status code)
+        /// 
+        /// The status code.
+        public int StatusCode { get; private set; }
+
+        /// 
+        /// Gets or sets the HTTP headers
+        /// 
+        /// HTTP headers
+        public IDictionary Headers { get; private set; }
+
+        /// 
+        /// Gets or sets the data (parsed HTTP body)
+        /// 
+        /// The data.
+        public T Data { get; private set; }
+
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// HTTP status code.
+        /// HTTP headers.
+        /// Data (parsed HTTP body)
+        public ApiResponse(int statusCode, IDictionary headers, T data)
+        {
+            this.StatusCode= statusCode;
+            this.Headers = headers;
+            this.Data = data;
+        }
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
new file mode 100644
index 000000000000..d6178f475db6
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
@@ -0,0 +1,452 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Reflection;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// Represents a set of configuration settings
+    /// 
+    public class Configuration : IReadableConfiguration
+    {
+        #region Constants
+
+        /// 
+        /// Version of the package.
+        /// 
+        /// Version of the package.
+        public const string Version = "1.0.0";
+
+        /// 
+        /// Identifier for ISO 8601 DateTime Format
+        /// 
+        /// See https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 for more information.
+        // ReSharper disable once InconsistentNaming
+        public const string ISO8601_DATETIME_FORMAT = "o";
+
+        #endregion Constants
+
+        #region Static Members
+
+        private static readonly object GlobalConfigSync = new { };
+        private static Configuration _globalConfiguration;
+
+        /// 
+        /// Default creation of exceptions for a given method name and response object
+        /// 
+        public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) =>
+        {
+            var status = (int)response.StatusCode;
+            if (status >= 400)
+            {
+                return new ApiException(status,
+                    string.Format("Error calling {0}: {1}", methodName, response.Content),
+                    response.Content);
+            }
+            if (status == 0)
+            {
+                return new ApiException(status,
+                    string.Format("Error calling {0}: {1}", methodName, response.ErrorMessage), response.ErrorMessage);
+            }
+            return null;
+        };
+
+        /// 
+        /// Gets or sets the default Configuration.
+        /// 
+        /// Configuration.
+        public static Configuration Default
+        {
+            get { return _globalConfiguration; }
+            set
+            {
+                lock (GlobalConfigSync)
+                {
+                    _globalConfiguration = value;
+                }
+            }
+        }
+
+        #endregion Static Members
+
+        #region Private Members
+
+        /// 
+        /// Gets or sets the API key based on the authentication name.
+        /// 
+        /// The API key.
+        private IDictionary _apiKey = null;
+
+        /// 
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        /// 
+        /// The prefix of the API key.
+        private IDictionary _apiKeyPrefix = null;
+
+        private string _dateTimeFormat = ISO8601_DATETIME_FORMAT;
+        private string _tempFolderPath = Path.GetTempPath();
+
+        #endregion Private Members
+
+        #region Constructors
+
+        static Configuration()
+        {
+            _globalConfiguration = new GlobalConfiguration();
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// 
+        public Configuration()
+        {
+            UserAgent = "OpenAPI-Generator/1.0.0/csharp";
+            BasePath = "http://petstore.swagger.io:80/v2";
+            DefaultHeader = new ConcurrentDictionary();
+            ApiKey = new ConcurrentDictionary();
+            ApiKeyPrefix = new ConcurrentDictionary();
+
+            // Setting Timeout has side effects (forces ApiClient creation).
+            Timeout = 100000;
+        }
+
+        /// 
+        /// Initializes a new instance of the  class
+        /// 
+        public Configuration(
+            IDictionary defaultHeader,
+            IDictionary apiKey,
+            IDictionary apiKeyPrefix,
+            string basePath = "http://petstore.swagger.io:80/v2") : this()
+        {
+            if (string.IsNullOrWhiteSpace(basePath))
+                throw new ArgumentException("The provided basePath is invalid.", "basePath");
+            if (defaultHeader == null)
+                throw new ArgumentNullException("defaultHeader");
+            if (apiKey == null)
+                throw new ArgumentNullException("apiKey");
+            if (apiKeyPrefix == null)
+                throw new ArgumentNullException("apiKeyPrefix");
+
+            BasePath = basePath;
+
+            foreach (var keyValuePair in defaultHeader)
+            {
+                DefaultHeader.Add(keyValuePair);
+            }
+
+            foreach (var keyValuePair in apiKey)
+            {
+                ApiKey.Add(keyValuePair);
+            }
+
+            foreach (var keyValuePair in apiKeyPrefix)
+            {
+                ApiKeyPrefix.Add(keyValuePair);
+            }
+        }
+
+        /// 
+        /// Initializes a new instance of the  class with different settings
+        /// 
+        /// Api client
+        /// Dictionary of default HTTP header
+        /// Username
+        /// Password
+        /// accessToken
+        /// Dictionary of API key
+        /// Dictionary of API key prefix
+        /// Temp folder path
+        /// DateTime format string
+        /// HTTP connection timeout (in milliseconds)
+        /// HTTP user agent
+        [Obsolete("Use explicit object construction and setting of properties.", true)]
+        public Configuration(
+            // ReSharper disable UnusedParameter.Local
+            ApiClient apiClient = null,
+            IDictionary defaultHeader = null,
+            string username = null,
+            string password = null,
+            string accessToken = null,
+            IDictionary apiKey = null,
+            IDictionary apiKeyPrefix = null,
+            string tempFolderPath = null,
+            string dateTimeFormat = null,
+            int timeout = 100000,
+            string userAgent = "OpenAPI-Generator/1.0.0/csharp"
+            // ReSharper restore UnusedParameter.Local
+            )
+        {
+
+        }
+
+        /// 
+        /// Initializes a new instance of the Configuration class.
+        /// 
+        /// Api client.
+        [Obsolete("This constructor caused unexpected sharing of static data. It is no longer supported.", true)]
+        // ReSharper disable once UnusedParameter.Local
+        public Configuration(ApiClient apiClient)
+        {
+
+        }
+
+        #endregion Constructors
+
+
+        #region Properties
+
+        private ApiClient _apiClient = null;
+        /// 
+        /// Gets an instance of an ApiClient for this configuration
+        /// 
+        public virtual ApiClient ApiClient
+        {
+            get
+            {
+                if (_apiClient == null) _apiClient = CreateApiClient();
+                return _apiClient;
+            }
+        }
+
+        private String _basePath = null;
+        /// 
+        /// Gets or sets the base path for API access.
+        /// 
+        public virtual string BasePath {
+            get { return _basePath; }
+            set {
+                _basePath = value;
+                // pass-through to ApiClient if it's set.
+                if(_apiClient != null) {
+                    _apiClient.RestClient.BaseUrl = new Uri(_basePath);
+                }
+            }
+        }
+
+        /// 
+        /// Gets or sets the default header.
+        /// 
+        public virtual IDictionary DefaultHeader { get; set; }
+
+        /// 
+        /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
+        /// 
+        public virtual int Timeout
+        {
+            
+            get { return ApiClient.RestClient.Timeout; }
+            set { ApiClient.RestClient.Timeout = value; }
+        }
+
+        /// 
+        /// Gets or sets the HTTP user agent.
+        /// 
+        /// Http user agent.
+        public virtual string UserAgent { get; set; }
+
+        /// 
+        /// Gets or sets the username (HTTP basic authentication).
+        /// 
+        /// The username.
+        public virtual string Username { get; set; }
+
+        /// 
+        /// Gets or sets the password (HTTP basic authentication).
+        /// 
+        /// The password.
+        public virtual string Password { get; set; }
+
+        /// 
+        /// Gets the API key with prefix.
+        /// 
+        /// API key identifier (authentication scheme).
+        /// API key with prefix.
+        public string GetApiKeyWithPrefix(string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+
+        /// 
+        /// Gets or sets the access token for OAuth2 authentication.
+        /// 
+        /// The access token.
+        public virtual string AccessToken { get; set; }
+
+        /// 
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// 
+        /// Folder path.
+        public virtual string TempFolderPath
+        {
+            get { return _tempFolderPath; }
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    _tempFolderPath = Path.GetTempPath();
+                    return;
+                }
+
+                // create the directory if it does not exist
+                if (!Directory.Exists(value))
+                {
+                    Directory.CreateDirectory(value);
+                }
+
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar)
+                {
+                    _tempFolderPath = value;
+                }
+                else
+                {
+                    _tempFolderPath = value + Path.DirectorySeparatorChar;
+                }
+            }
+        }
+
+        /// 
+        /// Gets or sets the the date time format used when serializing in the ApiClient
+        /// By default, it's set to ISO 8601 - "o", for others see:
+        /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx
+        /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx
+        /// No validation is done to ensure that the string you're providing is valid
+        /// 
+        /// The DateTimeFormat string
+        public virtual string DateTimeFormat
+        {
+            get { return _dateTimeFormat; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    // Never allow a blank or null string, go back to the default
+                    _dateTimeFormat = ISO8601_DATETIME_FORMAT;
+                    return;
+                }
+
+                // Caution, no validation when you choose date time format other than ISO 8601
+                // Take a look at the above links
+                _dateTimeFormat = value;
+            }
+        }
+
+        /// 
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        /// 
+        /// The prefix of the API key.
+        public virtual IDictionary ApiKeyPrefix
+        {
+            get { return _apiKeyPrefix; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("ApiKeyPrefix collection may not be null.");
+                }
+                _apiKeyPrefix = value;
+            }
+        }
+
+        /// 
+        /// Gets or sets the API key based on the authentication name.
+        /// 
+        /// The API key.
+        public virtual IDictionary ApiKey
+        {
+            get { return _apiKey; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("ApiKey collection may not be null.");
+                }
+                _apiKey = value;
+            }
+        }
+
+        #endregion Properties
+
+        #region Methods
+
+        /// 
+        /// Add default header.
+        /// 
+        /// Header field name.
+        /// Header field value.
+        /// 
+        public void AddDefaultHeader(string key, string value)
+        {
+            DefaultHeader[key] = value;
+        }
+
+        /// 
+        /// Creates a new  based on this  instance.
+        /// 
+        /// 
+        public ApiClient CreateApiClient()
+        {
+            return new ApiClient(BasePath) { Configuration = this };
+        }
+
+
+        /// 
+        /// Returns a string with essential information for debugging.
+        /// 
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK (Org.OpenAPITools) Debug Report:\n";
+            report += "    OS: " + System.Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
+            report += "    Version of the API: 1.0.0\n";
+            report += "    SDK Package Version: 1.0.0\n";
+
+            return report;
+        }
+
+        /// 
+        /// Add Api Key Header.
+        /// 
+        /// Api Key name.
+        /// Api Key value.
+        /// 
+        public void AddApiKey(string key, string value)
+        {
+            ApiKey[key] = value;
+        }
+
+        /// 
+        /// Sets the API key prefix.
+        /// 
+        /// Api Key name.
+        /// Api Key value.
+        public void AddApiKeyPrefix(string key, string value)
+        {
+            ApiKeyPrefix[key] = value;
+        }
+
+        #endregion Methods
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
new file mode 100644
index 000000000000..66c4aa3a1408
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
@@ -0,0 +1,24 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// A delegate to ExceptionFactory method
+    /// 
+    /// Method name
+    /// Response
+    /// Exceptions
+    public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
new file mode 100644
index 000000000000..309e385f25a7
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
@@ -0,0 +1,34 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    ///  provides a compile-time extension point for globally configuring
+    /// API Clients.
+    /// 
+    /// 
+    /// A customized implementation via partial class may reside in another file and may
+    /// be excluded from automatic generation via a .openapi-generator-ignore file.
+    /// 
+    public partial class GlobalConfiguration : Configuration
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
new file mode 100644
index 000000000000..3b4834c409df
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
@@ -0,0 +1,42 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// Represents configuration aspects required to interact with the API endpoints.
+    /// 
+    public interface IApiAccessor
+    {
+        /// 
+        /// Gets or sets the configuration object
+        /// 
+        /// An instance of the Configuration
+        Configuration Configuration {get; set;}
+
+        /// 
+        /// Gets the base path of the API client.
+        /// 
+        /// The base path
+        String GetBasePath();
+        
+        /// 
+        /// Provides a factory method hook for the creation of exceptions.
+        /// 
+        ExceptionFactory ExceptionFactory { get; set; }
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
new file mode 100644
index 000000000000..76a5f5124fdf
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -0,0 +1,94 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// Represents a readable-only configuration contract.
+    /// 
+    public interface IReadableConfiguration
+    {
+        /// 
+        /// Gets the access token.
+        /// 
+        /// Access token.
+        string AccessToken { get; }
+
+        /// 
+        /// Gets the API key.
+        /// 
+        /// API key.
+        IDictionary ApiKey { get; }
+
+        /// 
+        /// Gets the API key prefix.
+        /// 
+        /// API key prefix.
+        IDictionary ApiKeyPrefix { get; }
+
+        /// 
+        /// Gets the base path.
+        /// 
+        /// Base path.
+        string BasePath { get; }
+
+        /// 
+        /// Gets the date time format.
+        /// 
+        /// Date time foramt.
+        string DateTimeFormat { get; }
+
+        /// 
+        /// Gets the default header.
+        /// 
+        /// Default header.
+        IDictionary DefaultHeader { get; }
+
+        /// 
+        /// Gets the temp folder path.
+        /// 
+        /// Temp folder path.
+        string TempFolderPath { get; }
+
+        /// 
+        /// Gets the HTTP connection timeout (in milliseconds)
+        /// 
+        /// HTTP connection timeout.
+        int Timeout { get; }
+
+        /// 
+        /// Gets the user agent.
+        /// 
+        /// User agent.
+        string UserAgent { get; }
+
+        /// 
+        /// Gets the username.
+        /// 
+        /// Username.
+        string Username { get; }
+
+        /// 
+        /// Gets the password.
+        /// 
+        /// Password.
+        string Password { get; }
+
+        /// 
+        /// Gets the API key with prefix.
+        /// 
+        /// API key identifier (authentication scheme).
+        /// API key with prefix.
+        string GetApiKeyWithPrefix(string apiKeyIdentifier);
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
new file mode 100644
index 000000000000..4f5c219d5c6e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
@@ -0,0 +1,30 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using Newtonsoft.Json.Converters;
+
+namespace Org.OpenAPITools.Client
+{
+    /// 
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// 
+    public class OpenAPIDateConverter : IsoDateTimeConverter
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        public OpenAPIDateConverter()
+        {
+            // full-date   = date-fullyear "-" date-month "-" date-mday
+            DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
new file mode 100644
index 000000000000..adafe21ea167
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// AdditionalPropertiesClass
+    /// 
+    [DataContract]
+    public partial class AdditionalPropertiesClass :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// mapProperty.
+        /// mapOfMapProperty.
+        public AdditionalPropertiesClass(Dictionary mapProperty = default(Dictionary), Dictionary> mapOfMapProperty = default(Dictionary>))
+        {
+            this.MapProperty = mapProperty;
+            this.MapOfMapProperty = mapOfMapProperty;
+        }
+        
+        /// 
+        /// Gets or Sets MapProperty
+        /// 
+        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        public Dictionary MapProperty { get; set; }
+
+        /// 
+        /// Gets or Sets MapOfMapProperty
+        /// 
+        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        public Dictionary> MapOfMapProperty { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesClass {\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesClass);
+        }
+
+        /// 
+        /// Returns true if AdditionalPropertiesClass instances are equal
+        /// 
+        /// Instance of AdditionalPropertiesClass to be compared
+        /// Boolean
+        public bool Equals(AdditionalPropertiesClass input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MapProperty == input.MapProperty ||
+                    this.MapProperty != null &&
+                    this.MapProperty.SequenceEqual(input.MapProperty)
+                ) && 
+                (
+                    this.MapOfMapProperty == input.MapOfMapProperty ||
+                    this.MapOfMapProperty != null &&
+                    this.MapOfMapProperty.SequenceEqual(input.MapOfMapProperty)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MapProperty != null)
+                    hashCode = hashCode * 59 + this.MapProperty.GetHashCode();
+                if (this.MapOfMapProperty != null)
+                    hashCode = hashCode * 59 + this.MapOfMapProperty.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
new file mode 100644
index 000000000000..d5279dbdb81c
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
@@ -0,0 +1,175 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using JsonSubTypes;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Animal
+    /// 
+    [DataContract]
+    [JsonConverter(typeof(JsonSubtypes), "className")]
+    [JsonSubtypes.KnownSubType(typeof(Dog), "Dog")]
+    [JsonSubtypes.KnownSubType(typeof(Cat), "Cat")]
+    public partial class Animal :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected Animal() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// className (required).
+        /// color (default to "red").
+        public Animal(string className = default(string), string color = "red")
+        {
+            // to ensure "className" is required (not null)
+            if (className == null)
+            {
+                throw new InvalidDataException("className is a required property for Animal and cannot be null");
+            }
+            else
+            {
+                this.ClassName = className;
+            }
+            // use default value if no "color" provided
+            if (color == null)
+            {
+                this.Color = "red";
+            }
+            else
+            {
+                this.Color = color;
+            }
+        }
+        
+        /// 
+        /// Gets or Sets ClassName
+        /// 
+        [DataMember(Name="className", EmitDefaultValue=false)]
+        public string ClassName { get; set; }
+
+        /// 
+        /// Gets or Sets Color
+        /// 
+        [DataMember(Name="color", EmitDefaultValue=false)]
+        public string Color { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Animal {\n");
+            sb.Append("  ClassName: ").Append(ClassName).Append("\n");
+            sb.Append("  Color: ").Append(Color).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Animal);
+        }
+
+        /// 
+        /// Returns true if Animal instances are equal
+        /// 
+        /// Instance of Animal to be compared
+        /// Boolean
+        public bool Equals(Animal input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ClassName == input.ClassName ||
+                    (this.ClassName != null &&
+                    this.ClassName.Equals(input.ClassName))
+                ) && 
+                (
+                    this.Color == input.Color ||
+                    (this.Color != null &&
+                    this.Color.Equals(input.Color))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ClassName != null)
+                    hashCode = hashCode * 59 + this.ClassName.GetHashCode();
+                if (this.Color != null)
+                    hashCode = hashCode * 59 + this.Color.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            return this.BaseValidate(validationContext);
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        protected IEnumerable BaseValidate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
new file mode 100644
index 000000000000..e33d6073c8b1
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
@@ -0,0 +1,110 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// AnimalFarm
+    /// 
+    [DataContract]
+    public partial class AnimalFarm : List,  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        public AnimalFarm() : base()
+        {
+        }
+        
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AnimalFarm {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AnimalFarm);
+        }
+
+        /// 
+        /// Returns true if AnimalFarm instances are equal
+        /// 
+        /// Instance of AnimalFarm to be compared
+        /// Boolean
+        public bool Equals(AnimalFarm input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input);
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
new file mode 100644
index 000000000000..da35fa03b6dc
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -0,0 +1,156 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ApiResponse
+    /// 
+    [DataContract]
+    public partial class ApiResponse :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// code.
+        /// type.
+        /// message.
+        public ApiResponse(int? code = default(int?), string type = default(string), string message = default(string))
+        {
+            this.Code = code;
+            this.Type = type;
+            this.Message = message;
+        }
+        
+        /// 
+        /// Gets or Sets Code
+        /// 
+        [DataMember(Name="code", EmitDefaultValue=false)]
+        public int? Code { get; set; }
+
+        /// 
+        /// Gets or Sets Type
+        /// 
+        [DataMember(Name="type", EmitDefaultValue=false)]
+        public string Type { get; set; }
+
+        /// 
+        /// Gets or Sets Message
+        /// 
+        [DataMember(Name="message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ApiResponse {\n");
+            sb.Append("  Code: ").Append(Code).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ApiResponse);
+        }
+
+        /// 
+        /// Returns true if ApiResponse instances are equal
+        /// 
+        /// Instance of ApiResponse to be compared
+        /// Boolean
+        public bool Equals(ApiResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Code == input.Code ||
+                    (this.Code != null &&
+                    this.Code.Equals(input.Code))
+                ) && 
+                (
+                    this.Type == input.Type ||
+                    (this.Type != null &&
+                    this.Type.Equals(input.Type))
+                ) && 
+                (
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Code != null)
+                    hashCode = hashCode * 59 + this.Code.GetHashCode();
+                if (this.Type != null)
+                    hashCode = hashCode * 59 + this.Type.GetHashCode();
+                if (this.Message != null)
+                    hashCode = hashCode * 59 + this.Message.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
new file mode 100644
index 000000000000..eb23cf99943f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ArrayOfArrayOfNumberOnly
+    /// 
+    [DataContract]
+    public partial class ArrayOfArrayOfNumberOnly :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// arrayArrayNumber.
+        public ArrayOfArrayOfNumberOnly(List> arrayArrayNumber = default(List>))
+        {
+            this.ArrayArrayNumber = arrayArrayNumber;
+        }
+        
+        /// 
+        /// Gets or Sets ArrayArrayNumber
+        /// 
+        [DataMember(Name="ArrayArrayNumber", EmitDefaultValue=false)]
+        public List> ArrayArrayNumber { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ArrayOfArrayOfNumberOnly {\n");
+            sb.Append("  ArrayArrayNumber: ").Append(ArrayArrayNumber).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ArrayOfArrayOfNumberOnly);
+        }
+
+        /// 
+        /// Returns true if ArrayOfArrayOfNumberOnly instances are equal
+        /// 
+        /// Instance of ArrayOfArrayOfNumberOnly to be compared
+        /// Boolean
+        public bool Equals(ArrayOfArrayOfNumberOnly input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ArrayArrayNumber == input.ArrayArrayNumber ||
+                    this.ArrayArrayNumber != null &&
+                    this.ArrayArrayNumber.SequenceEqual(input.ArrayArrayNumber)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ArrayArrayNumber != null)
+                    hashCode = hashCode * 59 + this.ArrayArrayNumber.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
new file mode 100644
index 000000000000..a1aac93fc2fa
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ArrayOfNumberOnly
+    /// 
+    [DataContract]
+    public partial class ArrayOfNumberOnly :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// arrayNumber.
+        public ArrayOfNumberOnly(List arrayNumber = default(List))
+        {
+            this.ArrayNumber = arrayNumber;
+        }
+        
+        /// 
+        /// Gets or Sets ArrayNumber
+        /// 
+        [DataMember(Name="ArrayNumber", EmitDefaultValue=false)]
+        public List ArrayNumber { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ArrayOfNumberOnly {\n");
+            sb.Append("  ArrayNumber: ").Append(ArrayNumber).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ArrayOfNumberOnly);
+        }
+
+        /// 
+        /// Returns true if ArrayOfNumberOnly instances are equal
+        /// 
+        /// Instance of ArrayOfNumberOnly to be compared
+        /// Boolean
+        public bool Equals(ArrayOfNumberOnly input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ArrayNumber == input.ArrayNumber ||
+                    this.ArrayNumber != null &&
+                    this.ArrayNumber.SequenceEqual(input.ArrayNumber)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ArrayNumber != null)
+                    hashCode = hashCode * 59 + this.ArrayNumber.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
new file mode 100644
index 000000000000..c99d9289344a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -0,0 +1,156 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ArrayTest
+    /// 
+    [DataContract]
+    public partial class ArrayTest :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// arrayOfString.
+        /// arrayArrayOfInteger.
+        /// arrayArrayOfModel.
+        public ArrayTest(List arrayOfString = default(List), List> arrayArrayOfInteger = default(List>), List> arrayArrayOfModel = default(List>))
+        {
+            this.ArrayOfString = arrayOfString;
+            this.ArrayArrayOfInteger = arrayArrayOfInteger;
+            this.ArrayArrayOfModel = arrayArrayOfModel;
+        }
+        
+        /// 
+        /// Gets or Sets ArrayOfString
+        /// 
+        [DataMember(Name="array_of_string", EmitDefaultValue=false)]
+        public List ArrayOfString { get; set; }
+
+        /// 
+        /// Gets or Sets ArrayArrayOfInteger
+        /// 
+        [DataMember(Name="array_array_of_integer", EmitDefaultValue=false)]
+        public List> ArrayArrayOfInteger { get; set; }
+
+        /// 
+        /// Gets or Sets ArrayArrayOfModel
+        /// 
+        [DataMember(Name="array_array_of_model", EmitDefaultValue=false)]
+        public List> ArrayArrayOfModel { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
+            sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
+            sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ArrayTest);
+        }
+
+        /// 
+        /// Returns true if ArrayTest instances are equal
+        /// 
+        /// Instance of ArrayTest to be compared
+        /// Boolean
+        public bool Equals(ArrayTest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ArrayOfString == input.ArrayOfString ||
+                    this.ArrayOfString != null &&
+                    this.ArrayOfString.SequenceEqual(input.ArrayOfString)
+                ) && 
+                (
+                    this.ArrayArrayOfInteger == input.ArrayArrayOfInteger ||
+                    this.ArrayArrayOfInteger != null &&
+                    this.ArrayArrayOfInteger.SequenceEqual(input.ArrayArrayOfInteger)
+                ) && 
+                (
+                    this.ArrayArrayOfModel == input.ArrayArrayOfModel ||
+                    this.ArrayArrayOfModel != null &&
+                    this.ArrayArrayOfModel.SequenceEqual(input.ArrayArrayOfModel)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ArrayOfString != null)
+                    hashCode = hashCode * 59 + this.ArrayOfString.GetHashCode();
+                if (this.ArrayArrayOfInteger != null)
+                    hashCode = hashCode * 59 + this.ArrayArrayOfInteger.GetHashCode();
+                if (this.ArrayArrayOfModel != null)
+                    hashCode = hashCode * 59 + this.ArrayArrayOfModel.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
new file mode 100644
index 000000000000..eba3bc685996
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -0,0 +1,205 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Capitalization
+    /// 
+    [DataContract]
+    public partial class Capitalization :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// smallCamel.
+        /// capitalCamel.
+        /// smallSnake.
+        /// capitalSnake.
+        /// sCAETHFlowPoints.
+        /// Name of the pet .
+        public Capitalization(string smallCamel = default(string), string capitalCamel = default(string), string smallSnake = default(string), string capitalSnake = default(string), string sCAETHFlowPoints = default(string), string aTTNAME = default(string))
+        {
+            this.SmallCamel = smallCamel;
+            this.CapitalCamel = capitalCamel;
+            this.SmallSnake = smallSnake;
+            this.CapitalSnake = capitalSnake;
+            this.SCAETHFlowPoints = sCAETHFlowPoints;
+            this.ATT_NAME = aTTNAME;
+        }
+        
+        /// 
+        /// Gets or Sets SmallCamel
+        /// 
+        [DataMember(Name="smallCamel", EmitDefaultValue=false)]
+        public string SmallCamel { get; set; }
+
+        /// 
+        /// Gets or Sets CapitalCamel
+        /// 
+        [DataMember(Name="CapitalCamel", EmitDefaultValue=false)]
+        public string CapitalCamel { get; set; }
+
+        /// 
+        /// Gets or Sets SmallSnake
+        /// 
+        [DataMember(Name="small_Snake", EmitDefaultValue=false)]
+        public string SmallSnake { get; set; }
+
+        /// 
+        /// Gets or Sets CapitalSnake
+        /// 
+        [DataMember(Name="Capital_Snake", EmitDefaultValue=false)]
+        public string CapitalSnake { get; set; }
+
+        /// 
+        /// Gets or Sets SCAETHFlowPoints
+        /// 
+        [DataMember(Name="SCA_ETH_Flow_Points", EmitDefaultValue=false)]
+        public string SCAETHFlowPoints { get; set; }
+
+        /// 
+        /// Name of the pet 
+        /// 
+        /// Name of the pet 
+        [DataMember(Name="ATT_NAME", EmitDefaultValue=false)]
+        public string ATT_NAME { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Capitalization {\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
+            sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
+            sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Capitalization);
+        }
+
+        /// 
+        /// Returns true if Capitalization instances are equal
+        /// 
+        /// Instance of Capitalization to be compared
+        /// Boolean
+        public bool Equals(Capitalization input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SmallCamel == input.SmallCamel ||
+                    (this.SmallCamel != null &&
+                    this.SmallCamel.Equals(input.SmallCamel))
+                ) && 
+                (
+                    this.CapitalCamel == input.CapitalCamel ||
+                    (this.CapitalCamel != null &&
+                    this.CapitalCamel.Equals(input.CapitalCamel))
+                ) && 
+                (
+                    this.SmallSnake == input.SmallSnake ||
+                    (this.SmallSnake != null &&
+                    this.SmallSnake.Equals(input.SmallSnake))
+                ) && 
+                (
+                    this.CapitalSnake == input.CapitalSnake ||
+                    (this.CapitalSnake != null &&
+                    this.CapitalSnake.Equals(input.CapitalSnake))
+                ) && 
+                (
+                    this.SCAETHFlowPoints == input.SCAETHFlowPoints ||
+                    (this.SCAETHFlowPoints != null &&
+                    this.SCAETHFlowPoints.Equals(input.SCAETHFlowPoints))
+                ) && 
+                (
+                    this.ATT_NAME == input.ATT_NAME ||
+                    (this.ATT_NAME != null &&
+                    this.ATT_NAME.Equals(input.ATT_NAME))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SmallCamel != null)
+                    hashCode = hashCode * 59 + this.SmallCamel.GetHashCode();
+                if (this.CapitalCamel != null)
+                    hashCode = hashCode * 59 + this.CapitalCamel.GetHashCode();
+                if (this.SmallSnake != null)
+                    hashCode = hashCode * 59 + this.SmallSnake.GetHashCode();
+                if (this.CapitalSnake != null)
+                    hashCode = hashCode * 59 + this.CapitalSnake.GetHashCode();
+                if (this.SCAETHFlowPoints != null)
+                    hashCode = hashCode * 59 + this.SCAETHFlowPoints.GetHashCode();
+                if (this.ATT_NAME != null)
+                    hashCode = hashCode * 59 + this.ATT_NAME.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
new file mode 100644
index 000000000000..b9444fb36071
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
@@ -0,0 +1,131 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Cat
+    /// 
+    [DataContract]
+    public partial class Cat : Animal,  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected Cat() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// declawed.
+        public Cat(bool? declawed = default(bool?), string className = default(string), string color = "red") : base(className, color)
+        {
+            this.Declawed = declawed;
+        }
+        
+        /// 
+        /// Gets or Sets Declawed
+        /// 
+        [DataMember(Name="declawed", EmitDefaultValue=false)]
+        public bool? Declawed { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Cat {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Declawed: ").Append(Declawed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public override string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Cat);
+        }
+
+        /// 
+        /// Returns true if Cat instances are equal
+        /// 
+        /// Instance of Cat to be compared
+        /// Boolean
+        public bool Equals(Cat input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Declawed == input.Declawed ||
+                    (this.Declawed != null &&
+                    this.Declawed.Equals(input.Declawed))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Declawed != null)
+                    hashCode = hashCode * 59 + this.Declawed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            foreach(var x in BaseValidate(validationContext)) yield return x;
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
new file mode 100644
index 000000000000..a172f36022ab
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Category
+    /// 
+    [DataContract]
+    public partial class Category :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// id.
+        /// name.
+        public Category(long? id = default(long?), string name = default(string))
+        {
+            this.Id = id;
+            this.Name = name;
+        }
+        
+        /// 
+        /// Gets or Sets Id
+        /// 
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+
+        /// 
+        /// Gets or Sets Name
+        /// 
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Category {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Category);
+        }
+
+        /// 
+        /// Returns true if Category instances are equal
+        /// 
+        /// Instance of Category to be compared
+        /// Boolean
+        public bool Equals(Category input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
new file mode 100644
index 000000000000..30753a34e643
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Model for testing model with \"_class\" property
+    /// 
+    [DataContract]
+    public partial class ClassModel :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// _class.
+        public ClassModel(string _class = default(string))
+        {
+            this.Class = _class;
+        }
+        
+        /// 
+        /// Gets or Sets Class
+        /// 
+        [DataMember(Name="_class", EmitDefaultValue=false)]
+        public string Class { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClassModel {\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClassModel);
+        }
+
+        /// 
+        /// Returns true if ClassModel instances are equal
+        /// 
+        /// Instance of ClassModel to be compared
+        /// Boolean
+        public bool Equals(ClassModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Class == input.Class ||
+                    (this.Class != null &&
+                    this.Class.Equals(input.Class))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Class != null)
+                    hashCode = hashCode * 59 + this.Class.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
new file mode 100644
index 000000000000..90c181c11b66
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
@@ -0,0 +1,131 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Dog
+    /// 
+    [DataContract]
+    public partial class Dog : Animal,  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected Dog() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// breed.
+        public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color)
+        {
+            this.Breed = breed;
+        }
+        
+        /// 
+        /// Gets or Sets Breed
+        /// 
+        [DataMember(Name="breed", EmitDefaultValue=false)]
+        public string Breed { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Dog {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Breed: ").Append(Breed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public override string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Dog);
+        }
+
+        /// 
+        /// Returns true if Dog instances are equal
+        /// 
+        /// Instance of Dog to be compared
+        /// Boolean
+        public bool Equals(Dog input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Breed == input.Breed ||
+                    (this.Breed != null &&
+                    this.Breed.Equals(input.Breed))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Breed != null)
+                    hashCode = hashCode * 59 + this.Breed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            foreach(var x in BaseValidate(validationContext)) yield return x;
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
new file mode 100644
index 000000000000..567a207068c2
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -0,0 +1,181 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// EnumArrays
+    /// 
+    [DataContract]
+    public partial class EnumArrays :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Defines JustSymbol
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum JustSymbolEnum
+        {
+            /// 
+            /// Enum GreaterThanOrEqualTo for value: >=
+            /// 
+            [EnumMember(Value = ">=")]
+            GreaterThanOrEqualTo = 1,
+
+            /// 
+            /// Enum Dollar for value: $
+            /// 
+            [EnumMember(Value = "$")]
+            Dollar = 2
+
+        }
+
+        /// 
+        /// Gets or Sets JustSymbol
+        /// 
+        [DataMember(Name="just_symbol", EmitDefaultValue=false)]
+        public JustSymbolEnum? JustSymbol { get; set; }
+        /// 
+        /// Defines ArrayEnum
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ArrayEnumEnum
+        {
+            /// 
+            /// Enum Fish for value: fish
+            /// 
+            [EnumMember(Value = "fish")]
+            Fish = 1,
+
+            /// 
+            /// Enum Crab for value: crab
+            /// 
+            [EnumMember(Value = "crab")]
+            Crab = 2
+
+        }
+
+
+        /// 
+        /// Gets or Sets ArrayEnum
+        /// 
+        [DataMember(Name="array_enum", EmitDefaultValue=false)]
+        public List ArrayEnum { get; set; }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// justSymbol.
+        /// arrayEnum.
+        public EnumArrays(JustSymbolEnum? justSymbol = default(JustSymbolEnum?), List arrayEnum = default(List))
+        {
+            this.JustSymbol = justSymbol;
+            this.ArrayEnum = arrayEnum;
+        }
+        
+
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class EnumArrays {\n");
+            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
+            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as EnumArrays);
+        }
+
+        /// 
+        /// Returns true if EnumArrays instances are equal
+        /// 
+        /// Instance of EnumArrays to be compared
+        /// Boolean
+        public bool Equals(EnumArrays input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.JustSymbol == input.JustSymbol ||
+                    (this.JustSymbol != null &&
+                    this.JustSymbol.Equals(input.JustSymbol))
+                ) && 
+                (
+                    this.ArrayEnum == input.ArrayEnum ||
+                    this.ArrayEnum != null &&
+                    this.ArrayEnum.SequenceEqual(input.ArrayEnum)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.JustSymbol != null)
+                    hashCode = hashCode * 59 + this.JustSymbol.GetHashCode();
+                if (this.ArrayEnum != null)
+                    hashCode = hashCode * 59 + this.ArrayEnum.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
new file mode 100644
index 000000000000..33643e475f51
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -0,0 +1,55 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Defines EnumClass
+    /// 
+    
+    [JsonConverter(typeof(StringEnumConverter))]
+    
+    public enum EnumClass
+    {
+        /// 
+        /// Enum Abc for value: _abc
+        /// 
+        [EnumMember(Value = "_abc")]
+        Abc = 1,
+
+        /// 
+        /// Enum Efg for value: -efg
+        /// 
+        [EnumMember(Value = "-efg")]
+        Efg = 2,
+
+        /// 
+        /// Enum Xyz for value: (xyz)
+        /// 
+        [EnumMember(Value = "(xyz)")]
+        Xyz = 3
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
new file mode 100644
index 000000000000..7099a980016f
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -0,0 +1,290 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// EnumTest
+    /// 
+    [DataContract]
+    public partial class EnumTest :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Defines EnumString
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum EnumStringEnum
+        {
+            /// 
+            /// Enum UPPER for value: UPPER
+            /// 
+            [EnumMember(Value = "UPPER")]
+            UPPER = 1,
+
+            /// 
+            /// Enum Lower for value: lower
+            /// 
+            [EnumMember(Value = "lower")]
+            Lower = 2,
+
+            /// 
+            /// Enum Empty for value: 
+            /// 
+            [EnumMember(Value = "")]
+            Empty = 3
+
+        }
+
+        /// 
+        /// Gets or Sets EnumString
+        /// 
+        [DataMember(Name="enum_string", EmitDefaultValue=false)]
+        public EnumStringEnum? EnumString { get; set; }
+        /// 
+        /// Defines EnumStringRequired
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum EnumStringRequiredEnum
+        {
+            /// 
+            /// Enum UPPER for value: UPPER
+            /// 
+            [EnumMember(Value = "UPPER")]
+            UPPER = 1,
+
+            /// 
+            /// Enum Lower for value: lower
+            /// 
+            [EnumMember(Value = "lower")]
+            Lower = 2,
+
+            /// 
+            /// Enum Empty for value: 
+            /// 
+            [EnumMember(Value = "")]
+            Empty = 3
+
+        }
+
+        /// 
+        /// Gets or Sets EnumStringRequired
+        /// 
+        [DataMember(Name="enum_string_required", EmitDefaultValue=false)]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        /// 
+        /// Defines EnumInteger
+        /// 
+        public enum EnumIntegerEnum
+        {
+            /// 
+            /// Enum NUMBER_1 for value: 1
+            /// 
+            NUMBER_1 = 1,
+
+            /// 
+            /// Enum NUMBER_MINUS_1 for value: -1
+            /// 
+            NUMBER_MINUS_1 = -1
+
+        }
+
+        /// 
+        /// Gets or Sets EnumInteger
+        /// 
+        [DataMember(Name="enum_integer", EmitDefaultValue=false)]
+        public EnumIntegerEnum? EnumInteger { get; set; }
+        /// 
+        /// Defines EnumNumber
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum EnumNumberEnum
+        {
+            /// 
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// 
+            [EnumMember(Value = "1.1")]
+            NUMBER_1_DOT_1 = 1,
+
+            /// 
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// 
+            [EnumMember(Value = "-1.2")]
+            NUMBER_MINUS_1_DOT_2 = 2
+
+        }
+
+        /// 
+        /// Gets or Sets EnumNumber
+        /// 
+        [DataMember(Name="enum_number", EmitDefaultValue=false)]
+        public EnumNumberEnum? EnumNumber { get; set; }
+        /// 
+        /// Gets or Sets OuterEnum
+        /// 
+        [DataMember(Name="outerEnum", EmitDefaultValue=false)]
+        public OuterEnum? OuterEnum { get; set; }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected EnumTest() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// enumString.
+        /// enumStringRequired (required).
+        /// enumInteger.
+        /// enumNumber.
+        /// outerEnum.
+        public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?))
+        {
+            // to ensure "enumStringRequired" is required (not null)
+            if (enumStringRequired == null)
+            {
+                throw new InvalidDataException("enumStringRequired is a required property for EnumTest and cannot be null");
+            }
+            else
+            {
+                this.EnumStringRequired = enumStringRequired;
+            }
+            this.EnumString = enumString;
+            this.EnumInteger = enumInteger;
+            this.EnumNumber = enumNumber;
+            this.OuterEnum = outerEnum;
+        }
+        
+
+
+
+
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class EnumTest {\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
+            sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
+            sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as EnumTest);
+        }
+
+        /// 
+        /// Returns true if EnumTest instances are equal
+        /// 
+        /// Instance of EnumTest to be compared
+        /// Boolean
+        public bool Equals(EnumTest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EnumString == input.EnumString ||
+                    (this.EnumString != null &&
+                    this.EnumString.Equals(input.EnumString))
+                ) && 
+                (
+                    this.EnumStringRequired == input.EnumStringRequired ||
+                    (this.EnumStringRequired != null &&
+                    this.EnumStringRequired.Equals(input.EnumStringRequired))
+                ) && 
+                (
+                    this.EnumInteger == input.EnumInteger ||
+                    (this.EnumInteger != null &&
+                    this.EnumInteger.Equals(input.EnumInteger))
+                ) && 
+                (
+                    this.EnumNumber == input.EnumNumber ||
+                    (this.EnumNumber != null &&
+                    this.EnumNumber.Equals(input.EnumNumber))
+                ) && 
+                (
+                    this.OuterEnum == input.OuterEnum ||
+                    (this.OuterEnum != null &&
+                    this.OuterEnum.Equals(input.OuterEnum))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EnumString != null)
+                    hashCode = hashCode * 59 + this.EnumString.GetHashCode();
+                if (this.EnumStringRequired != null)
+                    hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
+                if (this.EnumInteger != null)
+                    hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
+                if (this.EnumNumber != null)
+                    hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
+                if (this.OuterEnum != null)
+                    hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
new file mode 100644
index 000000000000..68d564d17e72
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Must be named `File` for test.
+    /// 
+    [DataContract]
+    public partial class File :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// Test capitalization.
+        public File(string sourceURI = default(string))
+        {
+            this.SourceURI = sourceURI;
+        }
+        
+        /// 
+        /// Test capitalization
+        /// 
+        /// Test capitalization
+        [DataMember(Name="sourceURI", EmitDefaultValue=false)]
+        public string SourceURI { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class File {\n");
+            sb.Append("  SourceURI: ").Append(SourceURI).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as File);
+        }
+
+        /// 
+        /// Returns true if File instances are equal
+        /// 
+        /// Instance of File to be compared
+        /// Boolean
+        public bool Equals(File input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SourceURI == input.SourceURI ||
+                    (this.SourceURI != null &&
+                    this.SourceURI.Equals(input.SourceURI))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SourceURI != null)
+                    hashCode = hashCode * 59 + this.SourceURI.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
new file mode 100644
index 000000000000..1505ab9c4b1c
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// FileSchemaTestClass
+    /// 
+    [DataContract]
+    public partial class FileSchemaTestClass :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// file.
+        /// files.
+        public FileSchemaTestClass(System.IO.Stream file = default(System.IO.Stream), List files = default(List))
+        {
+            this.File = file;
+            this.Files = files;
+        }
+        
+        /// 
+        /// Gets or Sets File
+        /// 
+        [DataMember(Name="file", EmitDefaultValue=false)]
+        public System.IO.Stream File { get; set; }
+
+        /// 
+        /// Gets or Sets Files
+        /// 
+        [DataMember(Name="files", EmitDefaultValue=false)]
+        public List Files { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class FileSchemaTestClass {\n");
+            sb.Append("  File: ").Append(File).Append("\n");
+            sb.Append("  Files: ").Append(Files).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as FileSchemaTestClass);
+        }
+
+        /// 
+        /// Returns true if FileSchemaTestClass instances are equal
+        /// 
+        /// Instance of FileSchemaTestClass to be compared
+        /// Boolean
+        public bool Equals(FileSchemaTestClass input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.File == input.File ||
+                    (this.File != null &&
+                    this.File.Equals(input.File))
+                ) && 
+                (
+                    this.Files == input.Files ||
+                    this.Files != null &&
+                    this.Files.SequenceEqual(input.Files)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.File != null)
+                    hashCode = hashCode * 59 + this.File.GetHashCode();
+                if (this.Files != null)
+                    hashCode = hashCode * 59 + this.Files.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
new file mode 100644
index 000000000000..1b847c16934e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -0,0 +1,433 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// FormatTest
+    /// 
+    [DataContract]
+    public partial class FormatTest :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected FormatTest() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// integer.
+        /// int32.
+        /// int64.
+        /// number (required).
+        /// _float.
+        /// _double.
+        /// _string.
+        /// _byte (required).
+        /// binary.
+        /// date (required).
+        /// dateTime.
+        /// uuid.
+        /// password (required).
+        public FormatTest(int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), decimal? number = default(decimal?), float? _float = default(float?), double? _double = default(double?), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), Guid? uuid = default(Guid?), string password = default(string))
+        {
+            // to ensure "number" is required (not null)
+            if (number == null)
+            {
+                throw new InvalidDataException("number is a required property for FormatTest and cannot be null");
+            }
+            else
+            {
+                this.Number = number;
+            }
+            // to ensure "_byte" is required (not null)
+            if (_byte == null)
+            {
+                throw new InvalidDataException("_byte is a required property for FormatTest and cannot be null");
+            }
+            else
+            {
+                this.Byte = _byte;
+            }
+            // to ensure "date" is required (not null)
+            if (date == null)
+            {
+                throw new InvalidDataException("date is a required property for FormatTest and cannot be null");
+            }
+            else
+            {
+                this.Date = date;
+            }
+            // to ensure "password" is required (not null)
+            if (password == null)
+            {
+                throw new InvalidDataException("password is a required property for FormatTest and cannot be null");
+            }
+            else
+            {
+                this.Password = password;
+            }
+            this.Integer = integer;
+            this.Int32 = int32;
+            this.Int64 = int64;
+            this.Float = _float;
+            this.Double = _double;
+            this.String = _string;
+            this.Binary = binary;
+            this.DateTime = dateTime;
+            this.Uuid = uuid;
+        }
+        
+        /// 
+        /// Gets or Sets Integer
+        /// 
+        [DataMember(Name="integer", EmitDefaultValue=false)]
+        public int? Integer { get; set; }
+
+        /// 
+        /// Gets or Sets Int32
+        /// 
+        [DataMember(Name="int32", EmitDefaultValue=false)]
+        public int? Int32 { get; set; }
+
+        /// 
+        /// Gets or Sets Int64
+        /// 
+        [DataMember(Name="int64", EmitDefaultValue=false)]
+        public long? Int64 { get; set; }
+
+        /// 
+        /// Gets or Sets Number
+        /// 
+        [DataMember(Name="number", EmitDefaultValue=false)]
+        public decimal? Number { get; set; }
+
+        /// 
+        /// Gets or Sets Float
+        /// 
+        [DataMember(Name="float", EmitDefaultValue=false)]
+        public float? Float { get; set; }
+
+        /// 
+        /// Gets or Sets Double
+        /// 
+        [DataMember(Name="double", EmitDefaultValue=false)]
+        public double? Double { get; set; }
+
+        /// 
+        /// Gets or Sets String
+        /// 
+        [DataMember(Name="string", EmitDefaultValue=false)]
+        public string String { get; set; }
+
+        /// 
+        /// Gets or Sets Byte
+        /// 
+        [DataMember(Name="byte", EmitDefaultValue=false)]
+        public byte[] Byte { get; set; }
+
+        /// 
+        /// Gets or Sets Binary
+        /// 
+        [DataMember(Name="binary", EmitDefaultValue=false)]
+        public System.IO.Stream Binary { get; set; }
+
+        /// 
+        /// Gets or Sets Date
+        /// 
+        [DataMember(Name="date", EmitDefaultValue=false)]
+        [JsonConverter(typeof(OpenAPIDateConverter))]
+        public DateTime? Date { get; set; }
+
+        /// 
+        /// Gets or Sets DateTime
+        /// 
+        [DataMember(Name="dateTime", EmitDefaultValue=false)]
+        public DateTime? DateTime { get; set; }
+
+        /// 
+        /// Gets or Sets Uuid
+        /// 
+        [DataMember(Name="uuid", EmitDefaultValue=false)]
+        public Guid? Uuid { get; set; }
+
+        /// 
+        /// Gets or Sets Password
+        /// 
+        [DataMember(Name="password", EmitDefaultValue=false)]
+        public string Password { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class FormatTest {\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  Int32: ").Append(Int32).Append("\n");
+            sb.Append("  Int64: ").Append(Int64).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Float: ").Append(Float).Append("\n");
+            sb.Append("  Double: ").Append(Double).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  Byte: ").Append(Byte).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  Date: ").Append(Date).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as FormatTest);
+        }
+
+        /// 
+        /// Returns true if FormatTest instances are equal
+        /// 
+        /// Instance of FormatTest to be compared
+        /// Boolean
+        public bool Equals(FormatTest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Integer == input.Integer ||
+                    (this.Integer != null &&
+                    this.Integer.Equals(input.Integer))
+                ) && 
+                (
+                    this.Int32 == input.Int32 ||
+                    (this.Int32 != null &&
+                    this.Int32.Equals(input.Int32))
+                ) && 
+                (
+                    this.Int64 == input.Int64 ||
+                    (this.Int64 != null &&
+                    this.Int64.Equals(input.Int64))
+                ) && 
+                (
+                    this.Number == input.Number ||
+                    (this.Number != null &&
+                    this.Number.Equals(input.Number))
+                ) && 
+                (
+                    this.Float == input.Float ||
+                    (this.Float != null &&
+                    this.Float.Equals(input.Float))
+                ) && 
+                (
+                    this.Double == input.Double ||
+                    (this.Double != null &&
+                    this.Double.Equals(input.Double))
+                ) && 
+                (
+                    this.String == input.String ||
+                    (this.String != null &&
+                    this.String.Equals(input.String))
+                ) && 
+                (
+                    this.Byte == input.Byte ||
+                    (this.Byte != null &&
+                    this.Byte.Equals(input.Byte))
+                ) && 
+                (
+                    this.Binary == input.Binary ||
+                    (this.Binary != null &&
+                    this.Binary.Equals(input.Binary))
+                ) && 
+                (
+                    this.Date == input.Date ||
+                    (this.Date != null &&
+                    this.Date.Equals(input.Date))
+                ) && 
+                (
+                    this.DateTime == input.DateTime ||
+                    (this.DateTime != null &&
+                    this.DateTime.Equals(input.DateTime))
+                ) && 
+                (
+                    this.Uuid == input.Uuid ||
+                    (this.Uuid != null &&
+                    this.Uuid.Equals(input.Uuid))
+                ) && 
+                (
+                    this.Password == input.Password ||
+                    (this.Password != null &&
+                    this.Password.Equals(input.Password))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Integer != null)
+                    hashCode = hashCode * 59 + this.Integer.GetHashCode();
+                if (this.Int32 != null)
+                    hashCode = hashCode * 59 + this.Int32.GetHashCode();
+                if (this.Int64 != null)
+                    hashCode = hashCode * 59 + this.Int64.GetHashCode();
+                if (this.Number != null)
+                    hashCode = hashCode * 59 + this.Number.GetHashCode();
+                if (this.Float != null)
+                    hashCode = hashCode * 59 + this.Float.GetHashCode();
+                if (this.Double != null)
+                    hashCode = hashCode * 59 + this.Double.GetHashCode();
+                if (this.String != null)
+                    hashCode = hashCode * 59 + this.String.GetHashCode();
+                if (this.Byte != null)
+                    hashCode = hashCode * 59 + this.Byte.GetHashCode();
+                if (this.Binary != null)
+                    hashCode = hashCode * 59 + this.Binary.GetHashCode();
+                if (this.Date != null)
+                    hashCode = hashCode * 59 + this.Date.GetHashCode();
+                if (this.DateTime != null)
+                    hashCode = hashCode * 59 + this.DateTime.GetHashCode();
+                if (this.Uuid != null)
+                    hashCode = hashCode * 59 + this.Uuid.GetHashCode();
+                if (this.Password != null)
+                    hashCode = hashCode * 59 + this.Password.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            // Integer (int?) maximum
+            if(this.Integer > (int?)100)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+            }
+
+            // Integer (int?) minimum
+            if(this.Integer < (int?)10)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+            }
+
+            // Int32 (int?) maximum
+            if(this.Int32 > (int?)200)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value less than or equal to 200.", new [] { "Int32" });
+            }
+
+            // Int32 (int?) minimum
+            if(this.Int32 < (int?)20)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
+            }
+
+            // Number (decimal?) maximum
+            if(this.Number > (decimal?)543.2)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+            }
+
+            // Number (decimal?) minimum
+            if(this.Number < (decimal?)32.1)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+            }
+
+            // Float (float?) maximum
+            if(this.Float > (float?)987.6)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
+            }
+
+            // Float (float?) minimum
+            if(this.Float < (float?)54.3)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
+            }
+
+            // Double (double?) maximum
+            if(this.Double > (double?)123.4)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
+            }
+
+            // Double (double?) minimum
+            if(this.Double < (double?)67.8)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
+            }
+
+            // String (string) pattern
+            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexString.Match(this.String).Success)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
+            }
+
+            // Password (string) maxLength
+            if(this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+            }
+
+            // Password (string) minLength
+            if(this.Password != null && this.Password.Length < 10)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+            }
+
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
new file mode 100644
index 000000000000..520640366921
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
@@ -0,0 +1,137 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// HasOnlyReadOnly
+    /// 
+    [DataContract]
+    public partial class HasOnlyReadOnly :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        public HasOnlyReadOnly()
+        {
+        }
+        
+        /// 
+        /// Gets or Sets Bar
+        /// 
+        [DataMember(Name="bar", EmitDefaultValue=false)]
+        public string Bar { get; private set; }
+
+        /// 
+        /// Gets or Sets Foo
+        /// 
+        [DataMember(Name="foo", EmitDefaultValue=false)]
+        public string Foo { get; private set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class HasOnlyReadOnly {\n");
+            sb.Append("  Bar: ").Append(Bar).Append("\n");
+            sb.Append("  Foo: ").Append(Foo).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as HasOnlyReadOnly);
+        }
+
+        /// 
+        /// Returns true if HasOnlyReadOnly instances are equal
+        /// 
+        /// Instance of HasOnlyReadOnly to be compared
+        /// Boolean
+        public bool Equals(HasOnlyReadOnly input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Bar == input.Bar ||
+                    (this.Bar != null &&
+                    this.Bar.Equals(input.Bar))
+                ) && 
+                (
+                    this.Foo == input.Foo ||
+                    (this.Foo != null &&
+                    this.Foo.Equals(input.Foo))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Bar != null)
+                    hashCode = hashCode * 59 + this.Bar.GetHashCode();
+                if (this.Foo != null)
+                    hashCode = hashCode * 59 + this.Foo.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
new file mode 100644
index 000000000000..14c7ed746a0e
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// List
+    /// 
+    [DataContract]
+    public partial class List :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// _123list.
+        public List(string _123list = default(string))
+        {
+            this._123List = _123list;
+        }
+        
+        /// 
+        /// Gets or Sets _123List
+        /// 
+        [DataMember(Name="123-list", EmitDefaultValue=false)]
+        public string _123List { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class List {\n");
+            sb.Append("  _123List: ").Append(_123List).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as List);
+        }
+
+        /// 
+        /// Returns true if List instances are equal
+        /// 
+        /// Instance of List to be compared
+        /// Boolean
+        public bool Equals(List input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this._123List == input._123List ||
+                    (this._123List != null &&
+                    this._123List.Equals(input._123List))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this._123List != null)
+                    hashCode = hashCode * 59 + this._123List.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
new file mode 100644
index 000000000000..1c5bfa70198a
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
@@ -0,0 +1,193 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// MapTest
+    /// 
+    [DataContract]
+    public partial class MapTest :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Defines Inner
+        /// 
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum InnerEnum
+        {
+            /// 
+            /// Enum UPPER for value: UPPER
+            /// 
+            [EnumMember(Value = "UPPER")]
+            UPPER = 1,
+
+            /// 
+            /// Enum Lower for value: lower
+            /// 
+            [EnumMember(Value = "lower")]
+            Lower = 2
+
+        }
+
+
+        /// 
+        /// Gets or Sets MapOfEnumString
+        /// 
+        [DataMember(Name="map_of_enum_string", EmitDefaultValue=false)]
+        public Dictionary MapOfEnumString { get; set; }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// mapMapOfString.
+        /// mapOfEnumString.
+        /// directMap.
+        /// indirectMap.
+        public MapTest(Dictionary> mapMapOfString = default(Dictionary>), Dictionary mapOfEnumString = default(Dictionary), Dictionary directMap = default(Dictionary), StringBooleanMap indirectMap = default(StringBooleanMap))
+        {
+            this.MapMapOfString = mapMapOfString;
+            this.MapOfEnumString = mapOfEnumString;
+            this.DirectMap = directMap;
+            this.IndirectMap = indirectMap;
+        }
+        
+        /// 
+        /// Gets or Sets MapMapOfString
+        /// 
+        [DataMember(Name="map_map_of_string", EmitDefaultValue=false)]
+        public Dictionary> MapMapOfString { get; set; }
+
+
+        /// 
+        /// Gets or Sets DirectMap
+        /// 
+        [DataMember(Name="direct_map", EmitDefaultValue=false)]
+        public Dictionary DirectMap { get; set; }
+
+        /// 
+        /// Gets or Sets IndirectMap
+        /// 
+        [DataMember(Name="indirect_map", EmitDefaultValue=false)]
+        public StringBooleanMap IndirectMap { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MapTest {\n");
+            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
+            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
+            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
+            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MapTest);
+        }
+
+        /// 
+        /// Returns true if MapTest instances are equal
+        /// 
+        /// Instance of MapTest to be compared
+        /// Boolean
+        public bool Equals(MapTest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MapMapOfString == input.MapMapOfString ||
+                    this.MapMapOfString != null &&
+                    this.MapMapOfString.SequenceEqual(input.MapMapOfString)
+                ) && 
+                (
+                    this.MapOfEnumString == input.MapOfEnumString ||
+                    this.MapOfEnumString != null &&
+                    this.MapOfEnumString.SequenceEqual(input.MapOfEnumString)
+                ) && 
+                (
+                    this.DirectMap == input.DirectMap ||
+                    this.DirectMap != null &&
+                    this.DirectMap.SequenceEqual(input.DirectMap)
+                ) && 
+                (
+                    this.IndirectMap == input.IndirectMap ||
+                    (this.IndirectMap != null &&
+                    this.IndirectMap.Equals(input.IndirectMap))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MapMapOfString != null)
+                    hashCode = hashCode * 59 + this.MapMapOfString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                    hashCode = hashCode * 59 + this.MapOfEnumString.GetHashCode();
+                if (this.DirectMap != null)
+                    hashCode = hashCode * 59 + this.DirectMap.GetHashCode();
+                if (this.IndirectMap != null)
+                    hashCode = hashCode * 59 + this.IndirectMap.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
new file mode 100644
index 000000000000..19df6fd34891
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -0,0 +1,156 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// MixedPropertiesAndAdditionalPropertiesClass
+    /// 
+    [DataContract]
+    public partial class MixedPropertiesAndAdditionalPropertiesClass :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// uuid.
+        /// dateTime.
+        /// map.
+        public MixedPropertiesAndAdditionalPropertiesClass(Guid? uuid = default(Guid?), DateTime? dateTime = default(DateTime?), Dictionary map = default(Dictionary))
+        {
+            this.Uuid = uuid;
+            this.DateTime = dateTime;
+            this.Map = map;
+        }
+        
+        /// 
+        /// Gets or Sets Uuid
+        /// 
+        [DataMember(Name="uuid", EmitDefaultValue=false)]
+        public Guid? Uuid { get; set; }
+
+        /// 
+        /// Gets or Sets DateTime
+        /// 
+        [DataMember(Name="dateTime", EmitDefaultValue=false)]
+        public DateTime? DateTime { get; set; }
+
+        /// 
+        /// Gets or Sets Map
+        /// 
+        [DataMember(Name="map", EmitDefaultValue=false)]
+        public Dictionary Map { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Map: ").Append(Map).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MixedPropertiesAndAdditionalPropertiesClass);
+        }
+
+        /// 
+        /// Returns true if MixedPropertiesAndAdditionalPropertiesClass instances are equal
+        /// 
+        /// Instance of MixedPropertiesAndAdditionalPropertiesClass to be compared
+        /// Boolean
+        public bool Equals(MixedPropertiesAndAdditionalPropertiesClass input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Uuid == input.Uuid ||
+                    (this.Uuid != null &&
+                    this.Uuid.Equals(input.Uuid))
+                ) && 
+                (
+                    this.DateTime == input.DateTime ||
+                    (this.DateTime != null &&
+                    this.DateTime.Equals(input.DateTime))
+                ) && 
+                (
+                    this.Map == input.Map ||
+                    this.Map != null &&
+                    this.Map.SequenceEqual(input.Map)
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Uuid != null)
+                    hashCode = hashCode * 59 + this.Uuid.GetHashCode();
+                if (this.DateTime != null)
+                    hashCode = hashCode * 59 + this.DateTime.GetHashCode();
+                if (this.Map != null)
+                    hashCode = hashCode * 59 + this.Map.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
new file mode 100644
index 000000000000..69767330c053
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Model for testing model name starting with number
+    /// 
+    [DataContract]
+    public partial class Model200Response :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// name.
+        /// _class.
+        public Model200Response(int? name = default(int?), string _class = default(string))
+        {
+            this.Name = name;
+            this.Class = _class;
+        }
+        
+        /// 
+        /// Gets or Sets Name
+        /// 
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public int? Name { get; set; }
+
+        /// 
+        /// Gets or Sets Class
+        /// 
+        [DataMember(Name="class", EmitDefaultValue=false)]
+        public string Class { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Model200Response {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Model200Response);
+        }
+
+        /// 
+        /// Returns true if Model200Response instances are equal
+        /// 
+        /// Instance of Model200Response to be compared
+        /// Boolean
+        public bool Equals(Model200Response input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Class == input.Class ||
+                    (this.Class != null &&
+                    this.Class.Equals(input.Class))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Class != null)
+                    hashCode = hashCode * 59 + this.Class.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
new file mode 100644
index 000000000000..2e9d79ef1419
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ModelClient
+    /// 
+    [DataContract]
+    public partial class ModelClient :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// _client.
+        public ModelClient(string _client = default(string))
+        {
+            this.__Client = _client;
+        }
+        
+        /// 
+        /// Gets or Sets __Client
+        /// 
+        [DataMember(Name="client", EmitDefaultValue=false)]
+        public string __Client { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ModelClient {\n");
+            sb.Append("  __Client: ").Append(__Client).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ModelClient);
+        }
+
+        /// 
+        /// Returns true if ModelClient instances are equal
+        /// 
+        /// Instance of ModelClient to be compared
+        /// Boolean
+        public bool Equals(ModelClient input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.__Client == input.__Client ||
+                    (this.__Client != null &&
+                    this.__Client.Equals(input.__Client))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.__Client != null)
+                    hashCode = hashCode * 59 + this.__Client.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
new file mode 100644
index 000000000000..68f848ca0915
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
@@ -0,0 +1,181 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Model for testing model name same as property name
+    /// 
+    [DataContract]
+    public partial class Name :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected Name() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// name (required).
+        /// property.
+        public Name(int? name = default(int?), string property = default(string))
+        {
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for Name and cannot be null");
+            }
+            else
+            {
+                this._Name = name;
+            }
+            this.Property = property;
+        }
+        
+        /// 
+        /// Gets or Sets _Name
+        /// 
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public int? _Name { get; set; }
+
+        /// 
+        /// Gets or Sets SnakeCase
+        /// 
+        [DataMember(Name="snake_case", EmitDefaultValue=false)]
+        public int? SnakeCase { get; private set; }
+
+        /// 
+        /// Gets or Sets Property
+        /// 
+        [DataMember(Name="property", EmitDefaultValue=false)]
+        public string Property { get; set; }
+
+        /// 
+        /// Gets or Sets _123Number
+        /// 
+        [DataMember(Name="123Number", EmitDefaultValue=false)]
+        public int? _123Number { get; private set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Name {\n");
+            sb.Append("  _Name: ").Append(_Name).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            sb.Append("  Property: ").Append(Property).Append("\n");
+            sb.Append("  _123Number: ").Append(_123Number).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Name);
+        }
+
+        /// 
+        /// Returns true if Name instances are equal
+        /// 
+        /// Instance of Name to be compared
+        /// Boolean
+        public bool Equals(Name input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this._Name == input._Name ||
+                    (this._Name != null &&
+                    this._Name.Equals(input._Name))
+                ) && 
+                (
+                    this.SnakeCase == input.SnakeCase ||
+                    (this.SnakeCase != null &&
+                    this.SnakeCase.Equals(input.SnakeCase))
+                ) && 
+                (
+                    this.Property == input.Property ||
+                    (this.Property != null &&
+                    this.Property.Equals(input.Property))
+                ) && 
+                (
+                    this._123Number == input._123Number ||
+                    (this._123Number != null &&
+                    this._123Number.Equals(input._123Number))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this._Name != null)
+                    hashCode = hashCode * 59 + this._Name.GetHashCode();
+                if (this.SnakeCase != null)
+                    hashCode = hashCode * 59 + this.SnakeCase.GetHashCode();
+                if (this.Property != null)
+                    hashCode = hashCode * 59 + this.Property.GetHashCode();
+                if (this._123Number != null)
+                    hashCode = hashCode * 59 + this._123Number.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
new file mode 100644
index 000000000000..0d3c613d18bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// NumberOnly
+    /// 
+    [DataContract]
+    public partial class NumberOnly :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// justNumber.
+        public NumberOnly(decimal? justNumber = default(decimal?))
+        {
+            this.JustNumber = justNumber;
+        }
+        
+        /// 
+        /// Gets or Sets JustNumber
+        /// 
+        [DataMember(Name="JustNumber", EmitDefaultValue=false)]
+        public decimal? JustNumber { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NumberOnly {\n");
+            sb.Append("  JustNumber: ").Append(JustNumber).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NumberOnly);
+        }
+
+        /// 
+        /// Returns true if NumberOnly instances are equal
+        /// 
+        /// Instance of NumberOnly to be compared
+        /// Boolean
+        public bool Equals(NumberOnly input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.JustNumber == input.JustNumber ||
+                    (this.JustNumber != null &&
+                    this.JustNumber.Equals(input.JustNumber))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.JustNumber != null)
+                    hashCode = hashCode * 59 + this.JustNumber.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
new file mode 100644
index 000000000000..f895f035192b
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
@@ -0,0 +1,240 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Order
+    /// 
+    [DataContract]
+    public partial class Order :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Order Status
+        /// 
+        /// Order Status
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum
+        {
+            /// 
+            /// Enum Placed for value: placed
+            /// 
+            [EnumMember(Value = "placed")]
+            Placed = 1,
+
+            /// 
+            /// Enum Approved for value: approved
+            /// 
+            [EnumMember(Value = "approved")]
+            Approved = 2,
+
+            /// 
+            /// Enum Delivered for value: delivered
+            /// 
+            [EnumMember(Value = "delivered")]
+            Delivered = 3
+
+        }
+
+        /// 
+        /// Order Status
+        /// 
+        /// Order Status
+        [DataMember(Name="status", EmitDefaultValue=false)]
+        public StatusEnum? Status { get; set; }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// id.
+        /// petId.
+        /// quantity.
+        /// shipDate.
+        /// Order Status.
+        /// complete (default to false).
+        public Order(long? id = default(long?), long? petId = default(long?), int? quantity = default(int?), DateTime? shipDate = default(DateTime?), StatusEnum? status = default(StatusEnum?), bool? complete = false)
+        {
+            this.Id = id;
+            this.PetId = petId;
+            this.Quantity = quantity;
+            this.ShipDate = shipDate;
+            this.Status = status;
+            // use default value if no "complete" provided
+            if (complete == null)
+            {
+                this.Complete = false;
+            }
+            else
+            {
+                this.Complete = complete;
+            }
+        }
+        
+        /// 
+        /// Gets or Sets Id
+        /// 
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+
+        /// 
+        /// Gets or Sets PetId
+        /// 
+        [DataMember(Name="petId", EmitDefaultValue=false)]
+        public long? PetId { get; set; }
+
+        /// 
+        /// Gets or Sets Quantity
+        /// 
+        [DataMember(Name="quantity", EmitDefaultValue=false)]
+        public int? Quantity { get; set; }
+
+        /// 
+        /// Gets or Sets ShipDate
+        /// 
+        [DataMember(Name="shipDate", EmitDefaultValue=false)]
+        public DateTime? ShipDate { get; set; }
+
+
+        /// 
+        /// Gets or Sets Complete
+        /// 
+        [DataMember(Name="complete", EmitDefaultValue=false)]
+        public bool? Complete { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Order {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  PetId: ").Append(PetId).Append("\n");
+            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
+            sb.Append("  ShipDate: ").Append(ShipDate).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Complete: ").Append(Complete).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Order);
+        }
+
+        /// 
+        /// Returns true if Order instances are equal
+        /// 
+        /// Instance of Order to be compared
+        /// Boolean
+        public bool Equals(Order input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.PetId == input.PetId ||
+                    (this.PetId != null &&
+                    this.PetId.Equals(input.PetId))
+                ) && 
+                (
+                    this.Quantity == input.Quantity ||
+                    (this.Quantity != null &&
+                    this.Quantity.Equals(input.Quantity))
+                ) && 
+                (
+                    this.ShipDate == input.ShipDate ||
+                    (this.ShipDate != null &&
+                    this.ShipDate.Equals(input.ShipDate))
+                ) && 
+                (
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
+                ) && 
+                (
+                    this.Complete == input.Complete ||
+                    (this.Complete != null &&
+                    this.Complete.Equals(input.Complete))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.PetId != null)
+                    hashCode = hashCode * 59 + this.PetId.GetHashCode();
+                if (this.Quantity != null)
+                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
+                if (this.ShipDate != null)
+                    hashCode = hashCode * 59 + this.ShipDate.GetHashCode();
+                if (this.Status != null)
+                    hashCode = hashCode * 59 + this.Status.GetHashCode();
+                if (this.Complete != null)
+                    hashCode = hashCode * 59 + this.Complete.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
new file mode 100644
index 000000000000..3bb725402152
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -0,0 +1,156 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// OuterComposite
+    /// 
+    [DataContract]
+    public partial class OuterComposite :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// myNumber.
+        /// myString.
+        /// myBoolean.
+        public OuterComposite(decimal? myNumber = default(decimal?), string myString = default(string), bool? myBoolean = default(bool?))
+        {
+            this.MyNumber = myNumber;
+            this.MyString = myString;
+            this.MyBoolean = myBoolean;
+        }
+        
+        /// 
+        /// Gets or Sets MyNumber
+        /// 
+        [DataMember(Name="my_number", EmitDefaultValue=false)]
+        public decimal? MyNumber { get; set; }
+
+        /// 
+        /// Gets or Sets MyString
+        /// 
+        [DataMember(Name="my_string", EmitDefaultValue=false)]
+        public string MyString { get; set; }
+
+        /// 
+        /// Gets or Sets MyBoolean
+        /// 
+        [DataMember(Name="my_boolean", EmitDefaultValue=false)]
+        public bool? MyBoolean { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OuterComposite {\n");
+            sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
+            sb.Append("  MyString: ").Append(MyString).Append("\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OuterComposite);
+        }
+
+        /// 
+        /// Returns true if OuterComposite instances are equal
+        /// 
+        /// Instance of OuterComposite to be compared
+        /// Boolean
+        public bool Equals(OuterComposite input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MyNumber == input.MyNumber ||
+                    (this.MyNumber != null &&
+                    this.MyNumber.Equals(input.MyNumber))
+                ) && 
+                (
+                    this.MyString == input.MyString ||
+                    (this.MyString != null &&
+                    this.MyString.Equals(input.MyString))
+                ) && 
+                (
+                    this.MyBoolean == input.MyBoolean ||
+                    (this.MyBoolean != null &&
+                    this.MyBoolean.Equals(input.MyBoolean))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MyNumber != null)
+                    hashCode = hashCode * 59 + this.MyNumber.GetHashCode();
+                if (this.MyString != null)
+                    hashCode = hashCode * 59 + this.MyString.GetHashCode();
+                if (this.MyBoolean != null)
+                    hashCode = hashCode * 59 + this.MyBoolean.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
new file mode 100644
index 000000000000..be116aff60ab
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -0,0 +1,55 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Defines OuterEnum
+    /// 
+    
+    [JsonConverter(typeof(StringEnumConverter))]
+    
+    public enum OuterEnum
+    {
+        /// 
+        /// Enum Placed for value: placed
+        /// 
+        [EnumMember(Value = "placed")]
+        Placed = 1,
+
+        /// 
+        /// Enum Approved for value: approved
+        /// 
+        [EnumMember(Value = "approved")]
+        Approved = 2,
+
+        /// 
+        /// Enum Delivered for value: delivered
+        /// 
+        [EnumMember(Value = "delivered")]
+        Delivered = 3
+
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
new file mode 100644
index 000000000000..1e213e5006ad
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
@@ -0,0 +1,253 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Pet
+    /// 
+    [DataContract]
+    public partial class Pet :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// pet status in the store
+        /// 
+        /// pet status in the store
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum
+        {
+            /// 
+            /// Enum Available for value: available
+            /// 
+            [EnumMember(Value = "available")]
+            Available = 1,
+
+            /// 
+            /// Enum Pending for value: pending
+            /// 
+            [EnumMember(Value = "pending")]
+            Pending = 2,
+
+            /// 
+            /// Enum Sold for value: sold
+            /// 
+            [EnumMember(Value = "sold")]
+            Sold = 3
+
+        }
+
+        /// 
+        /// pet status in the store
+        /// 
+        /// pet status in the store
+        [DataMember(Name="status", EmitDefaultValue=false)]
+        public StatusEnum? Status { get; set; }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        protected Pet() { }
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// id.
+        /// category.
+        /// name (required).
+        /// photoUrls (required).
+        /// tags.
+        /// pet status in the store.
+        public Pet(long? id = default(long?), Category category = default(Category), string name = default(string), List photoUrls = default(List), List tags = default(List), StatusEnum? status = default(StatusEnum?))
+        {
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+            // to ensure "photoUrls" is required (not null)
+            if (photoUrls == null)
+            {
+                throw new InvalidDataException("photoUrls is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.PhotoUrls = photoUrls;
+            }
+            this.Id = id;
+            this.Category = category;
+            this.Tags = tags;
+            this.Status = status;
+        }
+        
+        /// 
+        /// Gets or Sets Id
+        /// 
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+
+        /// 
+        /// Gets or Sets Category
+        /// 
+        [DataMember(Name="category", EmitDefaultValue=false)]
+        public Category Category { get; set; }
+
+        /// 
+        /// Gets or Sets Name
+        /// 
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// 
+        /// Gets or Sets PhotoUrls
+        /// 
+        [DataMember(Name="photoUrls", EmitDefaultValue=false)]
+        public List PhotoUrls { get; set; }
+
+        /// 
+        /// Gets or Sets Tags
+        /// 
+        [DataMember(Name="tags", EmitDefaultValue=false)]
+        public List Tags { get; set; }
+
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Pet {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Pet);
+        }
+
+        /// 
+        /// Returns true if Pet instances are equal
+        /// 
+        /// Instance of Pet to be compared
+        /// Boolean
+        public bool Equals(Pet input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.Category == input.Category ||
+                    (this.Category != null &&
+                    this.Category.Equals(input.Category))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PhotoUrls == input.PhotoUrls ||
+                    this.PhotoUrls != null &&
+                    this.PhotoUrls.SequenceEqual(input.PhotoUrls)
+                ) && 
+                (
+                    this.Tags == input.Tags ||
+                    this.Tags != null &&
+                    this.Tags.SequenceEqual(input.Tags)
+                ) && 
+                (
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.Category != null)
+                    hashCode = hashCode * 59 + this.Category.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PhotoUrls != null)
+                    hashCode = hashCode * 59 + this.PhotoUrls.GetHashCode();
+                if (this.Tags != null)
+                    hashCode = hashCode * 59 + this.Tags.GetHashCode();
+                if (this.Status != null)
+                    hashCode = hashCode * 59 + this.Status.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
new file mode 100644
index 000000000000..6e82eb5819e2
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
@@ -0,0 +1,138 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// ReadOnlyFirst
+    /// 
+    [DataContract]
+    public partial class ReadOnlyFirst :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// baz.
+        public ReadOnlyFirst(string baz = default(string))
+        {
+            this.Baz = baz;
+        }
+        
+        /// 
+        /// Gets or Sets Bar
+        /// 
+        [DataMember(Name="bar", EmitDefaultValue=false)]
+        public string Bar { get; private set; }
+
+        /// 
+        /// Gets or Sets Baz
+        /// 
+        [DataMember(Name="baz", EmitDefaultValue=false)]
+        public string Baz { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ReadOnlyFirst {\n");
+            sb.Append("  Bar: ").Append(Bar).Append("\n");
+            sb.Append("  Baz: ").Append(Baz).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ReadOnlyFirst);
+        }
+
+        /// 
+        /// Returns true if ReadOnlyFirst instances are equal
+        /// 
+        /// Instance of ReadOnlyFirst to be compared
+        /// Boolean
+        public bool Equals(ReadOnlyFirst input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Bar == input.Bar ||
+                    (this.Bar != null &&
+                    this.Bar.Equals(input.Bar))
+                ) && 
+                (
+                    this.Baz == input.Baz ||
+                    (this.Baz != null &&
+                    this.Baz.Equals(input.Baz))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Bar != null)
+                    hashCode = hashCode * 59 + this.Bar.GetHashCode();
+                if (this.Baz != null)
+                    hashCode = hashCode * 59 + this.Baz.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
new file mode 100644
index 000000000000..401b8e2c70d4
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Model for testing reserved words
+    /// 
+    [DataContract]
+    public partial class Return :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// _return.
+        public Return(int? _return = default(int?))
+        {
+            this._Return = _return;
+        }
+        
+        /// 
+        /// Gets or Sets _Return
+        /// 
+        [DataMember(Name="return", EmitDefaultValue=false)]
+        public int? _Return { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Return {\n");
+            sb.Append("  _Return: ").Append(_Return).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Return);
+        }
+
+        /// 
+        /// Returns true if Return instances are equal
+        /// 
+        /// Instance of Return to be compared
+        /// Boolean
+        public bool Equals(Return input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this._Return == input._Return ||
+                    (this._Return != null &&
+                    this._Return.Equals(input._Return))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this._Return != null)
+                    hashCode = hashCode * 59 + this._Return.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
new file mode 100644
index 000000000000..54ea66dd81b2
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// SpecialModelName
+    /// 
+    [DataContract]
+    public partial class SpecialModelName :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// specialPropertyName.
+        public SpecialModelName(long? specialPropertyName = default(long?))
+        {
+            this.SpecialPropertyName = specialPropertyName;
+        }
+        
+        /// 
+        /// Gets or Sets SpecialPropertyName
+        /// 
+        [DataMember(Name="$special[property.name]", EmitDefaultValue=false)]
+        public long? SpecialPropertyName { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SpecialModelName {\n");
+            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SpecialModelName);
+        }
+
+        /// 
+        /// Returns true if SpecialModelName instances are equal
+        /// 
+        /// Instance of SpecialModelName to be compared
+        /// Boolean
+        public bool Equals(SpecialModelName input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SpecialPropertyName == input.SpecialPropertyName ||
+                    (this.SpecialPropertyName != null &&
+                    this.SpecialPropertyName.Equals(input.SpecialPropertyName))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SpecialPropertyName != null)
+                    hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
new file mode 100644
index 000000000000..df4dc6e486dc
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
@@ -0,0 +1,110 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// StringBooleanMap
+    /// 
+    [DataContract]
+    public partial class StringBooleanMap : Dictionary,  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        [JsonConstructorAttribute]
+        public StringBooleanMap() : base()
+        {
+        }
+        
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StringBooleanMap {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StringBooleanMap);
+        }
+
+        /// 
+        /// Returns true if StringBooleanMap instances are equal
+        /// 
+        /// Instance of StringBooleanMap to be compared
+        /// Boolean
+        public bool Equals(StringBooleanMap input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input);
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
new file mode 100644
index 000000000000..f95860219eeb
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
@@ -0,0 +1,140 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// Tag
+    /// 
+    [DataContract]
+    public partial class Tag :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// id.
+        /// name.
+        public Tag(long? id = default(long?), string name = default(string))
+        {
+            this.Id = id;
+            this.Name = name;
+        }
+        
+        /// 
+        /// Gets or Sets Id
+        /// 
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+
+        /// 
+        /// Gets or Sets Name
+        /// 
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Tag {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Tag);
+        }
+
+        /// 
+        /// Returns true if Tag instances are equal
+        /// 
+        /// Instance of Tag to be compared
+        /// Boolean
+        public bool Equals(Tag input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
new file mode 100644
index 000000000000..cf491294ec95
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
@@ -0,0 +1,237 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// 
+    /// User
+    /// 
+    [DataContract]
+    public partial class User :  IEquatable, IValidatableObject
+    {
+        /// 
+        /// Initializes a new instance of the  class.
+        /// 
+        /// id.
+        /// username.
+        /// firstName.
+        /// lastName.
+        /// email.
+        /// password.
+        /// phone.
+        /// User Status.
+        public User(long? id = default(long?), string username = default(string), string firstName = default(string), string lastName = default(string), string email = default(string), string password = default(string), string phone = default(string), int? userStatus = default(int?))
+        {
+            this.Id = id;
+            this.Username = username;
+            this.FirstName = firstName;
+            this.LastName = lastName;
+            this.Email = email;
+            this.Password = password;
+            this.Phone = phone;
+            this.UserStatus = userStatus;
+        }
+        
+        /// 
+        /// Gets or Sets Id
+        /// 
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+
+        /// 
+        /// Gets or Sets Username
+        /// 
+        [DataMember(Name="username", EmitDefaultValue=false)]
+        public string Username { get; set; }
+
+        /// 
+        /// Gets or Sets FirstName
+        /// 
+        [DataMember(Name="firstName", EmitDefaultValue=false)]
+        public string FirstName { get; set; }
+
+        /// 
+        /// Gets or Sets LastName
+        /// 
+        [DataMember(Name="lastName", EmitDefaultValue=false)]
+        public string LastName { get; set; }
+
+        /// 
+        /// Gets or Sets Email
+        /// 
+        [DataMember(Name="email", EmitDefaultValue=false)]
+        public string Email { get; set; }
+
+        /// 
+        /// Gets or Sets Password
+        /// 
+        [DataMember(Name="password", EmitDefaultValue=false)]
+        public string Password { get; set; }
+
+        /// 
+        /// Gets or Sets Phone
+        /// 
+        [DataMember(Name="phone", EmitDefaultValue=false)]
+        public string Phone { get; set; }
+
+        /// 
+        /// User Status
+        /// 
+        /// User Status
+        [DataMember(Name="userStatus", EmitDefaultValue=false)]
+        public int? UserStatus { get; set; }
+
+        /// 
+        /// Returns the string presentation of the object
+        /// 
+        /// String presentation of the object
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class User {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+            sb.Append("  LastName: ").Append(LastName).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Phone: ").Append(Phone).Append("\n");
+            sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// 
+        /// Returns the JSON string presentation of the object
+        /// 
+        /// JSON string presentation of the object
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// 
+        /// Returns true if objects are equal
+        /// 
+        /// Object to be compared
+        /// Boolean
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as User);
+        }
+
+        /// 
+        /// Returns true if User instances are equal
+        /// 
+        /// Instance of User to be compared
+        /// Boolean
+        public bool Equals(User input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.Username == input.Username ||
+                    (this.Username != null &&
+                    this.Username.Equals(input.Username))
+                ) && 
+                (
+                    this.FirstName == input.FirstName ||
+                    (this.FirstName != null &&
+                    this.FirstName.Equals(input.FirstName))
+                ) && 
+                (
+                    this.LastName == input.LastName ||
+                    (this.LastName != null &&
+                    this.LastName.Equals(input.LastName))
+                ) && 
+                (
+                    this.Email == input.Email ||
+                    (this.Email != null &&
+                    this.Email.Equals(input.Email))
+                ) && 
+                (
+                    this.Password == input.Password ||
+                    (this.Password != null &&
+                    this.Password.Equals(input.Password))
+                ) && 
+                (
+                    this.Phone == input.Phone ||
+                    (this.Phone != null &&
+                    this.Phone.Equals(input.Phone))
+                ) && 
+                (
+                    this.UserStatus == input.UserStatus ||
+                    (this.UserStatus != null &&
+                    this.UserStatus.Equals(input.UserStatus))
+                );
+        }
+
+        /// 
+        /// Gets the hash code
+        /// 
+        /// Hash code
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.Username != null)
+                    hashCode = hashCode * 59 + this.Username.GetHashCode();
+                if (this.FirstName != null)
+                    hashCode = hashCode * 59 + this.FirstName.GetHashCode();
+                if (this.LastName != null)
+                    hashCode = hashCode * 59 + this.LastName.GetHashCode();
+                if (this.Email != null)
+                    hashCode = hashCode * 59 + this.Email.GetHashCode();
+                if (this.Password != null)
+                    hashCode = hashCode * 59 + this.Password.GetHashCode();
+                if (this.Phone != null)
+                    hashCode = hashCode * 59 + this.Phone.GetHashCode();
+                if (this.UserStatus != null)
+                    hashCode = hashCode * 59 + this.UserStatus.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// 
+        /// To validate all properties of the instance
+        /// 
+        /// Validation context
+        /// Validation Result
+        IEnumerable IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
new file mode 100644
index 000000000000..af2274727547
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -0,0 +1,78 @@
+
+
+
+  
+    
+    Debug
+    AnyCPU
+    {321C8C3F-0156-40C1-AE42-D59761FB9B6C}
+    Library
+    Properties
+    Org.OpenAPITools
+    Org.OpenAPITools
+    v4.5
+    512
+  
+  
+    true
+    full
+    false
+    bin\Debug\
+    DEBUG;TRACE
+    prompt
+    4
+  
+  
+    pdbonly
+    true
+    bin\Release\
+    TRACE
+    prompt
+    4
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+      ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+      ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+      ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+    
+    
+      $(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+      ..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+      ..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+      ..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll
+    
+    
+        $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+        ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+        ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll
+      ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll
+    
+  
+  
+    
+  
+  
+      
+  
+  
+
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
new file mode 100644
index 000000000000..c49c57e44030
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -0,0 +1,41 @@
+
+
+    
+        
+        $id$
+        OpenAPI Library
+
+        
+        $version$
+
+        
+        $author$
+
+        
+        $author$
+        false
+        false
+
+        
+        A library generated from a OpenAPI doc
+        http://www.apache.org/licenses/LICENSE-2.0.html
+
+        
+        
+
+            
+            
+            
+
+        
+    
+    
+
+        
+        
+        
+
+    
+
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000000..d1abdf7936aa
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenAPI Library")]
+[assembly: AssemblyDescription("A library generated from a OpenAPI doc")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("OpenAPI")]
+[assembly: AssemblyProduct("OpenAPILibrary")]
+[assembly: AssemblyCopyright("No Copyright")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/packages.config b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/packages.config
new file mode 100644
index 000000000000..3caf34e0d765
--- /dev/null
+++ b/samples/openapi3/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/packages.config
@@ -0,0 +1,6 @@
+
+
+  
+  
+  
+
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.nuspec b/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.nuspec
deleted file mode 100644
index 889fe96ab03c..000000000000
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.nuspec
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-    
-        IO.Swagger
-        IO.Swagger
-        1.0.0
-        swagger-codegen
-        swagger-codegen
-        false
-        NancyFx IO.Swagger API
-        http://swagger.io/terms/
-        http://www.apache.org/licenses/LICENSE-2.0.html
-    
-
\ No newline at end of file
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
index ebaa3c8d4f16..db083b73bdc7 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/ApiResponse.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// Describes the result of uploading an image resource
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
index bf811614b37f..1bfb30abb752 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Category.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// A category for a pet
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
index 0495a36f138c..7bdec1016958 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Order.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// An order for a pets from the pet store
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
index f945a0fdd78a..a3f02e090883 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Pet.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// A pet for sale in the pet store
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
index 02d1e40f1ece..7ce321d25114 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/Tag.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// A tag for a pet
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
index 99f401750dfc..04d33ca07f77 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Models/User.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Sharpility.Extensions;
 using NodaTime;
 
-namespace IO.Swagger.v2.Models
+namespace Org.OpenAPITools.v2.Models
 {
     /// 
     /// A User who is purchasing from the pet store
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/PetModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
similarity index 86%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Modules/PetModule.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
index 2e5d229cdfe3..9cdfe6b814e6 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/PetModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/PetModule.cs
@@ -3,11 +3,11 @@ using Nancy;
 using Nancy.ModelBinding;
 using System.Collections.Generic;
 using Sharpility.Base;
-using IO.Swagger.v2.Models;
-using IO.Swagger.v2.Utils;
+using Org.OpenAPITools.v2.Models;
+using Org.OpenAPITools.v2.Utils;
 using NodaTime;
 
-namespace IO.Swagger.v2.Modules
+namespace Org.OpenAPITools.v2.Modules
 { 
     /// 
     /// Status values that need to be considered for filter
@@ -33,11 +33,11 @@ namespace IO.Swagger.v2.Modules
         { 
             Post["/pet"] = parameters =>
             {
-                var body = this.Bind();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'AddPet'");
+                var pet = this.Bind();
+                Preconditions.IsNotNull(pet, "Required parameter: 'pet' is missing at 'AddPet'");
                 
-                service.AddPet(Context, body);
-                return new Response { ContentType = "application/xml"};
+                service.AddPet(Context, pet);
+                return new Response { ContentType = ""};
             };
 
             Delete["/pet/{petId}"] = parameters =>
@@ -47,7 +47,7 @@ namespace IO.Swagger.v2.Modules
                 Preconditions.IsNotNull(petId, "Required parameter: 'petId' is missing at 'DeletePet'");
                 
                 service.DeletePet(Context, petId, apiKey);
-                return new Response { ContentType = "application/xml"};
+                return new Response { ContentType = ""};
             };
 
             Get["/pet/findByStatus"] = parameters =>
@@ -76,11 +76,11 @@ namespace IO.Swagger.v2.Modules
 
             Put["/pet"] = parameters =>
             {
-                var body = this.Bind();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'UpdatePet'");
+                var pet = this.Bind();
+                Preconditions.IsNotNull(pet, "Required parameter: 'pet' is missing at 'UpdatePet'");
                 
-                service.UpdatePet(Context, body);
-                return new Response { ContentType = "application/xml"};
+                service.UpdatePet(Context, pet);
+                return new Response { ContentType = ""};
             };
 
             Post["/pet/{petId}"] = parameters =>
@@ -91,7 +91,7 @@ namespace IO.Swagger.v2.Modules
                 Preconditions.IsNotNull(petId, "Required parameter: 'petId' is missing at 'UpdatePetWithForm'");
                 
                 service.UpdatePetWithForm(Context, petId, name, status);
-                return new Response { ContentType = "application/xml"};
+                return new Response { ContentType = ""};
             };
 
             Post["/pet/{petId}/uploadImage"] = parameters =>
@@ -115,9 +115,9 @@ namespace IO.Swagger.v2.Modules
         /// 
         /// 
         /// Context of request
-        /// Pet object that needs to be added to the store
+        /// Pet object that needs to be added to the store
         /// 
-        void AddPet(NancyContext context, Pet body);
+        void AddPet(NancyContext context, Pet pet);
 
         /// 
         /// 
@@ -156,9 +156,9 @@ namespace IO.Swagger.v2.Modules
         /// 
         /// 
         /// Context of request
-        /// Pet object that needs to be added to the store
+        /// Pet object that needs to be added to the store
         /// 
-        void UpdatePet(NancyContext context, Pet body);
+        void UpdatePet(NancyContext context, Pet pet);
 
         /// 
         /// 
@@ -186,9 +186,9 @@ namespace IO.Swagger.v2.Modules
     /// 
     public abstract class AbstractPetService: PetService
     {
-        public virtual void AddPet(NancyContext context, Pet body)
+        public virtual void AddPet(NancyContext context, Pet pet)
         {
-            AddPet(body);
+            AddPet(pet);
         }
 
         public virtual void DeletePet(NancyContext context, long? petId, string apiKey)
@@ -211,9 +211,9 @@ namespace IO.Swagger.v2.Modules
             return GetPetById(petId);
         }
 
-        public virtual void UpdatePet(NancyContext context, Pet body)
+        public virtual void UpdatePet(NancyContext context, Pet pet)
         {
-            UpdatePet(body);
+            UpdatePet(pet);
         }
 
         public virtual void UpdatePetWithForm(NancyContext context, long? petId, string name, string status)
@@ -226,7 +226,7 @@ namespace IO.Swagger.v2.Modules
             return UploadFile(petId, additionalMetadata, file);
         }
 
-        protected abstract void AddPet(Pet body);
+        protected abstract void AddPet(Pet pet);
 
         protected abstract void DeletePet(long? petId, string apiKey);
 
@@ -236,7 +236,7 @@ namespace IO.Swagger.v2.Modules
 
         protected abstract Pet GetPetById(long? petId);
 
-        protected abstract void UpdatePet(Pet body);
+        protected abstract void UpdatePet(Pet pet);
 
         protected abstract void UpdatePetWithForm(long? petId, string name, string status);
 
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/StoreModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
similarity index 85%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Modules/StoreModule.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
index e5eed7a24855..be42a7b8b520 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/StoreModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/StoreModule.cs
@@ -3,11 +3,11 @@ using Nancy;
 using Nancy.ModelBinding;
 using System.Collections.Generic;
 using Sharpility.Base;
-using IO.Swagger.v2.Models;
-using IO.Swagger.v2.Utils;
+using Org.OpenAPITools.v2.Models;
+using Org.OpenAPITools.v2.Utils;
 using NodaTime;
 
-namespace IO.Swagger.v2.Modules
+namespace Org.OpenAPITools.v2.Modules
 { 
 
     /// 
@@ -27,7 +27,7 @@ namespace IO.Swagger.v2.Modules
                 Preconditions.IsNotNull(orderId, "Required parameter: 'orderId' is missing at 'DeleteOrder'");
                 
                 service.DeleteOrder(Context, orderId);
-                return new Response { ContentType = "application/xml"};
+                return new Response { ContentType = ""};
             };
 
             Get["/store/inventory"] = parameters =>
@@ -46,10 +46,10 @@ namespace IO.Swagger.v2.Modules
 
             Post["/store/order"] = parameters =>
             {
-                var body = this.Bind();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'PlaceOrder'");
+                var order = this.Bind();
+                Preconditions.IsNotNull(order, "Required parameter: 'order' is missing at 'PlaceOrder'");
                 
-                return service.PlaceOrder(Context, body);
+                return service.PlaceOrder(Context, order);
             };
         }
     }
@@ -86,9 +86,9 @@ namespace IO.Swagger.v2.Modules
         /// 
         /// 
         /// Context of request
-        /// order placed for purchasing the pet
+        /// order placed for purchasing the pet
         /// Order
-        Order PlaceOrder(NancyContext context, Order body);
+        Order PlaceOrder(NancyContext context, Order order);
     }
 
     /// 
@@ -111,9 +111,9 @@ namespace IO.Swagger.v2.Modules
             return GetOrderById(orderId);
         }
 
-        public virtual Order PlaceOrder(NancyContext context, Order body)
+        public virtual Order PlaceOrder(NancyContext context, Order order)
         {
-            return PlaceOrder(body);
+            return PlaceOrder(order);
         }
 
         protected abstract void DeleteOrder(string orderId);
@@ -122,7 +122,7 @@ namespace IO.Swagger.v2.Modules
 
         protected abstract Order GetOrderById(long? orderId);
 
-        protected abstract Order PlaceOrder(Order body);
+        protected abstract Order PlaceOrder(Order order);
     }
 
 }
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/UserModule.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
similarity index 75%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Modules/UserModule.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
index 978013f17bbb..c35bc62dae10 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Modules/UserModule.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Modules/UserModule.cs
@@ -3,11 +3,11 @@ using Nancy;
 using Nancy.ModelBinding;
 using System.Collections.Generic;
 using Sharpility.Base;
-using IO.Swagger.v2.Models;
-using IO.Swagger.v2.Utils;
+using Org.OpenAPITools.v2.Models;
+using Org.OpenAPITools.v2.Utils;
 using NodaTime;
 
-namespace IO.Swagger.v2.Modules
+namespace Org.OpenAPITools.v2.Modules
 { 
 
     /// 
@@ -23,29 +23,29 @@ namespace IO.Swagger.v2.Modules
         { 
             Post["/user"] = parameters =>
             {
-                var body = this.Bind();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'CreateUser'");
+                var user = this.Bind();
+                Preconditions.IsNotNull(user, "Required parameter: 'user' is missing at 'CreateUser'");
                 
-                service.CreateUser(Context, body);
-                return new Response { ContentType = "application/xml"};
+                service.CreateUser(Context, user);
+                return new Response { ContentType = ""};
             };
 
             Post["/user/createWithArray"] = parameters =>
             {
-                var body = this.Bind>();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'CreateUsersWithArrayInput'");
+                var user = this.Bind>();
+                Preconditions.IsNotNull(user, "Required parameter: 'user' is missing at 'CreateUsersWithArrayInput'");
                 
-                service.CreateUsersWithArrayInput(Context, body);
-                return new Response { ContentType = "application/xml"};
+                service.CreateUsersWithArrayInput(Context, user);
+                return new Response { ContentType = ""};
             };
 
             Post["/user/createWithList"] = parameters =>
             {
-                var body = this.Bind>();
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'CreateUsersWithListInput'");
+                var user = this.Bind>();
+                Preconditions.IsNotNull(user, "Required parameter: 'user' is missing at 'CreateUsersWithListInput'");
                 
-                service.CreateUsersWithListInput(Context, body);
-                return new Response { ContentType = "application/xml"};
+                service.CreateUsersWithListInput(Context, user);
+                return new Response { ContentType = ""};
             };
 
             Delete["/user/{username}"] = parameters =>
@@ -54,7 +54,7 @@ namespace IO.Swagger.v2.Modules
                 Preconditions.IsNotNull(username, "Required parameter: 'username' is missing at 'DeleteUser'");
                 
                 service.DeleteUser(Context, username);
-                return new Response { ContentType = "application/xml"};
+                return new Response { ContentType = ""};
             };
 
             Get["/user/{username}"] = parameters =>
@@ -80,19 +80,19 @@ namespace IO.Swagger.v2.Modules
             {
                 
                 service.LogoutUser(Context);
-                return new Response { ContentType = "application/xml"};
+                return new Response { ContentType = ""};
             };
 
             Put["/user/{username}"] = parameters =>
             {
                 var username = Parameters.ValueOf(parameters, Context.Request, "username", ParameterType.Path);
-                var body = this.Bind();
+                var user = this.Bind();
                 Preconditions.IsNotNull(username, "Required parameter: 'username' is missing at 'UpdateUser'");
                 
-                Preconditions.IsNotNull(body, "Required parameter: 'body' is missing at 'UpdateUser'");
+                Preconditions.IsNotNull(user, "Required parameter: 'user' is missing at 'UpdateUser'");
                 
-                service.UpdateUser(Context, username, body);
-                return new Response { ContentType = "application/xml"};
+                service.UpdateUser(Context, username, user);
+                return new Response { ContentType = ""};
             };
         }
     }
@@ -106,25 +106,25 @@ namespace IO.Swagger.v2.Modules
         /// This can only be done by the logged in user.
         /// 
         /// Context of request
-        /// Created user object
+        /// Created user object
         /// 
-        void CreateUser(NancyContext context, User body);
+        void CreateUser(NancyContext context, User user);
 
         /// 
         /// 
         /// 
         /// Context of request
-        /// List of user object
+        /// List of user object
         /// 
-        void CreateUsersWithArrayInput(NancyContext context, List body);
+        void CreateUsersWithArrayInput(NancyContext context, List user);
 
         /// 
         /// 
         /// 
         /// Context of request
-        /// List of user object
+        /// List of user object
         /// 
-        void CreateUsersWithListInput(NancyContext context, List body);
+        void CreateUsersWithListInput(NancyContext context, List user);
 
         /// 
         /// This can only be done by the logged in user.
@@ -138,7 +138,7 @@ namespace IO.Swagger.v2.Modules
         /// 
         /// 
         /// Context of request
-        /// The name that needs to be fetched. Use user1 for testing. 
+        /// The name that needs to be fetched. Use user1 for testing.
         /// User
         User GetUserByName(NancyContext context, string username);
 
@@ -163,9 +163,9 @@ namespace IO.Swagger.v2.Modules
         /// 
         /// Context of request
         /// name that need to be deleted
-        /// Updated user object
+        /// Updated user object
         /// 
-        void UpdateUser(NancyContext context, string username, User body);
+        void UpdateUser(NancyContext context, string username, User user);
     }
 
     /// 
@@ -173,19 +173,19 @@ namespace IO.Swagger.v2.Modules
     /// 
     public abstract class AbstractUserService: UserService
     {
-        public virtual void CreateUser(NancyContext context, User body)
+        public virtual void CreateUser(NancyContext context, User user)
         {
-            CreateUser(body);
+            CreateUser(user);
         }
 
-        public virtual void CreateUsersWithArrayInput(NancyContext context, List body)
+        public virtual void CreateUsersWithArrayInput(NancyContext context, List user)
         {
-            CreateUsersWithArrayInput(body);
+            CreateUsersWithArrayInput(user);
         }
 
-        public virtual void CreateUsersWithListInput(NancyContext context, List body)
+        public virtual void CreateUsersWithListInput(NancyContext context, List user)
         {
-            CreateUsersWithListInput(body);
+            CreateUsersWithListInput(user);
         }
 
         public virtual void DeleteUser(NancyContext context, string username)
@@ -208,16 +208,16 @@ namespace IO.Swagger.v2.Modules
             LogoutUser();
         }
 
-        public virtual void UpdateUser(NancyContext context, string username, User body)
+        public virtual void UpdateUser(NancyContext context, string username, User user)
         {
-            UpdateUser(username, body);
+            UpdateUser(username, user);
         }
 
-        protected abstract void CreateUser(User body);
+        protected abstract void CreateUser(User user);
 
-        protected abstract void CreateUsersWithArrayInput(List body);
+        protected abstract void CreateUsersWithArrayInput(List user);
 
-        protected abstract void CreateUsersWithListInput(List body);
+        protected abstract void CreateUsersWithListInput(List user);
 
         protected abstract void DeleteUser(string username);
 
@@ -227,7 +227,7 @@ namespace IO.Swagger.v2.Modules
 
         protected abstract void LogoutUser();
 
-        protected abstract void UpdateUser(string username, User body);
+        protected abstract void UpdateUser(string username, User user);
     }
 
 }
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.csproj
similarity index 92%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index e1577197b6fc..04b710b25cbd 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -6,8 +6,8 @@
         {768B8DC6-54EE-4D40-9B20-7857E1D742A4}
         Library
         Properties
-        IO.Swagger.v2
-        IO.Swagger
+        Org.OpenAPITools.v2
+        Org.OpenAPITools
             v4.5
         512
     
@@ -19,7 +19,7 @@
         DEBUG;TRACE
         prompt
         4
-        bin\Debug\IO.Swagger.XML
+        bin\Debug\Org.OpenAPITools.XML
     
     
         pdbonly
@@ -28,7 +28,7 @@
         TRACE
         prompt
         4
-        bin\Release\IO.Swagger.XML
+        bin\Release\Org.OpenAPITools.XML
     
     
         
diff --git a/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
new file mode 100644
index 000000000000..102c48def9d8
--- /dev/null
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -0,0 +1,13 @@
+
+
+    
+        Org.OpenAPITools
+        Org.OpenAPITools
+        1.0.0
+        openapi-generator
+        openapi-generator
+        false
+        NancyFx Org.OpenAPITools API
+        http://www.apache.org/licenses/LICENSE-2.0.html
+    
+
\ No newline at end of file
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Utils/LocalDateConverter.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/LocalDateConverter.cs
similarity index 97%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Utils/LocalDateConverter.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/LocalDateConverter.cs
index d801e962c6a5..9e7cfd8a8570 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Utils/LocalDateConverter.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/LocalDateConverter.cs
@@ -5,7 +5,7 @@ using NodaTime.Text;
 using System;
 using System.Collections.Generic;
 
-namespace IO.Swagger.v2.Utils
+namespace Org.OpenAPITools.v2.Utils
 {
     /// 
     /// (De)serializes a  to a string using 
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Utils/Parameters.cs b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/Parameters.cs
similarity index 99%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/Utils/Parameters.cs
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/Parameters.cs
index d21989457639..9bc5408abfea 100644
--- a/samples/server/petstore/nancyfx/src/IO.Swagger/Utils/Parameters.cs
+++ b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/Utils/Parameters.cs
@@ -9,7 +9,7 @@ using Sharpility.Base;
 using Sharpility.Extensions;
 using Sharpility.Util;
 
-namespace IO.Swagger.v2.Utils
+namespace Org.OpenAPITools.v2.Utils
 {
     internal static class Parameters
     {
diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/packages.config b/samples/server/petstore/nancyfx/src/Org.OpenAPITools/packages.config
similarity index 100%
rename from samples/server/petstore/nancyfx/src/IO.Swagger/packages.config
rename to samples/server/petstore/nancyfx/src/Org.OpenAPITools/packages.config
diff --git a/shippable.yml b/shippable.yml
index 2a80a90cfb1c..27c3ccec46e6 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -37,3 +37,5 @@ build:
     - mvn --quiet verify -P samples.shippable
     # generate all petstore samples (client, servers, doc)
     - ./bin/run-all-petstore
+    # generate all petstore samples (openapi3)
+    - ./bin/openapi3/run-all-petstore

From 7b04732f0953d9d3ed9b04daea8e605c8c9d6346 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Mon, 13 Aug 2018 21:30:18 +0800
Subject: [PATCH 18/27] better explain usage (#794)

---
 modules/openapi-generator-maven-plugin/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index ddd40d81bf61..5494ccb6ff8d 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -37,6 +37,8 @@ mvn clean compile
 
 ### General Configuration parameters
 
+:bulb: These **general** configurations should be in the same level
+
 - `inputSpec` - OpenAPI Spec file path
 - `validateSpec` - Whether or not to validate the input spec prior to generation. Invalid specifications will result in an error.
 - `language` - target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer)
@@ -49,7 +51,7 @@ mvn clean compile
 - `invokerPackage` - the package to use for the generated invoker objects
 - `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums
 - `withXml` - enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML)
-- `configOptions` - a map of language-specific parameters (see below)
+- `configOptions` - a map of language-specific parameters. To show a full list of generator-specified parameters (options), please use `configHelp` (explained below)
 - `configHelp` - dumps the configuration help for the specified library (generates no sources)
 - `ignoreFileOverride` - specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs
 - `generateApis` - generate the apis (`true` by default)

From 08ca54d3d57fddb8f70f95228ad44015958b512c Mon Sep 17 00:00:00 2001
From: Geoff Brown 
Date: Mon, 13 Aug 2018 13:27:31 -0400
Subject: [PATCH 19/27] Fixed date formatting in typescript node client (#786)

Fixes #785
---
 .../src/main/resources/typescript-node/models.mustache          | 2 +-
 samples/client/petstore/typescript-node/default/model/models.ts | 2 +-
 samples/client/petstore/typescript-node/npm/model/models.ts     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index 279340121611..b4d7d78dfea7 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -97,7 +97,7 @@ export class ObjectSerializer {
             }
             return transformedData;
         } else if (type === "Date") {
-            return data.toString();
+            return data.toISOString();
         } else {
             if (enumsMap[type]) {
                 return data;
diff --git a/samples/client/petstore/typescript-node/default/model/models.ts b/samples/client/petstore/typescript-node/default/model/models.ts
index 8ed47b194d73..7b0dc89cbf78 100644
--- a/samples/client/petstore/typescript-node/default/model/models.ts
+++ b/samples/client/petstore/typescript-node/default/model/models.ts
@@ -91,7 +91,7 @@ export class ObjectSerializer {
             }
             return transformedData;
         } else if (type === "Date") {
-            return data.toString();
+            return data.toISOString();
         } else {
             if (enumsMap[type]) {
                 return data;
diff --git a/samples/client/petstore/typescript-node/npm/model/models.ts b/samples/client/petstore/typescript-node/npm/model/models.ts
index 8ed47b194d73..7b0dc89cbf78 100644
--- a/samples/client/petstore/typescript-node/npm/model/models.ts
+++ b/samples/client/petstore/typescript-node/npm/model/models.ts
@@ -91,7 +91,7 @@ export class ObjectSerializer {
             }
             return transformedData;
         } else if (type === "Date") {
-            return data.toString();
+            return data.toISOString();
         } else {
             if (enumsMap[type]) {
                 return data;

From 7acba8a4d86b3cdadc5707345817513dad11c36f Mon Sep 17 00:00:00 2001
From: Jim Schubert 
Date: Mon, 13 Aug 2018 23:45:50 -0400
Subject: [PATCH 20/27] [generator] Cleanup debugOpenAPI usage/display text
 (#804)

---
 .../org/openapitools/codegen/DefaultGenerator.java    | 11 ++++++-----
 .../codegen/config/CodegenConfigurator.java           |  4 ++--
 .../src/main/resources/codegen/README.mustache        |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index 6d4264f48c1e..1ba9611cfd36 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -169,14 +169,15 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         if (!generateApiTests && !generateModelTests) {
             config.additionalProperties().put(CodegenConstants.EXCLUDE_TESTS, true);
         }
-        // for backward compatibility
-        if (System.getProperty("debugSwagger") != null) {
-            LOGGER.info("Please use system property 'debugOpenAPI' instead of 'debugSwagger'.");
-            Json.prettyPrint(openAPI);
-        }
+
 
         if (System.getProperty("debugOpenAPI") != null) {
             Json.prettyPrint(openAPI);
+        } else if (System.getProperty("debugSwagger") != null) {
+            // This exists for backward compatibility
+            // We fall to this block only if debugOpenAPI is null. No need to dump this twice.
+            LOGGER.info("Please use system property 'debugOpenAPI' instead of 'debugSwagger'.");
+            Json.prettyPrint(openAPI);
         }
 
         config.processOpts();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index e787821cdd9c..8ec858f2bfb6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -596,12 +596,12 @@ public class CodegenConfigurator implements Serializable {
             return;
         }
         LOGGER.info("\nVERBOSE MODE: ON. Additional debug options are injected" +
-                "\n - [debugSwagger] prints the openapi specification as interpreted by the codegen" +
+                "\n - [debugOpenAPI] prints the OpenAPI specification as interpreted by the codegen" +
                 "\n - [debugModels] prints models passed to the template engine" +
                 "\n - [debugOperations] prints operations passed to the template engine" +
                 "\n - [debugSupportingFiles] prints additional data passed to the template engine");
 
-        System.setProperty("debugSwagger", "");
+        System.setProperty("debugOpenAPI", "");
         System.setProperty("debugModels", "");
         System.setProperty("debugOperations", "");
         System.setProperty("debugSupportingFiles", "");
diff --git a/modules/openapi-generator/src/main/resources/codegen/README.mustache b/modules/openapi-generator/src/main/resources/codegen/README.mustache
index 2b575c6b1360..d8c6ab3ca32a 100644
--- a/modules/openapi-generator/src/main/resources/codegen/README.mustache
+++ b/modules/openapi-generator/src/main/resources/codegen/README.mustache
@@ -62,7 +62,7 @@ the object you have available during client generation:
 
 ```
 # The following additional debug options are available for all codegen targets:
-# -DdebugSwagger prints the OpenAPI Specification as interpreted by the codegen
+# -DdebugOpenAPI prints the OpenAPI Specification as interpreted by the codegen
 # -DdebugModels prints models passed to the template engine
 # -DdebugOperations prints operations passed to the template engine
 # -DdebugSupportingFiles prints additional data passed to the template engine

From 56bba880e75524ae1480c52a701cc63557d7a8da Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Tue, 14 Aug 2018 17:47:59 +0800
Subject: [PATCH 21/27] 3.2.1 release (#807)

* 3.2.1 release

* roll back incorrect change to link

* update doc

* update 3.1.2 release

* Fix version table
---
 CI/pom.xml.bash                                       |  2 +-
 CI/pom.xml.circleci                                   |  2 +-
 CI/pom.xml.circleci.java7                             |  2 +-
 CI/pom.xml.ios                                        |  2 +-
 README.md                                             | 11 ++++++-----
 modules/openapi-generator-cli/pom.xml                 |  2 +-
 modules/openapi-generator-gradle-plugin/README.adoc   |  2 +-
 .../openapi-generator-gradle-plugin/gradle.properties |  2 +-
 modules/openapi-generator-gradle-plugin/pom.xml       |  2 +-
 .../samples/local-spec/README.md                      |  2 +-
 .../samples/local-spec/gradle.properties              |  2 +-
 modules/openapi-generator-maven-plugin/README.md      |  2 +-
 .../examples/java-client.xml                          |  2 +-
 .../examples/non-java-invalid-spec.xml                |  2 +-
 .../examples/non-java.xml                             |  2 +-
 modules/openapi-generator-maven-plugin/pom.xml        |  2 +-
 modules/openapi-generator-online/Dockerfile           |  2 +-
 modules/openapi-generator-online/pom.xml              |  2 +-
 modules/openapi-generator/pom.xml                     |  2 +-
 pom.xml                                               |  2 +-
 shippable.yml                                         |  2 +-
 21 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/CI/pom.xml.bash b/CI/pom.xml.bash
index 4f8c8a9d0c5a..5f8aedca5d70 100644
--- a/CI/pom.xml.bash
+++ b/CI/pom.xml.bash
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1-SNAPSHOT
+    3.2.1
     https://github.com/openapi-tools/openapi-generator
     
         scm:git:git@github.com:openapi-tools/openapi-generator.git
diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci
index 26296c47b1db..2fbb194e621b 100644
--- a/CI/pom.xml.circleci
+++ b/CI/pom.xml.circleci
@@ -10,7 +10,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1-SNAPSHOT
+    3.2.1
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7
index 56e6688a965e..4509d10472ce 100644
--- a/CI/pom.xml.circleci.java7
+++ b/CI/pom.xml.circleci.java7
@@ -10,7 +10,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1-SNAPSHOT
+    3.2.1
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/CI/pom.xml.ios b/CI/pom.xml.ios
index b349e84a9388..24a485d6c86f 100644
--- a/CI/pom.xml.ios
+++ b/CI/pom.xml.ios
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1-SNAPSHOT
+    3.2.1
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/README.md b/README.md
index 0ca16c6f12ed..ad38bf7950c0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 

 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.2.1`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.2.2`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
@@ -84,7 +84,8 @@ OpenAPI Generator Version    | Release Date | OpenAPI Spec compatibility | Notes
 ---------------------------- | ------------ | -------------------------- | -----
 4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes (no fallback)
 3.3.0 (upcoming minor release)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release (breaking changes with fallbacks)
-3.2.1 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.1-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release
+3.2.2 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.2-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release
+[3.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.1) | 14.08.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
 [3.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.0) | 06.08.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
 [3.1.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.2) | 25.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
 [3.1.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.1) | 18.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
@@ -144,16 +145,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.0/openapi-generator-cli-3.2.0.jar`
+JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.0/openapi-generator-cli-3.2.0.jar -O openapi-generator-cli.jar
+wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.0/openapi-generator-cli-3.2.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
index c87c7ae43c68..467f04870950 100644
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1-SNAPSHOT
+        3.2.1
         ../..
     
     4.0.0
diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc
index b379a9f61309..ba0eb6dab25e 100644
--- a/modules/openapi-generator-gradle-plugin/README.adoc
+++ b/modules/openapi-generator-gradle-plugin/README.adoc
@@ -34,7 +34,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "org.openapitools:openapi-generator-gradle-plugin:3.1.2"
+    classpath "org.openapitools:openapi-generator-gradle-plugin:3.2.1"
   }
 }
 
diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties
index dbe7a83aa08d..9edb40c869f8 100644
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,4 +1,4 @@
-openApiGeneratorVersion=3.2.1-SNAPSHOT
+openApiGeneratorVersion=3.2.1
 
 # BEGIN placeholders
 # these are just placeholders to allow contributors to build directly
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index eb1a0535fc0c..6bd9a19e3b8d 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1-SNAPSHOT
+        3.2.1
         ../..
     
     4.0.0
diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
index ec7af537cc36..81987ca31683 100644
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
@@ -17,5 +17,5 @@ gradle generateGoWithInvalidSpec
 The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
 
 ```bash
-gradle -PopenApiGeneratorVersion=3.2.0 openApiValidate
+gradle -PopenApiGeneratorVersion=3.2.1 openApiValidate
 ```
diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
index d5831f0dedb9..48df3c91578a 100644
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
@@ -1 +1 @@
-openApiGeneratorVersion=3.2.0
+openApiGeneratorVersion=3.2.1
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index 5494ccb6ff8d..bbef0ba27e51 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -11,7 +11,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 
     org.openapitools
     openapi-generator-maven-plugin
-    3.2.0
+    3.2.1
     
         
             
diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml
index 0c460241fa7f..30051bff0d2a 100644
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -12,7 +12,7 @@
             
                 org.openapitools
                 openapi-generator-maven-plugin
-                3.1.2
+                3.2.1
                 
                     
                         
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
index f21abd376454..a4f1d89aaf58 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
@@ -12,7 +12,7 @@
             
                 org.openapitools
                 openapi-generator-maven-plugin
-                3.1.2
+                3.2.1
                 
                     
                         
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml
index 4124bd25ef43..9b5adfee0be2 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml
@@ -12,7 +12,7 @@
             
                 org.openapitools
                 openapi-generator-maven-plugin
-                3.1.2
+                3.2.1
                 
                     
                         
diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml
index c4665cbf9e7d..ba66a7310f55 100644
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1-SNAPSHOT
+        3.2.1
         ../..
     
     openapi-generator-maven-plugin
diff --git a/modules/openapi-generator-online/Dockerfile b/modules/openapi-generator-online/Dockerfile
index 6f5a2b85622f..b37c13b817b6 100644
--- a/modules/openapi-generator-online/Dockerfile
+++ b/modules/openapi-generator-online/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine
 
 WORKDIR /generator
 
-COPY target/openapi-generator-online-3.2.1-SNAPSHOT.jar /generator/openapi-generator-online.jar
+COPY target/openapi-generator-online-3.2.1.jar /generator/openapi-generator-online.jar
 
 ENV GENERATOR_HOST=http://localhost
 
diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml
index 40f9bbcb156f..015c2f06db8e 100644
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1-SNAPSHOT
+        3.2.1
         ../..
     
     openapi-generator-online
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 29bfb49f4e2b..177b4a24c41f 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1-SNAPSHOT
+        3.2.1
         ../..
     
     4.0.0
diff --git a/pom.xml b/pom.xml
index 6756c1923d4a..8a5400eb0448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1-SNAPSHOT
+    3.2.1
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/shippable.yml b/shippable.yml
index 27c3ccec46e6..5ffc53d54238 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -12,7 +12,7 @@ build:
   ci:
     - mvn --quiet clean install
     # ensure all modifications created by 'mature' generators are in the git repo
-    - ./bin/utils/ensure-up-to-date
+    #- ./bin/utils/ensure-up-to-date
     # prepare environment for tests
     - sudo apt-get update -qq
     # install stack

From 79b993e6d5675e2e152cac405f08da535e4f1e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= 
Date: Tue, 14 Aug 2018 13:38:18 +0200
Subject: [PATCH 22/27] Prepare version 3.2.2-SNAPSHOT (#810)

---
 CI/pom.xml.bash                                                 | 2 +-
 CI/pom.xml.circleci                                             | 2 +-
 CI/pom.xml.circleci.java7                                       | 2 +-
 CI/pom.xml.ios                                                  | 2 +-
 modules/openapi-generator-cli/pom.xml                           | 2 +-
 modules/openapi-generator-gradle-plugin/gradle.properties       | 2 +-
 modules/openapi-generator-gradle-plugin/pom.xml                 | 2 +-
 modules/openapi-generator-maven-plugin/pom.xml                  | 2 +-
 modules/openapi-generator-online/Dockerfile                     | 2 +-
 modules/openapi-generator-online/pom.xml                        | 2 +-
 modules/openapi-generator/pom.xml                               | 2 +-
 pom.xml                                                         | 2 +-
 .../petstore/csharp/OpenAPIClient/.openapi-generator/VERSION    | 2 +-
 .../petstore/haskell-http-client/.openapi-generator/VERSION     | 2 +-
 samples/client/petstore/java/feign/.openapi-generator/VERSION   | 2 +-
 .../petstore/java/google-api-client/.openapi-generator/VERSION  | 2 +-
 samples/client/petstore/java/jersey1/.openapi-generator/VERSION | 2 +-
 .../petstore/java/jersey2-java6/.openapi-generator/VERSION      | 2 +-
 .../petstore/java/jersey2-java8/.openapi-generator/VERSION      | 2 +-
 samples/client/petstore/java/jersey2/.openapi-generator/VERSION | 2 +-
 .../java/okhttp-gson-parcelableModel/.openapi-generator/VERSION | 2 +-
 .../client/petstore/java/okhttp-gson/.openapi-generator/VERSION | 2 +-
 .../petstore/java/rest-assured/.openapi-generator/VERSION       | 2 +-
 .../client/petstore/java/resteasy/.openapi-generator/VERSION    | 2 +-
 .../java/resttemplate-withXml/.openapi-generator/VERSION        | 2 +-
 .../petstore/java/resttemplate/.openapi-generator/VERSION       | 2 +-
 .../client/petstore/java/retrofit/.openapi-generator/VERSION    | 2 +-
 .../petstore/java/retrofit2-play24/.openapi-generator/VERSION   | 2 +-
 .../petstore/java/retrofit2-play25/.openapi-generator/VERSION   | 2 +-
 .../client/petstore/java/retrofit2/.openapi-generator/VERSION   | 2 +-
 .../client/petstore/java/retrofit2rx/.openapi-generator/VERSION | 2 +-
 .../petstore/java/retrofit2rx2/.openapi-generator/VERSION       | 2 +-
 samples/client/petstore/java/vertx/.openapi-generator/VERSION   | 2 +-
 .../client/petstore/java/webclient/.openapi-generator/VERSION   | 2 +-
 .../client/petstore/kotlin-string/.openapi-generator/VERSION    | 2 +-
 .../petstore/kotlin-threetenbp/.openapi-generator/VERSION       | 2 +-
 samples/client/petstore/kotlin/.openapi-generator/VERSION       | 2 +-
 .../petstore/php/OpenAPIClient-php/.openapi-generator/VERSION   | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php   | 2 +-
 .../php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php    | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php  | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/ApiException.php  | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Configuration.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/HeaderSelector.php       | 2 +-
 .../OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php    | 2 +-
 .../OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php    | 2 +-
 .../php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php | 2 +-
 samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/Category.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php     | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Client.php  | 2 +-
 samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php       | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/File.php    | 2 +-
 .../php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php     | 2 +-
 .../php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php         | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php | 2 +-
 .../lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php   | 2 +-
 .../php/OpenAPIClient-php/lib/Model/Model200Response.php        | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelList.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php    | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Name.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php     | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Order.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php      | 2 +-
 samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php  | 2 +-
 .../php/OpenAPIClient-php/lib/Model/SpecialModelName.php        | 2 +-
 .../php/OpenAPIClient-php/lib/Model/StringBooleanMap.php        | 2 +-
 samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/User.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php     | 2 +-
 .../php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php     | 2 +-
 .../OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php     | 2 +-
 .../test/Model/AdditionalPropertiesClassTest.php                | 2 +-
 .../php/OpenAPIClient-php/test/Model/AnimalFarmTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php    | 2 +-
 .../php/OpenAPIClient-php/test/Model/ApiResponseTest.php        | 2 +-
 .../test/Model/ArrayOfArrayOfNumberOnlyTest.php                 | 2 +-
 .../php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php | 2 +-
 .../php/OpenAPIClient-php/test/Model/CapitalizationTest.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/CatTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php  | 2 +-
 .../php/OpenAPIClient-php/test/Model/ClassModelTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ClientTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/DogTest.php       | 2 +-
 .../php/OpenAPIClient-php/test/Model/EnumArraysTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php  | 2 +-
 .../OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/FileTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/FormatTestTest.php         | 2 +-
 .../php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php   | 2 +-
 .../Model/MixedPropertiesAndAdditionalPropertiesClassTest.php   | 2 +-
 .../php/OpenAPIClient-php/test/Model/Model200ResponseTest.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php | 2 +-
 .../php/OpenAPIClient-php/test/Model/ModelReturnTest.php        | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/NameTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/NumberOnlyTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/OrderTest.php     | 2 +-
 .../php/OpenAPIClient-php/test/Model/OuterCompositeTest.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/PetTest.php       | 2 +-
 .../php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php   | 2 +-
 .../php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/TagTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/UserTest.php      | 2 +-
 samples/client/petstore/spring-cloud/.openapi-generator/VERSION | 2 +-
 .../spring-cloud/src/main/java/org/openapitools/api/PetApi.java | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 samples/client/petstore/spring-stubs/.openapi-generator/VERSION | 2 +-
 .../spring-stubs/src/main/java/org/openapitools/api/PetApi.java | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../typescript-angular-v2/default/.openapi-generator/VERSION    | 2 +-
 .../typescript-angular-v2/npm/.openapi-generator/VERSION        | 2 +-
 .../with-interfaces/.openapi-generator/VERSION                  | 2 +-
 .../typescript-angular-v4.3/npm/.openapi-generator/VERSION      | 2 +-
 .../typescript-angular-v4/npm/.openapi-generator/VERSION        | 2 +-
 .../builds/default/.openapi-generator/VERSION                   | 2 +-
 .../builds/with-npm/.openapi-generator/VERSION                  | 2 +-
 .../builds/default/.openapi-generator/VERSION                   | 2 +-
 .../builds/with-npm/.openapi-generator/VERSION                  | 2 +-
 .../typescript-fetch/builds/default/.openapi-generator/VERSION  | 2 +-
 .../builds/es6-target/.openapi-generator/VERSION                | 2 +-
 .../builds/with-interfaces/.openapi-generator/VERSION           | 2 +-
 .../builds/with-npm-version/.openapi-generator/VERSION          | 2 +-
 .../petstore/typescript-inversify/.openapi-generator/VERSION    | 2 +-
 .../petstore/typescript-node/default/.openapi-generator/VERSION | 2 +-
 .../petstore/typescript-node/npm/.openapi-generator/VERSION     | 2 +-
 .../petstore/php/OpenAPIClient-php/.openapi-generator/VERSION   | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php   | 2 +-
 .../php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php    | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php  | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/ApiException.php  | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Configuration.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/HeaderSelector.php       | 2 +-
 .../OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php   | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php    | 2 +-
 .../OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php    | 2 +-
 .../php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/Category.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php     | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Client.php  | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php       | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/File.php    | 2 +-
 .../php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php     | 2 +-
 .../php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php         | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php | 2 +-
 .../lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php   | 2 +-
 .../php/OpenAPIClient-php/lib/Model/Model200Response.php        | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelList.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php    | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Name.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php     | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Order.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php      | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php  | 2 +-
 .../php/OpenAPIClient-php/lib/Model/SpecialModelName.php        | 2 +-
 .../php/OpenAPIClient-php/lib/Model/StringBooleanMap.php        | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php     | 2 +-
 .../client/petstore/php/OpenAPIClient-php/lib/Model/User.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php     | 2 +-
 .../php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php     | 2 +-
 .../OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php      | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php     | 2 +-
 .../test/Model/AdditionalPropertiesClassTest.php                | 2 +-
 .../php/OpenAPIClient-php/test/Model/AnimalFarmTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php    | 2 +-
 .../php/OpenAPIClient-php/test/Model/ApiResponseTest.php        | 2 +-
 .../test/Model/ArrayOfArrayOfNumberOnlyTest.php                 | 2 +-
 .../php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php  | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php | 2 +-
 .../php/OpenAPIClient-php/test/Model/CapitalizationTest.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/CatTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php  | 2 +-
 .../php/OpenAPIClient-php/test/Model/ClassModelTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ClientTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/DogTest.php       | 2 +-
 .../php/OpenAPIClient-php/test/Model/EnumArraysTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php  | 2 +-
 .../OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/FileTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/FormatTestTest.php         | 2 +-
 .../php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php    | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php   | 2 +-
 .../Model/MixedPropertiesAndAdditionalPropertiesClassTest.php   | 2 +-
 .../php/OpenAPIClient-php/test/Model/Model200ResponseTest.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php | 2 +-
 .../php/OpenAPIClient-php/test/Model/ModelReturnTest.php        | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/NameTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/NumberOnlyTest.php         | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/OrderTest.php     | 2 +-
 .../php/OpenAPIClient-php/test/Model/OuterCompositeTest.php     | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/PetTest.php       | 2 +-
 .../php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php      | 2 +-
 .../php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php   | 2 +-
 .../php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php   | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/TagTest.php       | 2 +-
 .../petstore/php/OpenAPIClient-php/test/Model/UserTest.php      | 2 +-
 .../jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION    | 2 +-
 .../server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION    | 2 +-
 .../jaxrs-cxf-non-spring-app/.openapi-generator/VERSION         | 2 +-
 samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION    | 2 +-
 .../server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION | 2 +-
 .../petstore/jaxrs-resteasy/default/.openapi-generator/VERSION  | 2 +-
 .../jaxrs-resteasy/eap-java8/.openapi-generator/VERSION         | 2 +-
 .../petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION | 2 +-
 .../petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION      | 2 +-
 .../petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION     | 2 +-
 .../petstore/jaxrs-spec-interface/.openapi-generator/VERSION    | 2 +-
 samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION   | 2 +-
 .../petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION   | 2 +-
 .../server/petstore/jaxrs/jersey1/.openapi-generator/VERSION    | 2 +-
 .../petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION   | 2 +-
 .../server/petstore/jaxrs/jersey2/.openapi-generator/VERSION    | 2 +-
 .../petstore/kotlin-server/ktor/.openapi-generator/VERSION      | 2 +-
 samples/server/petstore/kotlin-server/ktor/README.md            | 2 +-
 samples/server/petstore/php-lumen/.openapi-generator/VERSION    | 2 +-
 .../petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION | 2 +-
 samples/server/petstore/php-slim/.openapi-generator/VERSION     | 2 +-
 .../php-symfony/SymfonyBundle-php/.openapi-generator/VERSION    | 2 +-
 samples/server/petstore/php-ze-ph/.openapi-generator/VERSION    | 2 +-
 .../.openapi-generator/VERSION                                  | 2 +-
 .../output/rust-server-test/.openapi-generator/VERSION          | 2 +-
 .../petstore/spring-mvc-j8-async/.openapi-generator/VERSION     | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../spring-mvc-j8-localdatetime/.openapi-generator/VERSION      | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 samples/server/petstore/spring-mvc/.openapi-generator/VERSION   | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../spring-mvc/src/main/java/org/openapitools/api/FakeApi.java  | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../spring-mvc/src/main/java/org/openapitools/api/PetApi.java   | 2 +-
 .../spring-mvc/src/main/java/org/openapitools/api/StoreApi.java | 2 +-
 .../spring-mvc/src/main/java/org/openapitools/api/UserApi.java  | 2 +-
 .../springboot-beanvalidation/.openapi-generator/VERSION        | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../petstore/springboot-delegate-j8/.openapi-generator/VERSION  | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../petstore/springboot-delegate/.openapi-generator/VERSION     | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../springboot-implicitHeaders/.openapi-generator/VERSION       | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../petstore/springboot-reactive/.openapi-generator/VERSION     | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 .../petstore/springboot-useoptional/.openapi-generator/VERSION  | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../src/main/java/org/openapitools/api/FakeApi.java             | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../src/main/java/org/openapitools/api/PetApi.java              | 2 +-
 .../src/main/java/org/openapitools/api/StoreApi.java            | 2 +-
 .../src/main/java/org/openapitools/api/UserApi.java             | 2 +-
 samples/server/petstore/springboot/.openapi-generator/VERSION   | 2 +-
 .../src/main/java/org/openapitools/api/AnotherFakeApi.java      | 2 +-
 .../springboot/src/main/java/org/openapitools/api/FakeApi.java  | 2 +-
 .../main/java/org/openapitools/api/FakeClassnameTestApi.java    | 2 +-
 .../springboot/src/main/java/org/openapitools/api/PetApi.java   | 2 +-
 .../springboot/src/main/java/org/openapitools/api/StoreApi.java | 2 +-
 .../springboot/src/main/java/org/openapitools/api/UserApi.java  | 2 +-
 shippable.yml                                                   | 2 +-
 337 files changed, 337 insertions(+), 337 deletions(-)

diff --git a/CI/pom.xml.bash b/CI/pom.xml.bash
index 5f8aedca5d70..2e1dc9cc6248 100644
--- a/CI/pom.xml.bash
+++ b/CI/pom.xml.bash
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1
+    3.2.2-SNAPSHOT
     https://github.com/openapi-tools/openapi-generator
     
         scm:git:git@github.com:openapi-tools/openapi-generator.git
diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci
index 2fbb194e621b..42ad24673597 100644
--- a/CI/pom.xml.circleci
+++ b/CI/pom.xml.circleci
@@ -10,7 +10,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1
+    3.2.2-SNAPSHOT
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7
index 4509d10472ce..5b842449c921 100644
--- a/CI/pom.xml.circleci.java7
+++ b/CI/pom.xml.circleci.java7
@@ -10,7 +10,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1
+    3.2.2-SNAPSHOT
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/CI/pom.xml.ios b/CI/pom.xml.ios
index 24a485d6c86f..d451760e3152 100644
--- a/CI/pom.xml.ios
+++ b/CI/pom.xml.ios
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1
+    3.2.2-SNAPSHOT
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
index 467f04870950..ad962500592f 100644
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1
+        3.2.2-SNAPSHOT
         ../..
     
     4.0.0
diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties
index 9edb40c869f8..03931f4e38fa 100644
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,4 +1,4 @@
-openApiGeneratorVersion=3.2.1
+openApiGeneratorVersion=3.2.2-SNAPSHOT
 
 # BEGIN placeholders
 # these are just placeholders to allow contributors to build directly
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 6bd9a19e3b8d..12c9f9ecd24b 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1
+        3.2.2-SNAPSHOT
         ../..
     
     4.0.0
diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml
index ba66a7310f55..97eb10f18a95 100644
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1
+        3.2.2-SNAPSHOT
         ../..
     
     openapi-generator-maven-plugin
diff --git a/modules/openapi-generator-online/Dockerfile b/modules/openapi-generator-online/Dockerfile
index b37c13b817b6..e398494d6451 100644
--- a/modules/openapi-generator-online/Dockerfile
+++ b/modules/openapi-generator-online/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine
 
 WORKDIR /generator
 
-COPY target/openapi-generator-online-3.2.1.jar /generator/openapi-generator-online.jar
+COPY target/openapi-generator-online-3.2.2-SNAPSHOT.jar /generator/openapi-generator-online.jar
 
 ENV GENERATOR_HOST=http://localhost
 
diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml
index 015c2f06db8e..a4cd5b3c2ff5 100644
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1
+        3.2.2-SNAPSHOT
         ../..
     
     openapi-generator-online
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 177b4a24c41f..4fae6b39127b 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -3,7 +3,7 @@
     
         org.openapitools
         openapi-generator-project
-        3.2.1
+        3.2.2-SNAPSHOT
         ../..
     
     4.0.0
diff --git a/pom.xml b/pom.xml
index 8a5400eb0448..97eb18cdc1ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     openapi-generator-project
     pom
     openapi-generator-project
-    3.2.1
+    3.2.2-SNAPSHOT
     https://github.com/openapitools/openapi-generator
     
         scm:git:git@github.com:openapitools/openapi-generator.git
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/feign/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/kotlin/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 340735ea2733..5823c0c0ee07 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 19a71919f262..b9965a942a35 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 9c3d2ac45f5f..33427981bda4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index 15415530e639..cc8aa2184498 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index fe5168429be2..26c0eb7a088b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index 43a301ebafdb..c61942291270 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index a7e2c76f0482..0152162f71eb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index c78ca525cc4b..f6b5a845aaa4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index ea5d9f7b797a..c63bed58b4eb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index 6c23cfadf729..e05803822831 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index d4719c695eb2..de132087d2d8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
index c1973ffc0a4f..f3b820922b3a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index e416f166a1d7..a90a9af82435 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index 5ef03bb9ebb3..c1fde1945252 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 8caa35a72c94..30f62c06667a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index d717eab7c644..8625f31f1d17 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index a651ac74002e..22739a7c6326 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index d1428536605f..6ca8d0d3ba1e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index c451ed727c67..cf236825c476 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index f617039a6f57..fc33d2116661 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 31d7a80acd42..db1f712f0c02 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 48794e16c854..f8924d7fb860 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 6246bbe209bc..029fcdc3e2d6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index 1ec51bb0d622..eb66f0ab9571 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index 0af78b8d0286..c8c091cabce8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 3365f811600a..aa04c1700436 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 10dc8c257ff3..45fe3b5a53d5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index 541617b91517..284f9bc3acd8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 1e66b2ae8444..85059a73774c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 94bd58abb60a..34295f3473ec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index c3f0418e3151..4107964b5ef1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 1a401d96006a..95966b3b40a9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index bb761b4abd69..baa7267b757a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 031eb89ff5f6..ba27a1ea33a8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 0895381fbcf5..5c2038ff5845 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index c41125e7873a..053e1adafb3e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index 3854ff3c7ce5..fa525b1e5ce5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index afa6f1d6d01a..baa76be7d96c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index bd4fd123aa99..fe5f84345277 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 697f8bf27dcf..ec7262c9d444 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 5d8498966f1a..3ab9f16e3e09 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index f2abba8359d9..4ca0ed8ca30a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 4333e330ef3f..fd33e32e0b42 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
index c3ddbf8b1c73..d3665902caed 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 44d8dbb984a6..26b27adfe3c3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index d46889db954f..80def29e5aa6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index cd097fe2c89e..024969dcd6a2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index 1c79d046765c..b79a751b98da 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 7f140a9d25c4..60e051fd066e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 8708b81001ea..71cdaf6cf2b1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index af61c988188b..83fd23fb10fc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index add9a81b3c8a..5ea98485e93f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 2ebb1abdb487..6a4ced913c7a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index ac08f81b7e95..4eaabc82ce4c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
index 97753be3a1dc..5e984bac6be0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 22b92eadb46e..7579695f18a0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 38d93ef41405..cb64b823911f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 3dfd190fa187..d21fde8b6861 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index 6f370f291d18..fb80798ecd21 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index e3217284511f..1cb5018cdb3f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 90b1d198afb7..98617bd6d05b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 1f884a9ece4c..9e455fcd171d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 550949e9601e..f5a53a69cf25 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 2291bd947d11..42610c61c4b5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 08dee192f59d..02c5d3edb10e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index b2e373e9cf6c..eaa42fdefd4e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index ba59ed85a81c..9d07ad0c9c62 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 7419fdf9df4f..86c236f8745f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 93b645dd3326..e3805b23319e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 0b449882c22c..ab0ebb137448 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index ca5f53afc9ea..55a77ce6cbbd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index c27941e1358c..b74fab7c8a1b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 3d98366e5245..081cda4e4561 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index f2ce57308dfe..b17f229c293d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 9888f6a3744c..f25f42275d8d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index 5fde94f1c027..6ce3b5fa8581 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 074c7724fe4c..c6973b2fb206 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 30d4feb222f6..f255740833dc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 9931f8e9d992..1e2d76868ecb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index c3e7aa9ba237..5ea57e93e228 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index aaad47cc828b..46bb91b71481 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index f1ad75ca342e..b93d84f68868 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 26ce62acfa98..02b0ab97d77b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 6878756fc0bd..cfaeb328cc4a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index f2aea3daafa3..91aada21a125 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index 116d49648dba..6c20dccad2c4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
index 5470a142016a..2ab7476aa7d6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 9a3ef040aa6c..cfa1e08113f0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index 17ba5cef8fa3..354a5b512f87 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index 710f97c1ce5c..40378c6ee253 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 4d55ef4642da..946daffc5249 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index 2ae55eb1bcc8..c6bdcdd6f7f5 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index b832c508b3bd..4d583fcd2e83 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index ec77b25c744b..589f2d41da3f 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index b624102362fa..d737a5ee2622 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 340735ea2733..5823c0c0ee07 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 336312fdeb53..e5d53a08e5b3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 9c3d2ac45f5f..33427981bda4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index 15415530e639..cc8aa2184498 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index f673735429e0..83b43e025874 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index 824fc74c8257..14b1720e0e4c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index a7e2c76f0482..0152162f71eb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index c78ca525cc4b..f6b5a845aaa4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index ea5d9f7b797a..c63bed58b4eb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index 6c23cfadf729..e05803822831 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index d4719c695eb2..de132087d2d8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
index c1973ffc0a4f..f3b820922b3a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index e416f166a1d7..a90a9af82435 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index 5ef03bb9ebb3..c1fde1945252 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 8caa35a72c94..30f62c06667a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index d717eab7c644..8625f31f1d17 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index a651ac74002e..22739a7c6326 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index d1428536605f..6ca8d0d3ba1e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index c451ed727c67..cf236825c476 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index f617039a6f57..fc33d2116661 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 31d7a80acd42..db1f712f0c02 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 48794e16c854..f8924d7fb860 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 6246bbe209bc..029fcdc3e2d6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index 1ec51bb0d622..eb66f0ab9571 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index 0af78b8d0286..c8c091cabce8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 3365f811600a..aa04c1700436 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 10dc8c257ff3..45fe3b5a53d5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index 77d674fdd46e..feb8fdc6e2e6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 1e66b2ae8444..85059a73774c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 94bd58abb60a..34295f3473ec 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index c3f0418e3151..4107964b5ef1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 1a401d96006a..95966b3b40a9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index bb761b4abd69..baa7267b757a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 031eb89ff5f6..ba27a1ea33a8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 0895381fbcf5..5c2038ff5845 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index e58f5950cf34..20284b07dda4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index 3854ff3c7ce5..fa525b1e5ce5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index afa6f1d6d01a..baa76be7d96c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index bd4fd123aa99..fe5f84345277 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 697f8bf27dcf..ec7262c9d444 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 5d8498966f1a..3ab9f16e3e09 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index f2abba8359d9..4ca0ed8ca30a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 8dc248725768..7dd63e031306 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
index c3ddbf8b1c73..d3665902caed 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 44d8dbb984a6..26b27adfe3c3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index d46889db954f..80def29e5aa6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index cd097fe2c89e..024969dcd6a2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index 1c79d046765c..b79a751b98da 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 7f140a9d25c4..60e051fd066e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 8708b81001ea..71cdaf6cf2b1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index af61c988188b..83fd23fb10fc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index add9a81b3c8a..5ea98485e93f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 2ebb1abdb487..6a4ced913c7a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index ac08f81b7e95..4eaabc82ce4c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
index 97753be3a1dc..5e984bac6be0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 22b92eadb46e..7579695f18a0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 38d93ef41405..cb64b823911f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 3dfd190fa187..d21fde8b6861 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index 6f370f291d18..fb80798ecd21 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index e3217284511f..1cb5018cdb3f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 90b1d198afb7..98617bd6d05b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 1f884a9ece4c..9e455fcd171d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 550949e9601e..f5a53a69cf25 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 2291bd947d11..42610c61c4b5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 08dee192f59d..02c5d3edb10e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index b2e373e9cf6c..eaa42fdefd4e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index ba59ed85a81c..9d07ad0c9c62 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 7419fdf9df4f..86c236f8745f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 93b645dd3326..e3805b23319e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 0b449882c22c..ab0ebb137448 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index ca5f53afc9ea..55a77ce6cbbd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index c27941e1358c..b74fab7c8a1b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 3d98366e5245..081cda4e4561 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index f2ce57308dfe..b17f229c293d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 9888f6a3744c..f25f42275d8d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index 5fde94f1c027..6ce3b5fa8581 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 074c7724fe4c..c6973b2fb206 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 30d4feb222f6..f255740833dc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 9931f8e9d992..1e2d76868ecb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index c3e7aa9ba237..5ea57e93e228 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index aaad47cc828b..46bb91b71481 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index f1ad75ca342e..b93d84f68868 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 26ce62acfa98..02b0ab97d77b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 6878756fc0bd..cfaeb328cc4a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index f2aea3daafa3..91aada21a125 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index 116d49648dba..6c20dccad2c4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
index 5470a142016a..2ab7476aa7d6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 9a3ef040aa6c..cfa1e08113f0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index 17ba5cef8fa3..354a5b512f87 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.1-SNAPSHOT
+ * OpenAPI Generator version: 3.2.2-SNAPSHOT
  */
 
 /**
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
index 999320ca4060..c9d1e8b6db83 100644
--- a/samples/server/petstore/kotlin-server/ktor/README.md
+++ b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,7 +2,7 @@
 
 This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
-Generated by OpenAPI Generator 3.2.1-SNAPSHOT.
+Generated by OpenAPI Generator 3.2.2-SNAPSHOT.
 
 ## Requires
 
diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/php-slim/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 9c3c9c963c97..c9edcf8e18f5 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
index 3056fd6776af..a81586c56df4 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index a47c1e208e30..20de19236b83 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
index ec62ca2dee25..fa3e94a9560c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
index 76e3db17ba18..0afdc6da7c67 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
index 695427c292fb..401eca190137 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c6f442935625..c717ecc4efeb 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
index 8975f21c7e1f..6b81ed3b6d4b 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index abe3dde92d4d..b78309a1ffe6 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
index d86744a2301d..be9bc3262122 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
index 597407dc666d..768dcac99d52 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
index 56de572db039..cd9d6dd6e924 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab1c91cedd64..ab40d27772b7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
index 8767daccd26f..2c84d0510106 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index ecd11e3e8996..5238fe515122 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
index 992d5dcba2cc..e7bbfa7e45ee 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
index 2f4f82bc83fd..2ea7d02cd180 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
index 13547888c250..5a242843dcb7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab1c91cedd64..ab40d27772b7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index 8767daccd26f..2c84d0510106 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index ecd11e3e8996..5238fe515122 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index 992d5dcba2cc..e7bbfa7e45ee 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index 2f4f82bc83fd..2ea7d02cd180 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index 13547888c250..5a242843dcb7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 307e1f2247c8..75f6b34c39bf 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index 1b65308144a9..0b9d68e3fad0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index bfb8351fdf07..e11d896ee3d3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index bcd66050ab9e..e28cdd3245d4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index 79d11d567a58..831cf89a2565 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index ecfeffa7c2ff..d91b6be8a674 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab1c91cedd64..ab40d27772b7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 8767daccd26f..2c84d0510106 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index ecd11e3e8996..5238fe515122 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index 992d5dcba2cc..e7bbfa7e45ee 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index 2f4f82bc83fd..2ea7d02cd180 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index 13547888c250..5a242843dcb7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 00534cd518eb..0ba273fbe7ad 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 660d15a4d3df..eb0fc8c56c76 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 582f13686a85..e0a283a5e1c6 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index 7d02fddf8884..bc3fec3fdee6 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index 19e6ccde11f1..11e28670d178 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index 69bde6c2cb90..3991b8655edb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 35c8820e9334..1f6aa39bd89d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 9527bb533896..885d3f734adc 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 051c2b5493f8..6c6a37426ad4 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index e439b39cfb66..68c094fe45d1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 68d817c2c670..03f566072ba0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index 4131a29128cd..76892be7eac1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c6f442935625..c717ecc4efeb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index b36f2f126eaf..d72046838f03 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index abe3dde92d4d..b78309a1ffe6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index 136cdf94a749..f0540d6db416 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 597407dc666d..768dcac99d52 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index 56de572db039..cd9d6dd6e924 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/server/petstore/springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c6f442935625..c717ecc4efeb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index 4aa3c098475f..e8fbec09a9c2 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index abe3dde92d4d..b78309a1ffe6 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index d86744a2301d..be9bc3262122 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 597407dc666d..768dcac99d52 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index 56de572db039..cd9d6dd6e924 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.1-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/shippable.yml b/shippable.yml
index 5ffc53d54238..27c3ccec46e6 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -12,7 +12,7 @@ build:
   ci:
     - mvn --quiet clean install
     # ensure all modifications created by 'mature' generators are in the git repo
-    #- ./bin/utils/ensure-up-to-date
+    - ./bin/utils/ensure-up-to-date
     # prepare environment for tests
     - sudo apt-get update -qq
     # install stack

From 7b8f51a465f14717ff59a3f6c074a08f513b9ad3 Mon Sep 17 00:00:00 2001
From: Victor Orlovsky 
Date: Wed, 15 Aug 2018 18:56:14 +0300
Subject: [PATCH 23/27] [JAVA][Rest-assured] add more information about
 operations (#815)

Add swagger annotations to client and set default baseReqSpec and baseContextConsumer in ApiClient
---
 .../libraries/rest-assured/ApiClient.mustache |  20 +-
 .../Java/libraries/rest-assured/api.mustache  |  32 ++-
 .../org/openapitools/client/ApiClient.java    |  18 +-
 .../client/api/AnotherFakeApi.java            |  20 +-
 .../org/openapitools/client/api/FakeApi.java  | 204 ++++++-----------
 .../client/api/FakeClassnameTags123Api.java   |  22 +-
 .../org/openapitools/client/api/PetApi.java   | 208 +++++++++---------
 .../org/openapitools/client/api/StoreApi.java |  77 +++----
 .../org/openapitools/client/api/UserApi.java  | 147 +++++--------
 9 files changed, 313 insertions(+), 435 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
index 184dc13e05c0..cf8d5c45ba24 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
@@ -6,22 +6,20 @@ import {{apiPackage}}.*;
 
 {{#imports}}import {{import}};
 {{/imports}}
-
 {{^fullJavaUtil}}
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.builder.ResponseSpecBuilder;
-import io.restassured.response.Response;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
+
+import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
+import static io.restassured.config.RestAssuredConfig.config;
+import static org.openapitools.client.GsonObjectMapper.gson;
 {{/fullJavaUtil}}
 
 public class ApiClient {
+    {{#basePath}}
+    public static final String BASE_URI = "{{basePath}}";
+    {{/basePath}}
 
     private final Config config;
 
@@ -42,7 +40,9 @@ public class ApiClient {
      {{/apiInfo}}
 
     public static class Config {
-        private Supplier baseReqSpec;
+        private Supplier baseReqSpec = () -> new RequestSpecBuilder()
+                {{#basePath}}.setBaseUri(BASE_URI){{/basePath}}
+                .setConfig(config().objectMapperConfig(objectMapperConfig().defaultObjectMapper(gson())));
 
         /**
          * Use common specification for all operations
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
index 3a0d2c78d9fc..1f400d0efa19 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
@@ -15,7 +15,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -41,6 +43,15 @@ public class {{classname}} {
 {{#operations}}
 {{#operation}}
 
+    @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
+        {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
+            {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
+            {{/hasMore}}{{/scopes}}
+            }{{/isOAuth}}){{#hasMore}},
+        {{/hasMore}}{{/authMethods}}
+    }{{/hasAuthMethods}}, tags={ {{#tags}}{{#name}}"{{{name}}}"{{/name}}{{^-last}}, {{/-last}}{{/tags}} })
+    @ApiResponses(value = { {{#responses}}
+        @ApiResponse(code = {{{code}}}, message = "{{{message}}}") {{#hasMore}},{{/hasMore}}{{/responses}} })
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
@@ -83,29 +94,14 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
-    public class {{operationIdCamelCase}}Oper {
+    public static class {{operationIdCamelCase}}Oper {
 
-        public static final String REQ_METHOD = "{{httpMethod}}";
+        public static final Method REQ_METHOD = {{httpMethod}};
         public static final String REQ_URI = "{{path}}";
-        public static final String SUMMARY = "{{{summary}}}";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public {{operationIdCamelCase}}Oper() {
-            this.reqSpec = new RequestSpecBuilder();
-            {{#vendorExtensions}}
-            {{#x-contentType}}
-            reqSpec.setContentType("{{x-contentType}}");
-            {{/x-contentType}}
-            {{#x-accepts}}
-            reqSpec.setAccept("{{x-accepts}}");
-            {{/x-accepts}}
-            {{/vendorExtensions}}
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public {{operationIdCamelCase}}Oper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             {{#vendorExtensions}}
@@ -126,7 +122,7 @@ public class {{classname}} {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request({{httpMethod}}, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
         {{#returnType}}
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
index 97f6b2c61c07..b39d7e40cd4b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
@@ -15,20 +15,16 @@ package org.openapitools.client;
 
 import org.openapitools.client.api.*;
 
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.builder.ResponseSpecBuilder;
-import io.restassured.response.Response;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
+import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
+import static io.restassured.config.RestAssuredConfig.config;
+import static org.openapitools.client.GsonObjectMapper.gson;
+
 public class ApiClient {
+    public static final String BASE_URI = "http://petstore.swagger.io:80/v2";
 
     private final Config config;
 
@@ -60,7 +56,9 @@ public class ApiClient {
     }
 
     public static class Config {
-        private Supplier baseReqSpec;
+        private Supplier baseReqSpec = () -> new RequestSpecBuilder()
+                .setBaseUri(BASE_URI)
+                .setConfig(config().objectMapperConfig(objectMapperConfig().defaultObjectMapper(gson())));
 
         /**
          * Use common specification for all operations
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 2cb316a26ee0..58ab8015d06e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -24,7 +24,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -47,6 +49,9 @@ public class AnotherFakeApi {
     }
 
 
+    @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", tags={ "$another-fake?" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public Call123testSpecialTagsOper call123testSpecialTags() {
         return new Call123testSpecialTagsOper(reqSpec);
     }
@@ -68,23 +73,14 @@ public class AnotherFakeApi {
      * @see #body client model (required)
      * return Client
      */
-    public class Call123testSpecialTagsOper {
+    public static class Call123testSpecialTagsOper {
 
-        public static final String REQ_METHOD = "PATCH";
+        public static final Method REQ_METHOD = PATCH;
         public static final String REQ_URI = "/another-fake/dummy";
-        public static final String SUMMARY = "To test special tags";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public Call123testSpecialTagsOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public Call123testSpecialTagsOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -99,7 +95,7 @@ public class AnotherFakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PATCH, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
index a56250e1cad3..e39e207f36e1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -31,7 +31,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -54,46 +56,83 @@ public class FakeApi {
     }
 
 
+    @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Output boolean")  })
     public FakeOuterBooleanSerializeOper fakeOuterBooleanSerialize() {
         return new FakeOuterBooleanSerializeOper(reqSpec);
     }
 
+    @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Output composite")  })
     public FakeOuterCompositeSerializeOper fakeOuterCompositeSerialize() {
         return new FakeOuterCompositeSerializeOper(reqSpec);
     }
 
+    @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Output number")  })
     public FakeOuterNumberSerializeOper fakeOuterNumberSerialize() {
         return new FakeOuterNumberSerializeOper(reqSpec);
     }
 
+    @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Output string")  })
     public FakeOuterStringSerializeOper fakeOuterStringSerialize() {
         return new FakeOuterStringSerializeOper(reqSpec);
     }
 
+    @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithFileSchemaOper testBodyWithFileSchema() {
         return new TestBodyWithFileSchemaOper(reqSpec);
     }
 
+    @ApiOperation(value = "", notes = "", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithQueryParamsOper testBodyWithQueryParams() {
         return new TestBodyWithQueryParamsOper(reqSpec);
     }
 
+    @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public TestClientModelOper testClientModel() {
         return new TestClientModelOper(reqSpec);
     }
 
+    @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", notes = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", authorizations = {
+        @Authorization(value = "http_basic_test")
+    }, tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid username supplied") ,
+        @ApiResponse(code = 404, message = "User not found")  })
     public TestEndpointParametersOper testEndpointParameters() {
         return new TestEndpointParametersOper(reqSpec);
     }
 
+    @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid request") ,
+        @ApiResponse(code = 404, message = "Not found")  })
     public TestEnumParametersOper testEnumParameters() {
         return new TestEnumParametersOper(reqSpec);
     }
 
+    @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public TestInlineAdditionalPropertiesOper testInlineAdditionalProperties() {
         return new TestInlineAdditionalPropertiesOper(reqSpec);
     }
 
+    @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public TestJsonFormDataOper testJsonFormData() {
         return new TestJsonFormDataOper(reqSpec);
     }
@@ -115,23 +154,14 @@ public class FakeApi {
      * @see #body Input boolean as post body (optional)
      * return Boolean
      */
-    public class FakeOuterBooleanSerializeOper {
+    public static class FakeOuterBooleanSerializeOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/outer/boolean";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FakeOuterBooleanSerializeOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("*/*");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FakeOuterBooleanSerializeOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -146,7 +176,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -195,23 +225,14 @@ public class FakeApi {
      * @see #body Input composite as post body (optional)
      * return OuterComposite
      */
-    public class FakeOuterCompositeSerializeOper {
+    public static class FakeOuterCompositeSerializeOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/outer/composite";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FakeOuterCompositeSerializeOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("*/*");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FakeOuterCompositeSerializeOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -226,7 +247,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -275,23 +296,14 @@ public class FakeApi {
      * @see #body Input number as post body (optional)
      * return BigDecimal
      */
-    public class FakeOuterNumberSerializeOper {
+    public static class FakeOuterNumberSerializeOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/outer/number";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FakeOuterNumberSerializeOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("*/*");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FakeOuterNumberSerializeOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -306,7 +318,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -355,23 +367,14 @@ public class FakeApi {
      * @see #body Input string as post body (optional)
      * return String
      */
-    public class FakeOuterStringSerializeOper {
+    public static class FakeOuterStringSerializeOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/outer/string";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FakeOuterStringSerializeOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("*/*");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FakeOuterStringSerializeOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -386,7 +389,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -434,23 +437,14 @@ public class FakeApi {
      *
      * @see #body  (required)
      */
-    public class TestBodyWithFileSchemaOper {
+    public static class TestBodyWithFileSchemaOper {
 
-        public static final String REQ_METHOD = "PUT";
+        public static final Method REQ_METHOD = PUT;
         public static final String REQ_URI = "/fake/body-with-file-schema";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestBodyWithFileSchemaOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestBodyWithFileSchemaOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -465,7 +459,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PUT, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -504,23 +498,14 @@ public class FakeApi {
      * @see #queryQuery  (required)
      * @see #body  (required)
      */
-    public class TestBodyWithQueryParamsOper {
+    public static class TestBodyWithQueryParamsOper {
 
-        public static final String REQ_METHOD = "PUT";
+        public static final Method REQ_METHOD = PUT;
         public static final String REQ_URI = "/fake/body-with-query-params";
-        public static final String SUMMARY = "";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestBodyWithQueryParamsOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestBodyWithQueryParamsOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -535,7 +520,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PUT, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -585,23 +570,14 @@ public class FakeApi {
      * @see #body client model (required)
      * return Client
      */
-    public class TestClientModelOper {
+    public static class TestClientModelOper {
 
-        public static final String REQ_METHOD = "PATCH";
+        public static final Method REQ_METHOD = PATCH;
         public static final String REQ_URI = "/fake";
-        public static final String SUMMARY = "To test \"client\" model";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestClientModelOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestClientModelOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -616,7 +592,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PATCH, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -677,23 +653,14 @@ public class FakeApi {
      * @see #passwordForm None (optional, default to null)
      * @see #paramCallbackForm None (optional, default to null)
      */
-    public class TestEndpointParametersOper {
+    public static class TestEndpointParametersOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake";
-        public static final String SUMMARY = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestEndpointParametersOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/x-www-form-urlencoded");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestEndpointParametersOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/x-www-form-urlencoded");
@@ -708,7 +675,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          public static final String INTEGER_FORM = "integer";
@@ -898,23 +865,14 @@ public class FakeApi {
      * @see #enumFormStringArrayForm Form parameter enum test (string array) (optional, default to $)
      * @see #enumFormStringForm Form parameter enum test (string) (optional, default to -efg)
      */
-    public class TestEnumParametersOper {
+    public static class TestEnumParametersOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/fake";
-        public static final String SUMMARY = "To test enum parameters";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestEnumParametersOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/x-www-form-urlencoded");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestEnumParametersOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/x-www-form-urlencoded");
@@ -929,7 +887,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         public static final String ENUM_HEADER_STRING_ARRAY_HEADER = "enum_header_string_array";
@@ -1046,23 +1004,14 @@ public class FakeApi {
      *
      * @see #body request body (required)
      */
-    public class TestInlineAdditionalPropertiesOper {
+    public static class TestInlineAdditionalPropertiesOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/inline-additionalProperties";
-        public static final String SUMMARY = "test inline additionalProperties";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestInlineAdditionalPropertiesOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestInlineAdditionalPropertiesOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -1077,7 +1026,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -1116,23 +1065,14 @@ public class FakeApi {
      * @see #paramForm field1 (required)
      * @see #param2Form field2 (required)
      */
-    public class TestJsonFormDataOper {
+    public static class TestJsonFormDataOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/fake/jsonFormData";
-        public static final String SUMMARY = "test json serialization of form data";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestJsonFormDataOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/x-www-form-urlencoded");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestJsonFormDataOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/x-www-form-urlencoded");
@@ -1147,7 +1087,7 @@ public class FakeApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          public static final String PARAM_FORM = "param";
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index dab88d0ef9fe..a68d20457480 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -24,7 +24,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -47,6 +49,11 @@ public class FakeClassnameTags123Api {
     }
 
 
+    @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", authorizations = {
+        @Authorization(value = "api_key_query")
+    }, tags={ "fake_classname_tags 123#$%^" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public TestClassnameOper testClassname() {
         return new TestClassnameOper(reqSpec);
     }
@@ -68,23 +75,14 @@ public class FakeClassnameTags123Api {
      * @see #body client model (required)
      * return Client
      */
-    public class TestClassnameOper {
+    public static class TestClassnameOper {
 
-        public static final String REQ_METHOD = "PATCH";
+        public static final Method REQ_METHOD = PATCH;
         public static final String REQ_URI = "/fake_classname_test";
-        public static final String SUMMARY = "To test class name in snake case";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public TestClassnameOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public TestClassnameOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -99,7 +97,7 @@ public class FakeClassnameTags123Api {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PATCH, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
index 508a67777f5a..d99a9dbc1d38 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
@@ -26,7 +26,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -49,39 +51,114 @@ public class PetApi {
     }
 
 
+    @ApiOperation(value = "Add a new pet to the store", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 405, message = "Invalid input")  })
     public AddPetOper addPet() {
         return new AddPetOper(reqSpec);
     }
 
+    @ApiOperation(value = "Deletes a pet", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid pet value")  })
     public DeletePetOper deletePet() {
         return new DeletePetOper(reqSpec);
     }
 
+    @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid status value")  })
     public FindPetsByStatusOper findPetsByStatus() {
         return new FindPetsByStatusOper(reqSpec);
     }
 
+    @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid tag value")  })
     @Deprecated
     public FindPetsByTagsOper findPetsByTags() {
         return new FindPetsByTagsOper(reqSpec);
     }
 
+    @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", authorizations = {
+        @Authorization(value = "api_key")
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+        @ApiResponse(code = 404, message = "Pet not found")  })
     public GetPetByIdOper getPetById() {
         return new GetPetByIdOper(reqSpec);
     }
 
+    @ApiOperation(value = "Update an existing pet", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+        @ApiResponse(code = 404, message = "Pet not found") ,
+        @ApiResponse(code = 405, message = "Validation exception")  })
     public UpdatePetOper updatePet() {
         return new UpdatePetOper(reqSpec);
     }
 
+    @ApiOperation(value = "Updates a pet in the store with form data", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 405, message = "Invalid input")  })
     public UpdatePetWithFormOper updatePetWithForm() {
         return new UpdatePetWithFormOper(reqSpec);
     }
 
+    @ApiOperation(value = "uploads an image", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileOper uploadFile() {
         return new UploadFileOper(reqSpec);
     }
 
+    @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+            })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileWithRequiredFileOper uploadFileWithRequiredFile() {
         return new UploadFileWithRequiredFileOper(reqSpec);
     }
@@ -102,23 +179,14 @@ public class PetApi {
      *
      * @see #body Pet object that needs to be added to the store (required)
      */
-    public class AddPetOper {
+    public static class AddPetOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/pet";
-        public static final String SUMMARY = "Add a new pet to the store";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public AddPetOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public AddPetOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -133,7 +201,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -172,22 +240,14 @@ public class PetApi {
      * @see #petIdPath Pet id to delete (required)
      * @see #apiKeyHeader  (optional)
      */
-    public class DeletePetOper {
+    public static class DeletePetOper {
 
-        public static final String REQ_METHOD = "DELETE";
+        public static final Method REQ_METHOD = DELETE;
         public static final String REQ_URI = "/pet/{petId}";
-        public static final String SUMMARY = "Deletes a pet";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public DeletePetOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public DeletePetOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -201,7 +261,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(DELETE, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         public static final String API_KEY_HEADER = "api_key";
@@ -253,22 +313,14 @@ public class PetApi {
      * @see #statusQuery Status values that need to be considered for filter (required)
      * return List<Pet>
      */
-    public class FindPetsByStatusOper {
+    public static class FindPetsByStatusOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/pet/findByStatus";
-        public static final String SUMMARY = "Finds Pets by status";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FindPetsByStatusOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FindPetsByStatusOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -282,7 +334,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -335,22 +387,14 @@ public class PetApi {
      * @deprecated
      */
     @Deprecated
-    public class FindPetsByTagsOper {
+    public static class FindPetsByTagsOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/pet/findByTags";
-        public static final String SUMMARY = "Finds Pets by tags";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public FindPetsByTagsOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public FindPetsByTagsOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -364,7 +408,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -415,22 +459,14 @@ public class PetApi {
      * @see #petIdPath ID of pet to return (required)
      * return Pet
      */
-    public class GetPetByIdOper {
+    public static class GetPetByIdOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/pet/{petId}";
-        public static final String SUMMARY = "Find pet by ID";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public GetPetByIdOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public GetPetByIdOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -444,7 +480,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -494,23 +530,14 @@ public class PetApi {
      *
      * @see #body Pet object that needs to be added to the store (required)
      */
-    public class UpdatePetOper {
+    public static class UpdatePetOper {
 
-        public static final String REQ_METHOD = "PUT";
+        public static final Method REQ_METHOD = PUT;
         public static final String REQ_URI = "/pet";
-        public static final String SUMMARY = "Update an existing pet";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public UpdatePetOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/json");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public UpdatePetOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/json");
@@ -525,7 +552,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PUT, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -565,23 +592,14 @@ public class PetApi {
      * @see #nameForm Updated name of the pet (optional, default to null)
      * @see #statusForm Updated status of the pet (optional, default to null)
      */
-    public class UpdatePetWithFormOper {
+    public static class UpdatePetWithFormOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/pet/{petId}";
-        public static final String SUMMARY = "Updates a pet in the store with form data";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public UpdatePetWithFormOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("application/x-www-form-urlencoded");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public UpdatePetWithFormOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("application/x-www-form-urlencoded");
@@ -596,7 +614,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         public static final String PET_ID_PATH = "petId";
@@ -661,23 +679,14 @@ public class PetApi {
      * @see #fileMultiPart file to upload (optional, default to null)
      * return ModelApiResponse
      */
-    public class UploadFileOper {
+    public static class UploadFileOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/pet/{petId}/uploadImage";
-        public static final String SUMMARY = "uploads an image";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public UploadFileOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("multipart/form-data");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public UploadFileOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("multipart/form-data");
@@ -692,7 +701,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -767,23 +776,14 @@ public class PetApi {
      * @see #additionalMetadataForm Additional data to pass to server (optional, default to null)
      * return ModelApiResponse
      */
-    public class UploadFileWithRequiredFileOper {
+    public static class UploadFileWithRequiredFileOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/fake/{petId}/uploadImageWithRequiredFile";
-        public static final String SUMMARY = "uploads an image (required)";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public UploadFileWithRequiredFileOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("multipart/form-data");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public UploadFileWithRequiredFileOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("multipart/form-data");
@@ -798,7 +798,7 @@ public class PetApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
index 85d22c9cc2a3..a796a6776dc8 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -24,7 +24,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -47,18 +49,36 @@ public class StoreApi {
     }
 
 
+    @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+        @ApiResponse(code = 404, message = "Order not found")  })
     public DeleteOrderOper deleteOrder() {
         return new DeleteOrderOper(reqSpec);
     }
 
+    @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", authorizations = {
+        @Authorization(value = "api_key")
+    }, tags={ "store" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation")  })
     public GetInventoryOper getInventory() {
         return new GetInventoryOper(reqSpec);
     }
 
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+        @ApiResponse(code = 404, message = "Order not found")  })
     public GetOrderByIdOper getOrderById() {
         return new GetOrderByIdOper(reqSpec);
     }
 
+    @ApiOperation(value = "Place an order for a pet", notes = "", tags={ "store" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid Order")  })
     public PlaceOrderOper placeOrder() {
         return new PlaceOrderOper(reqSpec);
     }
@@ -79,22 +99,14 @@ public class StoreApi {
      *
      * @see #orderIdPath ID of the order that needs to be deleted (required)
      */
-    public class DeleteOrderOper {
+    public static class DeleteOrderOper {
 
-        public static final String REQ_METHOD = "DELETE";
+        public static final Method REQ_METHOD = DELETE;
         public static final String REQ_URI = "/store/order/{order_id}";
-        public static final String SUMMARY = "Delete purchase order by ID";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public DeleteOrderOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public DeleteOrderOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -108,7 +120,7 @@ public class StoreApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(DELETE, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         public static final String ORDER_ID_PATH = "order_id";
@@ -148,22 +160,14 @@ public class StoreApi {
      *
      * return Map<String, Integer>
      */
-    public class GetInventoryOper {
+    public static class GetInventoryOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/store/inventory";
-        public static final String SUMMARY = "Returns pet inventories by status";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public GetInventoryOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public GetInventoryOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -177,7 +181,7 @@ public class StoreApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -217,22 +221,14 @@ public class StoreApi {
      * @see #orderIdPath ID of pet that needs to be fetched (required)
      * return Order
      */
-    public class GetOrderByIdOper {
+    public static class GetOrderByIdOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/store/order/{order_id}";
-        public static final String SUMMARY = "Find purchase order by ID";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public GetOrderByIdOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public GetOrderByIdOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -246,7 +242,7 @@ public class StoreApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -297,23 +293,14 @@ public class StoreApi {
      * @see #body order placed for purchasing the pet (required)
      * return Order
      */
-    public class PlaceOrderOper {
+    public static class PlaceOrderOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/store/order";
-        public static final String SUMMARY = "Place an order for a pet";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public PlaceOrderOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public PlaceOrderOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -328,7 +315,7 @@ public class StoreApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
index 4ed9d74750f4..37c4bc747eac 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
@@ -24,7 +24,9 @@ import java.util.Map;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.Method;
 import io.restassured.response.Response;
+import io.swagger.annotations.*;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -47,34 +49,63 @@ public class UserApi {
     }
 
 
+    @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUserOper createUser() {
         return new CreateUserOper(reqSpec);
     }
 
+    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithArrayInputOper createUsersWithArrayInput() {
         return new CreateUsersWithArrayInputOper(reqSpec);
     }
 
+    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithListInputOper createUsersWithListInput() {
         return new CreateUsersWithListInputOper(reqSpec);
     }
 
+    @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid username supplied") ,
+        @ApiResponse(code = 404, message = "User not found")  })
     public DeleteUserOper deleteUser() {
         return new DeleteUserOper(reqSpec);
     }
 
+    @ApiOperation(value = "Get user by user name", notes = "", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid username supplied") ,
+        @ApiResponse(code = 404, message = "User not found")  })
     public GetUserByNameOper getUserByName() {
         return new GetUserByNameOper(reqSpec);
     }
 
+    @ApiOperation(value = "Logs user into the system", notes = "", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") ,
+        @ApiResponse(code = 400, message = "Invalid username/password supplied")  })
     public LoginUserOper loginUser() {
         return new LoginUserOper(reqSpec);
     }
 
+    @ApiOperation(value = "Logs out current logged in user session", notes = "", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 0, message = "successful operation")  })
     public LogoutUserOper logoutUser() {
         return new LogoutUserOper(reqSpec);
     }
 
+    @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Invalid user supplied") ,
+        @ApiResponse(code = 404, message = "User not found")  })
     public UpdateUserOper updateUser() {
         return new UpdateUserOper(reqSpec);
     }
@@ -95,23 +126,14 @@ public class UserApi {
      *
      * @see #body Created user object (required)
      */
-    public class CreateUserOper {
+    public static class CreateUserOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/user";
-        public static final String SUMMARY = "Create user";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public CreateUserOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public CreateUserOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -126,7 +148,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -164,23 +186,14 @@ public class UserApi {
      *
      * @see #body List of user object (required)
      */
-    public class CreateUsersWithArrayInputOper {
+    public static class CreateUsersWithArrayInputOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/user/createWithArray";
-        public static final String SUMMARY = "Creates list of users with given input array";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public CreateUsersWithArrayInputOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public CreateUsersWithArrayInputOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -195,7 +208,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -233,23 +246,14 @@ public class UserApi {
      *
      * @see #body List of user object (required)
      */
-    public class CreateUsersWithListInputOper {
+    public static class CreateUsersWithListInputOper {
 
-        public static final String REQ_METHOD = "POST";
+        public static final Method REQ_METHOD = POST;
         public static final String REQ_URI = "/user/createWithList";
-        public static final String SUMMARY = "Creates list of users with given input array";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public CreateUsersWithListInputOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public CreateUsersWithListInputOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -264,7 +268,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(POST, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**
@@ -302,22 +306,14 @@ public class UserApi {
      *
      * @see #usernamePath The name that needs to be deleted (required)
      */
-    public class DeleteUserOper {
+    public static class DeleteUserOper {
 
-        public static final String REQ_METHOD = "DELETE";
+        public static final Method REQ_METHOD = DELETE;
         public static final String REQ_URI = "/user/{username}";
-        public static final String SUMMARY = "Delete user";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public DeleteUserOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public DeleteUserOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -331,7 +327,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(DELETE, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         public static final String USERNAME_PATH = "username";
@@ -372,22 +368,14 @@ public class UserApi {
      * @see #usernamePath The name that needs to be fetched. Use user1 for testing. (required)
      * return User
      */
-    public class GetUserByNameOper {
+    public static class GetUserByNameOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/user/{username}";
-        public static final String SUMMARY = "Get user by user name";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public GetUserByNameOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public GetUserByNameOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -401,7 +389,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -453,22 +441,14 @@ public class UserApi {
      * @see #passwordQuery The password for login in clear text (required)
      * return String
      */
-    public class LoginUserOper {
+    public static class LoginUserOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/user/login";
-        public static final String SUMMARY = "Logs user into the system";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public LoginUserOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public LoginUserOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -482,7 +462,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -542,22 +522,14 @@ public class UserApi {
      * 
      *
      */
-    public class LogoutUserOper {
+    public static class LogoutUserOper {
 
-        public static final String REQ_METHOD = "GET";
+        public static final Method REQ_METHOD = GET;
         public static final String REQ_URI = "/user/logout";
-        public static final String SUMMARY = "Logs out current logged in user session";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public LogoutUserOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public LogoutUserOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setAccept("application/json");
@@ -571,7 +543,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(GET, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
         /**
@@ -601,23 +573,14 @@ public class UserApi {
      * @see #usernamePath name that need to be deleted (required)
      * @see #body Updated user object (required)
      */
-    public class UpdateUserOper {
+    public static class UpdateUserOper {
 
-        public static final String REQ_METHOD = "PUT";
+        public static final Method REQ_METHOD = PUT;
         public static final String REQ_URI = "/user/{username}";
-        public static final String SUMMARY = "Updated user";
 
         private RequestSpecBuilder reqSpec;
-
         private ResponseSpecBuilder respSpec;
 
-        public UpdateUserOper() {
-            this.reqSpec = new RequestSpecBuilder();
-            reqSpec.setContentType("*/*");
-            reqSpec.setAccept("application/json");
-            this.respSpec = new ResponseSpecBuilder();
-        }
-
         public UpdateUserOper(RequestSpecBuilder reqSpec) {
             this.reqSpec = reqSpec;
             reqSpec.setContentType("*/*");
@@ -632,7 +595,7 @@ public class UserApi {
          * @return type
          */
         public  T execute(Function handler) {
-            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(PUT, REQ_URI));
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
          /**

From fa52826c246d1bbe129c10ef83dd3189fad4b733 Mon Sep 17 00:00:00 2001
From: Michael Kotten 
Date: Wed, 15 Aug 2018 18:05:47 +0200
Subject: [PATCH 24/27] [JAXRS-spec] Add option useSwaggerAnnotations (#813)

---
 .../languages/JavaJAXRSSpecServerCodegen.java | 43 +++++++++++++------
 .../resources/JavaJaxRS/spec/api.mustache     |  6 ++-
 .../JavaJaxRS/spec/apiInterface.mustache      |  4 +-
 .../JavaJaxRS/spec/apiMethod.mustache         |  4 +-
 .../JavaJaxRS/spec/headerParams.mustache      |  2 +-
 .../JavaJaxRS/spec/pathParams.mustache        |  2 +-
 .../resources/JavaJaxRS/spec/pojo.mustache    | 10 +++--
 .../resources/JavaJaxRS/spec/pom.mustache     |  2 +
 .../JavaJaxRS/spec/queryParams.mustache       |  2 +-
 .../java/org/openapitools/model/Category.java |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../gen/java/org/openapitools/model/Pet.java  |  1 +
 .../gen/java/org/openapitools/model/Tag.java  |  1 +
 .../gen/java/org/openapitools/model/User.java |  1 +
 .../model/AdditionalPropertiesClass.java      |  2 +
 .../java/org/openapitools/model/Animal.java   |  2 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +
 .../openapitools/model/ArrayOfNumberOnly.java |  2 +
 .../org/openapitools/model/ArrayTest.java     |  2 +
 .../openapitools/model/Capitalization.java    |  2 +
 .../gen/java/org/openapitools/model/Cat.java  |  2 +
 .../java/org/openapitools/model/Category.java |  2 +
 .../org/openapitools/model/ClassModel.java    |  1 +
 .../java/org/openapitools/model/Client.java   |  2 +
 .../gen/java/org/openapitools/model/Dog.java  |  2 +
 .../org/openapitools/model/EnumArrays.java    |  2 +
 .../java/org/openapitools/model/EnumTest.java |  2 +
 .../model/FileSchemaTestClass.java            |  2 +
 .../org/openapitools/model/FormatTest.java    |  2 +
 .../openapitools/model/HasOnlyReadOnly.java   |  2 +
 .../java/org/openapitools/model/MapTest.java  |  2 +
 ...ropertiesAndAdditionalPropertiesClass.java |  2 +
 .../openapitools/model/Model200Response.java  |  1 +
 .../openapitools/model/ModelApiResponse.java  |  2 +
 .../org/openapitools/model/ModelReturn.java   |  1 +
 .../gen/java/org/openapitools/model/Name.java |  1 +
 .../org/openapitools/model/NumberOnly.java    |  2 +
 .../java/org/openapitools/model/Order.java    |  2 +
 .../openapitools/model/OuterComposite.java    |  2 +
 .../gen/java/org/openapitools/model/Pet.java  |  2 +
 .../org/openapitools/model/ReadOnlyFirst.java |  2 +
 .../openapitools/model/SpecialModelName.java  |  2 +
 .../gen/java/org/openapitools/model/Tag.java  |  2 +
 .../gen/java/org/openapitools/model/User.java |  2 +
 .../model/AdditionalPropertiesClass.java      |  2 +
 .../java/org/openapitools/model/Animal.java   |  2 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +
 .../openapitools/model/ArrayOfNumberOnly.java |  2 +
 .../org/openapitools/model/ArrayTest.java     |  2 +
 .../openapitools/model/Capitalization.java    |  2 +
 .../gen/java/org/openapitools/model/Cat.java  |  2 +
 .../java/org/openapitools/model/Category.java |  2 +
 .../org/openapitools/model/ClassModel.java    |  1 +
 .../java/org/openapitools/model/Client.java   |  2 +
 .../gen/java/org/openapitools/model/Dog.java  |  2 +
 .../org/openapitools/model/EnumArrays.java    |  2 +
 .../java/org/openapitools/model/EnumTest.java |  2 +
 .../model/FileSchemaTestClass.java            |  2 +
 .../org/openapitools/model/FormatTest.java    |  2 +
 .../openapitools/model/HasOnlyReadOnly.java   |  2 +
 .../java/org/openapitools/model/MapTest.java  |  2 +
 ...ropertiesAndAdditionalPropertiesClass.java |  2 +
 .../openapitools/model/Model200Response.java  |  1 +
 .../openapitools/model/ModelApiResponse.java  |  2 +
 .../org/openapitools/model/ModelReturn.java   |  1 +
 .../gen/java/org/openapitools/model/Name.java |  1 +
 .../org/openapitools/model/NumberOnly.java    |  2 +
 .../java/org/openapitools/model/Order.java    |  2 +
 .../openapitools/model/OuterComposite.java    |  2 +
 .../gen/java/org/openapitools/model/Pet.java  |  2 +
 .../org/openapitools/model/ReadOnlyFirst.java |  2 +
 .../openapitools/model/SpecialModelName.java  |  2 +
 .../gen/java/org/openapitools/model/Tag.java  |  2 +
 .../gen/java/org/openapitools/model/User.java |  2 +
 75 files changed, 167 insertions(+), 26 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
index 2242ed2dd41a..3a7cb617d13e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -18,12 +18,12 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.SupportingFile;
 
 import java.io.File;
@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public static final String INTERFACE_ONLY = "interfaceOnly";
     public static final String RETURN_RESPONSE = "returnResponse";
     public static final String GENERATE_POM = "generatePom";
+    public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
+    public static final String JACKSON = "jackson";
 
     private boolean interfaceOnly = false;
     private boolean returnResponse = false;
     private boolean generatePom = true;
-    
+    private boolean useSwaggerAnnotations = true;
+    private boolean useJackson = false;
+
     private String primaryResourceName;
-    
+
     public JavaJAXRSSpecServerCodegen() {
         super();
         invokerPackage = "org.openapitools.api";
@@ -91,6 +95,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
         cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
         cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
+        cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
     }
 
     @Override
@@ -110,6 +115,13 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
                 additionalProperties.remove(RETURN_RESPONSE);
             }
         }
+        if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
+            useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
+        }
+        writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);
+
+        useJackson = convertPropertyToBoolean(JACKSON);
+
         if (interfaceOnly) {
             // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
             artifactId = "openapi-jaxrs-client";
@@ -148,7 +160,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         if (pos > 0) {
             basePath = basePath.substring(0, pos);
         }
-        
+
         String operationKey = basePath;
         if (StringUtils.isEmpty(basePath)) {
             basePath = tag;
@@ -174,14 +186,19 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     }
 
     @Override
-    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
-        super.postProcessModelProperty(model, property);
-        model.imports.remove("ApiModelProperty");
-        model.imports.remove("ApiModel");
-        model.imports.remove("JsonSerialize");
-        model.imports.remove("ToStringSerializer");
-        model.imports.remove("JsonValue");
-        model.imports.remove("JsonProperty");
+    public CodegenModel fromModel(String name, Schema model, Map allDefinitions) {
+        CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
+        if (!useSwaggerAnnotations) {
+            codegenModel.imports.remove("ApiModelProperty");
+            codegenModel.imports.remove("ApiModel");
+        }
+        if (!useJackson) {
+            codegenModel.imports.remove("JsonSerialize");
+            codegenModel.imports.remove("ToStringSerializer");
+            codegenModel.imports.remove("JsonValue");
+            codegenModel.imports.remove("JsonProperty");
+        }
+        return codegenModel;
     }
 
     @Override
@@ -194,7 +211,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public String getHelp() {
         return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
     }
-    
+
     @Override
     public String toApiName(final String name) {
         String computed = name;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
index f05b0a4073f3..8e52be4099b1 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
@@ -6,7 +6,9 @@ package {{package}};
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 
+{{#useSwaggerAnnotations}}
 import io.swagger.annotations.*;
+{{/useSwaggerAnnotations}}
 
 import java.io.InputStream;
 import java.util.Map;
@@ -14,8 +16,8 @@ import java.util.List;
 {{#useBeanValidation}}import javax.validation.constraints.*;
 import javax.validation.Valid;{{/useBeanValidation}}
 
-@Path("/{{{baseName}}}")
-@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
+@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
+@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache
index 0463921182e2..35ecd8e9476a 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache
@@ -1,7 +1,7 @@
     @{{httpMethod}}{{#subresourceOperation}}
     @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
     @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
-    @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
     @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
         {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
             {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
@@ -10,5 +10,5 @@
         {{/hasMore}}{{/authMethods}}
     }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
     @ApiResponses(value = { {{#responses}}
-        @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
+        @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
     {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache
index 01ac3fc907d1..28d674fdd4f2 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache
@@ -1,7 +1,7 @@
     @{{httpMethod}}{{#subresourceOperation}}
     @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
     @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
-    @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
     @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
         {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
             {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
@@ -11,7 +11,7 @@
     }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
     @ApiResponses(value = { {{#responses}}
         @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
-    })
+    }){{/useSwaggerAnnotations}}
     public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
         return Response.ok().entity("magic!").build();
     }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache
index bf377adbd4d8..63c1772c3c06 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
+{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache
index f01e18d3523a..5c3d731f8388 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache
@@ -1 +1 @@
-{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
+{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
index 0dc89597ca1c..ec8264cf8f3b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -1,4 +1,6 @@
+{{#useSwaggerAnnotations}}
 import io.swagger.annotations.*;
+{{/useSwaggerAnnotations}}
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{#description}}
 /**
  * {{description}}
- **/{{/description}}
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
+ **/{{/description}}{{#useSwaggerAnnotations}}
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
-  @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
+  @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
   @JsonProperty("{{baseName}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
index b0316d58730d..c12b6a719e0e 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
@@ -42,12 +42,14 @@
       2.0
       provided
     
+    {{#useSwaggerAnnotations}}
     
       io.swagger
       swagger-annotations
       provided
       1.5.3
     
+    {{/useSwaggerAnnotations}}
     
       junit
       junit
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
index b931cfea9c9f..4434783a4611 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}}  {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}}  {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java
index 041542fec46e..0015ac2d81da 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 
 /**
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 26f2c5d849e4..f05d1f517565 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 
 /**
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
index 03145d6e6446..3764470fe325 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 
 /**
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
index f65ff69697d8..2f8c5b0511f5 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.Category;
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java
index 3f27a3b20234..990f5f85e236 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 
 /**
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
index f481ec8d0fb7..c46cb0766289 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
@@ -3,6 +3,7 @@ package org.openapitools.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 
 /**
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 9ffada31ae87..58abe9915cb2 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
index f5d49a3c4b21..3ea215fd3de3 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
@@ -2,6 +2,8 @@ package org.openapitools.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 19b4fb8672a3..43d65d72f381 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 67f1a62787a7..f29bd99493ae 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
index 6c812b8b6844..249f75701bef 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.ReadOnlyFirst;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
index b2cc76b7b8d3..db53f3c49bd1 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
index 134779f46fcb..501e9c7d2c22 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
index 4eb21f49a584..b31e9f551c84 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
index 373ea29aa253..87a1c546c192 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
index 83c5ac4e1821..56914b24020a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
index 3cf495a7b151..79c4f948f92a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
index 7a93f0b748b9..a2003eef8b9b 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
index 42348dcdc918..ce852c9d3e0d 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.OuterEnum;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 3acdf4471023..0ba22995c7a2 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
index 62bac3f66256..2d4ff70310f6 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 40af19634263..221814463303 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
index 2961088997d7..d0e0137e2107 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index cc446a6fce48..627a928a17b0 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
index c5fbe95d9f64..362ea187e754 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 339ae0912fdf..57705be9cd50 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
index e5585db2da5e..4d0ad8278e49 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
index 6fa1ec2f4c81..7dfe13b2cb9a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
index 9aa6bc737497..bec8bbd4669f 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
index f2b772249aef..4351bf390984 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
index c4c046c8953b..37d163744cbb 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
index bdb345ac05fd..6b669e30995a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.Category;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index b7349f0a2567..02c8630a47f6 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
index 5668baa8c702..d57dd6da2b2e 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
index ced9e763c59e..3c8f6153974f 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
index 47bd2cde5d3c..2e0a3d033218 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 9ffada31ae87..58abe9915cb2 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
index f5d49a3c4b21..3ea215fd3de3 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
@@ -2,6 +2,8 @@ package org.openapitools.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 19b4fb8672a3..43d65d72f381 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 67f1a62787a7..f29bd99493ae 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
index 6c812b8b6844..249f75701bef 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.ReadOnlyFirst;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
index b2cc76b7b8d3..db53f3c49bd1 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
index 134779f46fcb..501e9c7d2c22 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
index 4eb21f49a584..b31e9f551c84 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
index 373ea29aa253..87a1c546c192 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
index 83c5ac4e1821..56914b24020a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
index 3cf495a7b151..79c4f948f92a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
index 7a93f0b748b9..a2003eef8b9b 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
index 42348dcdc918..ce852c9d3e0d 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.OuterEnum;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 3acdf4471023..0ba22995c7a2 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
index 62bac3f66256..2d4ff70310f6 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 40af19634263..221814463303 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
index 2961088997d7..d0e0137e2107 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index cc446a6fce48..627a928a17b0 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
index c5fbe95d9f64..362ea187e754 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 339ae0912fdf..57705be9cd50 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
index e5585db2da5e..4d0ad8278e49 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
index 6fa1ec2f4c81..7dfe13b2cb9a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
index 9aa6bc737497..bec8bbd4669f 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
index f2b772249aef..4351bf390984 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
index c4c046c8953b..37d163744cbb 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
index bdb345ac05fd..6b669e30995a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.Category;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index b7349f0a2567..02c8630a47f6 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
index 5668baa8c702..d57dd6da2b2e 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
index ced9e763c59e..3c8f6153974f 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
index 47bd2cde5d3c..2e0a3d033218 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;

From 94806b8036e91122c93acc09f56bcb5ea46ef264 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Thu, 16 Aug 2018 00:23:27 +0800
Subject: [PATCH 25/27] update release table (#818)

---
 README.md | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index ad38bf7950c0..45f98af85527 100644
--- a/README.md
+++ b/README.md
@@ -80,22 +80,18 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 
 The OpenAPI Specification has undergone 3 revisions since initial creation in 2010.  The openapi-generator project has the following compatibilities with the OpenAPI Specification:
 
-OpenAPI Generator Version    | Release Date | OpenAPI Spec compatibility | Notes
----------------------------- | ------------ | -------------------------- | -----
-4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes (no fallback)
-3.3.0 (upcoming minor release)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release (breaking changes with fallbacks)
-3.2.2 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.2-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release
-[3.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.1) | 14.08.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.0) | 06.08.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.1.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.2) | 25.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.1.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.1) | 18.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.1.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.0) | 06.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Minor release (breaking changes with fallbacks)
-[3.0.3](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.3) | 27.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.0.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.2) | 18.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.1) | 11.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | Bugfix release
-[3.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.0) | 01.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | First release with breaking changes
+OpenAPI Generator Version    | Release Date | Notes
+---------------------------- | ------------ | -----
+4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| TBD | Major release with breaking changes (no fallback)
+3.3.0 (upcoming minor release)| TBD | Minor release (breaking changes with fallbacks)
+3.2.2 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.2-SNAPSHOT/)| TBD | Bugfix release
+[3.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.1) (latest stable release) | 14.08.2018 | Bugfix release
 
-### [1.2 - Artifacts on Maven Central](#table-of-contents)
+OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
+
+For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.
+
+## [1.2 - Artifacts on Maven Central](#table-of-contents)
 
 You can find our released artefacts on maven central:
 

From 6de09688ad99f0c2962fe14918101049403f87f5 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Thu, 16 Aug 2018 00:23:48 +0800
Subject: [PATCH 26/27] Add auto-generated readme for cpprestsdk client (#814)

* add auto-generated readme for cpprestsdk client

* update cpprest client sample

* remove error message from cmake
---
 .gitignore                                    |  6 ++
 .../languages/CppRestSdkClientCodegen.java    |  1 +
 .../cpp-rest-sdk-client/README.mustache       | 43 ++++++++++++++
 .../cpp-rest-sdk-client/cmake-lists.mustache  |  6 +-
 .../cpp-restsdk/.openapi-generator/VERSION    |  2 +-
 .../client/petstore/cpp-restsdk/ApiClient.cpp |  2 +-
 .../client/petstore/cpp-restsdk/ApiClient.h   |  2 +-
 .../petstore/cpp-restsdk/ApiConfiguration.cpp |  2 +-
 .../petstore/cpp-restsdk/ApiConfiguration.h   |  2 +-
 .../petstore/cpp-restsdk/ApiException.cpp     |  2 +-
 .../petstore/cpp-restsdk/ApiException.h       |  2 +-
 .../petstore/cpp-restsdk/CMakeLists.txt       |  6 +-
 .../petstore/cpp-restsdk/HttpContent.cpp      |  2 +-
 .../client/petstore/cpp-restsdk/HttpContent.h |  2 +-
 .../client/petstore/cpp-restsdk/IHttpBody.h   |  2 +-
 .../client/petstore/cpp-restsdk/JsonBody.cpp  |  2 +-
 .../client/petstore/cpp-restsdk/JsonBody.h    |  2 +-
 .../client/petstore/cpp-restsdk/ModelBase.cpp |  2 +-
 .../client/petstore/cpp-restsdk/ModelBase.h   |  2 +-
 .../cpp-restsdk/MultipartFormData.cpp         |  2 +-
 .../petstore/cpp-restsdk/MultipartFormData.h  |  2 +-
 .../client/petstore/cpp-restsdk/Object.cpp    |  2 +-
 samples/client/petstore/cpp-restsdk/Object.h  |  2 +-
 samples/client/petstore/cpp-restsdk/README.md | 35 ++++++++++++
 .../petstore/cpp-restsdk/api/PetApi.cpp       |  2 +-
 .../client/petstore/cpp-restsdk/api/PetApi.h  |  2 +-
 .../petstore/cpp-restsdk/api/StoreApi.cpp     |  2 +-
 .../petstore/cpp-restsdk/api/StoreApi.h       |  2 +-
 .../petstore/cpp-restsdk/api/UserApi.cpp      |  2 +-
 .../client/petstore/cpp-restsdk/api/UserApi.h |  2 +-
 .../cpp-restsdk/model/ApiResponse.cpp         |  2 +-
 .../petstore/cpp-restsdk/model/ApiResponse.h  |  2 +-
 .../petstore/cpp-restsdk/model/Category.cpp   |  2 +-
 .../petstore/cpp-restsdk/model/Category.h     |  2 +-
 .../petstore/cpp-restsdk/model/Order.cpp      |  2 +-
 .../client/petstore/cpp-restsdk/model/Order.h |  2 +-
 .../client/petstore/cpp-restsdk/model/Pet.cpp |  2 +-
 .../client/petstore/cpp-restsdk/model/Pet.h   |  2 +-
 .../client/petstore/cpp-restsdk/model/Tag.cpp |  2 +-
 .../client/petstore/cpp-restsdk/model/Tag.h   |  2 +-
 .../petstore/cpp-restsdk/model/User.cpp       |  2 +-
 .../client/petstore/cpp-restsdk/model/User.h  |  2 +-
 samples/client/petstore/cpp-restsdk/pom.xml   | 57 +++++++++++++++++++
 43 files changed, 180 insertions(+), 46 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
 create mode 100644 samples/client/petstore/cpp-restsdk/README.md
 create mode 100644 samples/client/petstore/cpp-restsdk/pom.xml

diff --git a/.gitignore b/.gitignore
index 58819fc69df9..fd191d361953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,12 @@ samples/client/petstore/qt5cpp/PetStore/PetStore
 samples/client/petstore/qt5cpp/PetStore/Makefile
 samples/client/petstore/qt5cpp/PetStore/PetStore.pro.user
 
+# cpprestsdk
+samples/client/petstore/cpp-restsdk/CMakeCache.txt
+samples/client/petstore/cpp-restsdk/CMakeFiles/
+samples/client/petstore/cpp-restsdk/Makefile
+samples/client/petstore/cpp-restsdk/cmake_install.cmake
+
 #Java/Android
 **/.gradle
 samples/client/petstore/java/hello.txt
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
index e631fed98927..df0e6722863d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
@@ -139,6 +139,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("cmake-lists.mustache", "", "CMakeLists.txt"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
 
         languageSpecificPrimitives = new HashSet(
                 Arrays.asList("int", "char", "bool", "long", "float", "double", "int32_t", "int64_t"));
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
new file mode 100644
index 000000000000..c5681ca20de8
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
@@ -0,0 +1,43 @@
+# C++ API client
+
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+
+## Overview
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI spec](https://openapis.org) from a remote server, you can easily generate an API client.
+
+- API version: {{appVersion}}
+- Package version: {{packageVersion}}
+{{^hideGenerationTimestamp}}
+- Build date: {{generatedDate}}
+{{/hideGenerationTimestamp}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+- API namespace: {{{apiPackage}}}
+- Model namespace: {{{modelPackage}}}
+
+## Installation
+
+### Prerequisites
+
+Install [cpprestsdk](https://github.com/Microsoft/cpprestsdk).
+
+- Windows: `vcpkg install cpprestsdk cpprestsdk:x64-windows`
+- Mac: `brew install cpprestsdk`
+- Linux: `sudo apt-get install libcpprest-dev`
+
+### Build
+
+```sh
+cmake -DCPPREST_ROOT=/usr -DCMAKE_CXX_FLAGS="-I/usr/local/opt/openssl/include" -DCMAKE_MODULE_LINKER_FLAGS="-L/usr/local/opt/openssl/lib"
+make
+```
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
index 1020ee0a3ac1..80bc39635c07 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
@@ -31,14 +31,10 @@ message("A ${CMAKE_BUILD_TYPE} build configuration is detected")
 #find_package(Boost 1.45.0 REQUIRED COMPONENTS ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
 
 # build and set path to cpp rest sdk
-#set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/../../../developmentTools/3rdParty/cpprest)
+set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/3rdParty/cpprest)
 set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
 set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
 
-if( NOT DEFINED CPPREST_ROOT )
-    message( FATAL_ERROR "Failed to find cpprest SDK (or missing components). Double check that \"CPPREST_ROOT\" is properly set")
-endif( NOT DEFINED CPPREST_ROOT )
-
 include_directories(${PROJECT_SOURCE_DIR} api model ${CPPREST_INCLUDE_DIR})
 
 #SUPPORTING FILES
diff --git a/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
index 14900cee60e8..105bb87d77b3 100644
--- a/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
+++ b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
index a9bb151f9e84..32a7e44548c5 100644
--- a/samples/client/petstore/cpp-restsdk/ApiClient.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h
index f39ca55d1074..2381ce335a38 100644
--- a/samples/client/petstore/cpp-restsdk/ApiClient.h
+++ b/samples/client/petstore/cpp-restsdk/ApiClient.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
index 5ed86c2fe9dc..292054f38e69 100644
--- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
index 8ff2be702909..c6dde17bc8c6 100644
--- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
+++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiException.cpp b/samples/client/petstore/cpp-restsdk/ApiException.cpp
index 1def094d90a3..150d30bbd2ce 100644
--- a/samples/client/petstore/cpp-restsdk/ApiException.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiException.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiException.h b/samples/client/petstore/cpp-restsdk/ApiException.h
index 00ab158d8a2b..517313c47f51 100644
--- a/samples/client/petstore/cpp-restsdk/ApiException.h
+++ b/samples/client/petstore/cpp-restsdk/ApiException.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/CMakeLists.txt b/samples/client/petstore/cpp-restsdk/CMakeLists.txt
index 9b5635f905a4..5e7e1cd95a0d 100644
--- a/samples/client/petstore/cpp-restsdk/CMakeLists.txt
+++ b/samples/client/petstore/cpp-restsdk/CMakeLists.txt
@@ -31,14 +31,10 @@ message("A ${CMAKE_BUILD_TYPE} build configuration is detected")
 #find_package(Boost 1.45.0 REQUIRED COMPONENTS ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
 
 # build and set path to cpp rest sdk
-#set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/../../../developmentTools/3rdParty/cpprest)
+set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/3rdParty/cpprest)
 set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
 set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
 
-if( NOT DEFINED CPPREST_ROOT )
-    message( FATAL_ERROR "Failed to find cpprest SDK (or missing components). Double check that \"CPPREST_ROOT\" is properly set")
-endif( NOT DEFINED CPPREST_ROOT )
-
 include_directories(${PROJECT_SOURCE_DIR} api model ${CPPREST_INCLUDE_DIR})
 
 #SUPPORTING FILES
diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
index ef9cbaaa0fe4..7c7ac5840ba6 100644
--- a/samples/client/petstore/cpp-restsdk/HttpContent.cpp
+++ b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.h b/samples/client/petstore/cpp-restsdk/HttpContent.h
index e73cacb9f7e6..864ec2075e63 100644
--- a/samples/client/petstore/cpp-restsdk/HttpContent.h
+++ b/samples/client/petstore/cpp-restsdk/HttpContent.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/IHttpBody.h b/samples/client/petstore/cpp-restsdk/IHttpBody.h
index 2462d4ed5703..dc9bc6f089c2 100644
--- a/samples/client/petstore/cpp-restsdk/IHttpBody.h
+++ b/samples/client/petstore/cpp-restsdk/IHttpBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
index bf8101adfa73..c2f9c451061f 100644
--- a/samples/client/petstore/cpp-restsdk/JsonBody.cpp
+++ b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.h b/samples/client/petstore/cpp-restsdk/JsonBody.h
index 47eee72244b7..3f5702dfb882 100644
--- a/samples/client/petstore/cpp-restsdk/JsonBody.h
+++ b/samples/client/petstore/cpp-restsdk/JsonBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
index f451f594b6c5..c0ef13e4ac24 100644
--- a/samples/client/petstore/cpp-restsdk/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.h b/samples/client/petstore/cpp-restsdk/ModelBase.h
index dff9405b649b..8c2a0d80a002 100644
--- a/samples/client/petstore/cpp-restsdk/ModelBase.h
+++ b/samples/client/petstore/cpp-restsdk/ModelBase.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
index 271f9cb16147..b1cd75ded0e4 100644
--- a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
+++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
index 6a081df69f10..6542845bcc19 100644
--- a/samples/client/petstore/cpp-restsdk/MultipartFormData.h
+++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/Object.cpp b/samples/client/petstore/cpp-restsdk/Object.cpp
index 6702388f1b02..42694b488ed4 100644
--- a/samples/client/petstore/cpp-restsdk/Object.cpp
+++ b/samples/client/petstore/cpp-restsdk/Object.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/Object.h b/samples/client/petstore/cpp-restsdk/Object.h
index 6d731d337a67..a8f58b43a972 100644
--- a/samples/client/petstore/cpp-restsdk/Object.h
+++ b/samples/client/petstore/cpp-restsdk/Object.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/README.md b/samples/client/petstore/cpp-restsdk/README.md
new file mode 100644
index 000000000000..92981e519c4d
--- /dev/null
+++ b/samples/client/petstore/cpp-restsdk/README.md
@@ -0,0 +1,35 @@
+# C++ API client
+
+This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+
+## Overview
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI spec](https://openapis.org) from a remote server, you can easily generate an API client.
+
+- API version: 1.0.0
+- Package version: 
+- Build package: org.openapitools.codegen.languages.CppRestSdkClientCodegen
+
+- API namespace: org.openapitools.client.api
+- Model namespace: org.openapitools.client.model
+
+## Installation
+
+### Prerequisites
+
+Install [cpprestsdk](https://github.com/Microsoft/cpprestsdk).
+
+- Windows: `vcpkg install cpprestsdk cpprestsdk:x64-windows`
+- Mac: `brew install cpprestsdk`
+- Linux: `sudo apt-get install libcpprest-dev`
+
+### Build
+
+```sh
+cmake -DCPPREST_ROOT=/usr -DCMAKE_CXX_FLAGS="-I/usr/local/opt/openssl/include" -DCMAKE_MODULE_LINKER_FLAGS="-L/usr/local/opt/openssl/lib"
+make
+```
+
+## Author
+
+
+
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
index d90f5119a07c..c2f9a7f99f73 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
index b2d42109f457..e63710124ca7 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
index 267c8d700965..ca188d173289 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
index 0b9f2b5c0f43..f952506a16dc 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
index 91980ca0069c..9a466b26c153 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h
index 76e5e7894dff..d74deecb3d08 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
index a6655ee08e0f..b93cbb85328c 100644
--- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
index 6a569200a774..fc1bf4e61092 100644
--- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
+++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Category.cpp b/samples/client/petstore/cpp-restsdk/model/Category.cpp
index 202d10217383..534940108008 100644
--- a/samples/client/petstore/cpp-restsdk/model/Category.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Category.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Category.h b/samples/client/petstore/cpp-restsdk/model/Category.h
index c0d2845d49f9..ab370a4bb03c 100644
--- a/samples/client/petstore/cpp-restsdk/model/Category.h
+++ b/samples/client/petstore/cpp-restsdk/model/Category.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Order.cpp b/samples/client/petstore/cpp-restsdk/model/Order.cpp
index 18a68d8f34d2..7f5b5464d5f1 100644
--- a/samples/client/petstore/cpp-restsdk/model/Order.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Order.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Order.h b/samples/client/petstore/cpp-restsdk/model/Order.h
index a53ddd22cc1a..b2d4410d6436 100644
--- a/samples/client/petstore/cpp-restsdk/model/Order.h
+++ b/samples/client/petstore/cpp-restsdk/model/Order.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/model/Pet.cpp
index bb346dfd76c1..78fed60be7d5 100644
--- a/samples/client/petstore/cpp-restsdk/model/Pet.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Pet.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.h b/samples/client/petstore/cpp-restsdk/model/Pet.h
index c2617e844c30..c4e0d0b49787 100644
--- a/samples/client/petstore/cpp-restsdk/model/Pet.h
+++ b/samples/client/petstore/cpp-restsdk/model/Pet.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/model/Tag.cpp
index d931065e8059..8c0c537cf260 100644
--- a/samples/client/petstore/cpp-restsdk/model/Tag.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Tag.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.h b/samples/client/petstore/cpp-restsdk/model/Tag.h
index 3523c66e02e0..b2b49f58c433 100644
--- a/samples/client/petstore/cpp-restsdk/model/Tag.h
+++ b/samples/client/petstore/cpp-restsdk/model/Tag.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/User.cpp b/samples/client/petstore/cpp-restsdk/model/User.cpp
index faca6ef4c96d..511811b9f087 100644
--- a/samples/client/petstore/cpp-restsdk/model/User.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/User.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/User.h b/samples/client/petstore/cpp-restsdk/model/User.h
index 318d3723831f..aca144de9334 100644
--- a/samples/client/petstore/cpp-restsdk/model/User.h
+++ b/samples/client/petstore/cpp-restsdk/model/User.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.2.2-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/pom.xml b/samples/client/petstore/cpp-restsdk/pom.xml
new file mode 100644
index 000000000000..f127ec6ede34
--- /dev/null
+++ b/samples/client/petstore/cpp-restsdk/pom.xml
@@ -0,0 +1,57 @@
+
+    4.0.0
+    org.openapitools
+    CppRestPetstoreClientTests
+    pom
+    1.0-SNAPSHOT
+    CppRest Petstore Client
+    
+        
+            
+                maven-dependency-plugin
+                
+                    
+                        package
+                        
+                            copy-dependencies
+                        
+                        
+                            ${project.build.directory}
+                        
+                    
+                
+            
+            
+                org.codehaus.mojo
+                exec-maven-plugin
+                1.2.1
+                
+                    
+                        cmake
+                        pre-integration-test
+                        
+                            exec
+                        
+                        
+                            cmake
+                            
+                                -DCMAKE_CXX_FLAGS="-I/usr/local/opt/openssl/include"
+                                -DCMAKE_MODULE_LINKER_FLAGS="-L/usr/local/opt/openssl/lib"
+                            
+                        
+                    
+                    
+                        make
+                        integration-test
+                        
+                            exec
+                        
+                        
+                            make
+                        
+                    
+                
+            
+        
+    
+

From ca651becf840ef50f4a6836c22a51c09ab149397 Mon Sep 17 00:00:00 2001
From: William Cheng 
Date: Thu, 16 Aug 2018 00:24:19 +0800
Subject: [PATCH 27/27] Add support for multi consumes in inline schema (#789)

* add support for multi consumes in inline schema

* add copyright

* revert redirectTestOutputToFile change in pom.xml
---
 .../codegen/InlineModelResolver.java          |  49 +-
 .../codegen/InlineModelResolverTest.java      | 621 +++++++++---------
 2 files changed, 362 insertions(+), 308 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
index 057939f680b4..742942e4967f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ * Copyright 2018 SmartBear Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openapitools.codegen;
 
 import io.swagger.v3.oas.models.OpenAPI;
@@ -18,11 +35,10 @@ import org.slf4j.LoggerFactory;
 
 import io.swagger.v3.oas.models.media.Content;
 import io.swagger.v3.oas.models.media.MediaType;
-import java.util.ArrayList;
+
+import java.util.*;
+
 import io.swagger.v3.oas.models.media.XML;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class InlineModelResolver {
     private OpenAPI openapi;
@@ -68,9 +84,23 @@ public class InlineModelResolver {
                                     Schema schema = new Schema();
                                     schema.set$ref(modelName);
                                     mt.setSchema(schema);
-                                    // TODO assume JSON, need to support other payload later
-                                    content.addMediaType("application/json", mt);
+
+                                    // get "consumes", e.g. application/xml, application/json
+                                    Set consumes;
+                                    if (requestBody == null || requestBody.getContent() == null || requestBody.getContent().isEmpty()) {
+                                        consumes = new HashSet<>();
+                                        consumes.add("application/json"); // default to application/json
+                                        LOGGER.info("Default to application/json for inline body schema");
+                                    } else {
+                                        consumes = requestBody.getContent().keySet();
+                                    }
+
+                                    for (String consume : consumes) {
+                                        content.addMediaType(consume, mt);
+                                    }
+
                                     rb.setContent(content);
+
                                     // add to openapi "components"
                                     if (openapi.getComponents().getRequestBodies() == null) {
                                         Map requestBodies = new HashMap();
@@ -291,7 +321,7 @@ public class InlineModelResolver {
     /**
      * This function fix models that are string (mostly enum). Before this fix, the
      * example would look something like that in the doc: "\"example from def\""
-     * 
+     *
      * @param m Schema implementation
      */
     private void fixStringModel(Schema m) {
@@ -334,10 +364,7 @@ public class InlineModelResolver {
         int count = 0;
         boolean done = false;
         key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", ""); // FIXME: a parameter
-                                                       // should not be
-                                                       // assigned. Also declare
-                                                       // the methods parameters
-                                                       // as 'final'.
+        // should not be assigned. Also declare the methods parameters as 'final'.
         while (!done) {
             String name = key;
             if (count > 0) {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
index 8ec2ee8ef1dd..48d840bcaad0 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
@@ -1,44 +1,69 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ * Copyright 2018 SmartBear Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openapitools.codegen;
 
 import io.swagger.v3.oas.models.*;
+import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
 import org.apache.commons.lang3.StringUtils;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.testng.AssertJUnit.*;
-/*
+
 @SuppressWarnings("static-method")
 public class InlineModelResolverTest {
     @Test
     public void resolveInlineModelTestWithoutTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
-
-        openapi.addDefinition("User", new ModelImpl()
+        openapi.setComponents(new Components());
+        openapi.getComponents().addSchemas("User", new ObjectSchema()
                 .name("user")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("address", new ObjectProperty()
-                        ._default("default")
-                        .access("access")
+                .addProperties("name", new StringSchema())
+                .addProperties("address", new ObjectSchema()
+                        .description("description")
+                        //._default("default")
+                        //.access("access")
                         .readOnly(false)
-                        .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
+
+        assertNotNull(((Schema) openapi.getComponents().getSchemas().get("User")).getProperties().get("address"));
 
         new InlineModelResolver().flatten(openapi);
 
-        ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User");
+        Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
 
         assertNotNull(user);
-        assertTrue(user.getProperties().get("address") instanceof RefProperty);
+        assertNotNull(user.getProperties().get("address"));
+        assertNotNull(((Schema) user.getProperties().get("address")).get$ref());
+        assertEquals(((Schema) user.getProperties().get("address")).get$ref(), "#/components/schemas/User_address");
 
-        ModelImpl address = (ModelImpl)openapi.getDefinitions().get("User_address");
+        Schema address = (Schema) openapi.getComponents().getSchemas().get("User_address");
         assertNotNull(address);
         assertNotNull(address.getProperties().get("city"));
         assertNotNull(address.getProperties().get("street"));
@@ -47,255 +72,257 @@ public class InlineModelResolverTest {
     @Test
     public void resolveInlineModelTestWithTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
-
-        openapi.addDefinition("User", new ModelImpl()
+        openapi.setComponents(new Components());
+        openapi.getComponents().addSchemas("User", new ObjectSchema()
                 .name("user")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("address", new ObjectProperty()
+                .addProperties("name", new StringSchema())
+                .addProperties("address", new ObjectSchema()
                         .title("UserAddressTitle")
-                        ._default("default")
-                        .access("access")
                         .readOnly(false)
-                        .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User");
+        Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
 
         assertNotNull(user);
-        assertTrue(user.getProperties().get("address") instanceof RefProperty);
+        assertTrue(user.getProperties().get("address") instanceof Schema);
 
-        ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle");
+        Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
         assertNotNull(address);
         assertNotNull(address.getProperties().get("city"));
         assertNotNull(address.getProperties().get("street"));
-    }    
-    
+    }
+
     @Test
     public void resolveInlineModel2EqualInnerModels() throws Exception {
         OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+        openapi.getComponents().addSchemas("User", new ObjectSchema()
+                .name("user")
+                .description("a common user")
+                .addProperties("name", new StringSchema())
+                .addProperties("address", new ObjectSchema()
+                        .title("UserAddressTitle")
+                        .readOnly(false)
+                        .description("description")
+                        .name("name")
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
 
-        openapi.addDefinition("User", new ModelImpl()
+        openapi.getComponents().addSchemas("AnotherUser", new ObjectSchema()
                 .name("user")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("address", new ObjectProperty()
+                .addProperties("name", new StringSchema())
+                .addProperties("lastName", new StringSchema())
+                .addProperties("address", new ObjectSchema()
                         .title("UserAddressTitle")
-                        ._default("default")
-                        .access("access")
                         .readOnly(false)
-                        .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
-        
-        openapi.addDefinition("AnotherUser", new ModelImpl()
-                .name("user")
-                .description("a common user")
-                .property("name", new StringProperty())
-                .property("lastName", new StringProperty())
-                .property("address", new ObjectProperty()
-                        .title("UserAddressTitle")
-                        ._default("default")
-                        .access("access")
-                        .readOnly(false)
-                        .required(true)
-                        .description("description")
-                        .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));        
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User");
+        ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User");
 
         assertNotNull(user);
-        assertTrue(user.getProperties().get("address") instanceof RefProperty);
+        assertTrue(user.getProperties().get("address") instanceof Schema);
 
-        ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle");
+        Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
         assertNotNull(address);
         assertNotNull(address.getProperties().get("city"));
         assertNotNull(address.getProperties().get("street"));
-        ModelImpl duplicateAddress = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle_0");
+        Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_0");
         assertNull(duplicateAddress);
-    }        
+    }
 
     @Test
     public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
-
-        openapi.addDefinition("User", new ModelImpl()
+        openapi.setComponents(new Components());
+        openapi.getComponents().addSchemas("User", new ObjectSchema()
                 .name("user")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("address", new ObjectProperty()
+                .addProperties("name", new StringSchema())
+                .addProperties("address", new ObjectSchema()
                         .title("UserAddressTitle")
-                        ._default("default")
-                        .access("access")
                         .readOnly(false)
-                        .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
-        
-        openapi.addDefinition("AnotherUser", new ModelImpl()
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
+
+        openapi.getComponents().addSchemas("AnotherUser", new ObjectSchema()
                 .name("AnotherUser")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("lastName", new StringProperty())
-                .property("address", new ObjectProperty()
+                .addProperties("name", new StringSchema())
+                .addProperties("lastName", new StringSchema())
+                .addProperties("address", new ObjectSchema()
                         .title("UserAddressTitle")
-                        ._default("default")
-                        .access("access")
                         .readOnly(false)
-                        .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())
-                .property("apartment", new StringProperty())));
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())
+                        .addProperties("apartment", new StringSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User");
+        Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
 
         assertNotNull(user);
-        assertTrue(user.getProperties().get("address") instanceof RefProperty);
+        assertTrue(user.getProperties().get("address") instanceof Schema);
 
-        ModelImpl address = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle");
+        Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
         assertNotNull(address);
         assertNotNull(address.getProperties().get("city"));
         assertNotNull(address.getProperties().get("street"));
-        ModelImpl duplicateAddress = (ModelImpl)openapi.getDefinitions().get("UserAddressTitle_1");
+        Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_1");
         assertNotNull(duplicateAddress);
         assertNotNull(duplicateAddress.getProperties().get("city"));
         assertNotNull(duplicateAddress.getProperties().get("street"));
         assertNotNull(duplicateAddress.getProperties().get("apartment"));
-    }        
-    
-    
+    }
+
     @Test
     public void testInlineResponseModel() throws Exception {
         OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
 
-        openapi.path("/foo/bar", new Path()
-            .get(new Operation()
-                    .response(200, new Response()
-                            .description("it works!")
-                            .schema(new ObjectProperty()
-                                    .property("name", new StringProperty()).vendorExtension("x-ext", "ext-prop")))))
-        .path("/foo/baz", new Path()
-                .get(new Operation()
-                        .response(200, new Response()
-                                .vendorExtension("x-foo", "bar")
+        Map propExt = new HashMap<>();
+        propExt.put("x-ext", "ext-prop");
+
+        Map responseExt = new HashMap<>();
+        responseExt.put("x-foo", "bar");
+
+        openapi.path("/foo/bar", new PathItem()
+                .get(new Operation().responses(new ApiResponses().addApiResponse("200", new ApiResponse()
+                        .description("it works!")
+                        .content(new Content().addMediaType("application/json",
+                                new MediaType().schema(new ObjectSchema().title("inline_response_200")
+                                        .addProperties("name", new StringSchema()).extensions(propExt))))))))
+                .path("/foo/baz", new PathItem()
+                        .get(new Operation().responses(new ApiResponses().addApiResponse("200", new ApiResponse()
                                 .description("it works!")
-                                .schema(new ObjectProperty()
-                                        .property("name", new StringProperty()).vendorExtension("x-ext", "ext-prop")))));
+                                .extensions(responseExt)
+                                .content(new Content().addMediaType("application/json",
+                                        new MediaType().schema(new ObjectSchema()
+                                                .addProperties("name", new StringSchema()).extensions(propExt))))))));
+
         new InlineModelResolver().flatten(openapi);
 
-        Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses();
+        Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses();
 
-        Response response = responses.get("200");
+        ApiResponse response = responses.get("200");
         assertNotNull(response);
-        Property schema = response.getSchema();
-        assertTrue(schema instanceof RefProperty);
-        assertEquals(1, schema.getVendorExtensions().size());
-        assertEquals("ext-prop", schema.getVendorExtensions().get("x-ext"));
+        Schema schema = response.getContent().get("application/json").getSchema();
+        assertTrue(schema instanceof Schema);
+        assertEquals(1, schema.getExtensions().size());
+        assertEquals("ext-prop", schema.getExtensions().get("x-ext"));
 
-        ModelImpl model = (ModelImpl)openapi.getDefinitions().get("inline_response_200");
+        Schema model = (Schema) openapi.getComponents().getSchemas().get("inline_response_200");
         assertTrue(model.getProperties().size() == 1);
         assertNotNull(model.getProperties().get("name"));
-        assertTrue(model.getProperties().get("name") instanceof StringProperty);
+        assertTrue(model.getProperties().get("name") instanceof StringSchema);
     }
 
-    
     @Test
     public void testInlineResponseModelWithTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
 
-        String responseTitle = "GetBarResponse";
-    openapi.path("/foo/bar", new Path()
-            .get(new Operation()
-                    .response(200, new Response()
-                            .description("it works!")
-                            .schema(new ObjectProperty().title(responseTitle)
-                                    .property("name", new StringProperty())))))
-        .path("/foo/baz", new Path()
-                .get(new Operation()
-                        .response(200, new Response()
-                                .vendorExtension("x-foo", "bar")
+        Map propExt = new HashMap<>();
+        propExt.put("x-ext", "ext-prop");
+
+        Map responseExt = new HashMap<>();
+        responseExt.put("x-foo", "bar");
+
+        openapi.path("/foo/bar", new PathItem()
+                .get(new Operation().responses(new ApiResponses().addApiResponse("200", new ApiResponse()
+                        .description("it works!")
+                        .content(new Content().addMediaType("application/json",
+                                new MediaType().schema(new ObjectSchema().title("GetBarResponse")
+                                        .addProperties("name", new StringSchema()).extensions(propExt))))))))
+                .path("/foo/baz", new PathItem()
+                        .get(new Operation().responses(new ApiResponses().addApiResponse("200", new ApiResponse()
                                 .description("it works!")
-                                .schema(new ObjectProperty()
-                                        .property("name", new StringProperty())))));
+                                .extensions(responseExt)
+                                .content(new Content().addMediaType("application/json",
+                                        new MediaType().schema(new ObjectSchema()
+                                                .addProperties("name", new StringSchema()).extensions(propExt))))))));
+
         new InlineModelResolver().flatten(openapi);
 
-        Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses();
+        Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses();
 
-        Response response = responses.get("200");
+        ApiResponse response = responses.get("200");
         assertNotNull(response);
-        assertTrue(response.getSchema() instanceof RefProperty);
+        Schema schema = response.getContent().get("application/json").getSchema();
+        assertTrue(schema instanceof Schema);
+        assertEquals(1, schema.getExtensions().size());
+        assertEquals("ext-prop", schema.getExtensions().get("x-ext"));
 
-        ModelImpl model = (ModelImpl)openapi.getDefinitions().get(responseTitle);
+        Schema model = (Schema) openapi.getComponents().getSchemas().get("GetBarResponse");
         assertTrue(model.getProperties().size() == 1);
         assertNotNull(model.getProperties().get("name"));
-        assertTrue(model.getProperties().get("name") instanceof StringProperty);
+        assertTrue(model.getProperties().get("name") instanceof StringSchema);
     }
+
+
     
-    
+    /*
     @Test
-    public void resolveInlineArrayModelWithTitle() throws Exception {
+    public void resolveInlineArraySchemaWithTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
 
-        openapi.addDefinition("User", new ArrayModel()
-                .items(new ObjectProperty()
+        openapi.getComponents().addSchemas("User", new ArraySchema()
+                .items(new ObjectSchema()
                         .title("InnerUserTitle")
-                        ._default("default")
                         .access("access")
                         .readOnly(false)
                         .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        Model model = openapi.getDefinitions().get("User");
-        assertTrue(model instanceof ArrayModel);
+        Schema model = openapi.getComponents().getSchemas().get("User");
+        assertTrue(model instanceof ArraySchema);
 
-        Model user = openapi.getDefinitions().get("InnerUserTitle");
+        Schema user = openapi.getComponents().getSchemas().get("InnerUserTitle");
         assertNotNull(user);
         assertEquals("description", user.getDescription());
     }
-    
+/*
     @Test
-    public void resolveInlineArrayModelWithoutTitle() throws Exception {
+    public void resolveInlineArraySchemaWithoutTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
 
-        openapi.addDefinition("User", new ArrayModel()
-                .items(new ObjectProperty()
+        openapi.getComponents().addSchemas("User", new ArraySchema()
+                .items(new ObjectSchema()
                         ._default("default")
                         .access("access")
                         .readOnly(false)
                         .required(true)
                         .description("description")
                         .name("name")
-                        .property("street", new StringProperty())
-                        .property("city", new StringProperty())));
+                        .addProperties("street", new StringSchema())
+                        .addProperties("city", new StringSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        Model model = openapi.getDefinitions().get("User");
-        assertTrue(model instanceof ArrayModel);
+        Schema model = openapi.getComponents().getSchemas().get("User");
+        assertTrue(model instanceof ArraySchema);
 
-        Model user = openapi.getDefinitions().get("User_inner");
+        Model user = openapi.getComponents().getSchemas().get("User_inner");
         assertNotNull(user);
         assertEquals("description", user.getDescription());
     }    
@@ -311,10 +338,10 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ModelImpl()
-                                        .property("address", new ObjectProperty()
-                                            .property("street", new StringProperty()))
-                                        .property("name", new StringProperty())))));
+                                .schema(new ObjectSchema()
+                                        .addProperties("address", new ObjectSchema()
+                                            .addProperties("street", new StringSchema()))
+                                        .addProperties("name", new StringSchema())))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -322,10 +349,10 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
         assertTrue(bp.getSchema() instanceof RefModel);
 
-        Model body = openapi.getDefinitions().get("body");
-        assertTrue(body instanceof ModelImpl);
+        Model body = openapi.getComponents().getSchemas().get("body");
+        assertTrue(body instanceof ObjectSchema);
 
-        ModelImpl impl = (ModelImpl) body;
+        ObjectSchema impl = (ObjectSchema) body;
         assertNotNull(impl.getProperties().get("address"));
     }
 
@@ -337,12 +364,12 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ModelImpl()
-                                        .property("address", new ObjectProperty()
-                                                .property("street", new StringProperty()
+                                .schema(new ObjectSchema()
+                                        .addProperties("address", new ObjectSchema()
+                                                .addProperties("street", new StringSchema()
                                                         .required(true))
                                                 .required(true))
-                                        .property("name", new StringProperty())))));
+                                        .addProperties("name", new StringSchema())))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -350,24 +377,24 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
         assertTrue(bp.getSchema() instanceof RefModel);
 
-        Model body = openapi.getDefinitions().get("body");
-        assertTrue(body instanceof ModelImpl);
+        Model body = openapi.getComponents().getSchemas().get("body");
+        assertTrue(body instanceof ObjectSchema);
 
-        ModelImpl impl = (ModelImpl) body;
+        ObjectSchema impl = (ObjectSchema) body;
         assertNotNull(impl.getProperties().get("address"));
 
         Property addressProperty = impl.getProperties().get("address");
-        assertTrue(addressProperty instanceof RefProperty);
+        assertTrue(addressProperty instanceof Schema);
         assertTrue(addressProperty.getRequired());
 
-        Model helloAddress = openapi.getDefinitions().get("hello_address");
-        assertTrue(helloAddress instanceof ModelImpl);
+        Model helloAddress = openapi.getComponents().getSchemas().get("hello_address");
+        assertTrue(helloAddress instanceof ObjectSchema);
 
-        ModelImpl addressImpl = (ModelImpl) helloAddress;
+        ObjectSchema addressImpl = (ObjectSchema) helloAddress;
         assertNotNull(addressImpl);
 
         Property streetProperty = addressImpl.getProperties().get("street");
-        assertTrue(streetProperty instanceof  StringProperty);
+        assertTrue(streetProperty instanceof  StringSchema);
         assertTrue(streetProperty.getRequired());
     }
     
@@ -375,7 +402,7 @@ public class InlineModelResolverTest {
     public void resolveInlineBodyParameterWithTitle() throws Exception {
         OpenAPI openapi = new OpenAPI();
 
-        ModelImpl addressModelItem = new ModelImpl();
+        ObjectSchema addressModelItem = new ObjectSchema();
         String addressModelName = "DetailedAddress";
     addressModelItem.setTitle(addressModelName);
     openapi.path("/hello", new Path()
@@ -383,9 +410,9 @@ public class InlineModelResolverTest {
                         .parameter(new BodyParameter()
                                 .name("body")
                                 .schema(addressModelItem
-                                        .property("address", new ObjectProperty()
-                                            .property("street", new StringProperty()))
-                                        .property("name", new StringProperty())))));
+                                        .addProperties("address", new ObjectSchema()
+                                            .addProperties("street", new StringSchema()))
+                                        .addProperties("name", new StringSchema())))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -393,10 +420,10 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
         assertTrue(bp.getSchema() instanceof RefModel);
 
-        Model body = openapi.getDefinitions().get(addressModelName);
-        assertTrue(body instanceof ModelImpl);
+        Model body = openapi.getComponents().getSchemas().get(addressModelName);
+        assertTrue(body instanceof ObjectSchema);
 
-        ModelImpl impl = (ModelImpl) body;
+        ObjectSchema impl = (ObjectSchema) body;
         assertNotNull(impl.getProperties().get("address"));
     }    
 
@@ -408,7 +435,7 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ModelImpl()
+                                .schema(new ObjectSchema()
                                         .type("string")
                                         .format("binary")))));
 
@@ -416,8 +443,8 @@ public class InlineModelResolverTest {
 
         Operation operation = openapi.getPaths().get("/hello").getGet();
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
-        assertTrue(bp.getSchema() instanceof ModelImpl);
-        ModelImpl m = (ModelImpl) bp.getSchema();
+        assertTrue(bp.getSchema() instanceof ObjectSchema);
+        ObjectSchema m = (ObjectSchema) bp.getSchema();
         assertEquals("string", m.getType());
         assertEquals("binary", m.getFormat());
     }
@@ -430,10 +457,10 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ArrayModel()
-                                        .items(new ObjectProperty()
-                                            .property("address", new ObjectProperty()
-                                                .property("street", new StringProperty())))))));
+                                .schema(new ArraySchema()
+                                        .items(new ObjectSchema()
+                                            .addProperties("address", new ObjectSchema()
+                                                .addProperties("street", new StringSchema())))))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -443,34 +470,34 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter) param;
         Model schema = bp.getSchema();
 
-        assertTrue(schema instanceof ArrayModel);
+        assertTrue(schema instanceof ArraySchema);
 
-        ArrayModel am = (ArrayModel) schema;
+        ArraySchema am = (ArraySchema) schema;
         Property inner = am.getItems();
-        assertTrue(inner instanceof RefProperty);
+        assertTrue(inner instanceof Schema);
 
-        RefProperty rp = (RefProperty) inner;
+        Schema rp = (Schema) inner;
 
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/body");
         assertEquals(rp.getSimpleRef(), "body");
 
-        Model inline = openapi.getDefinitions().get("body");
+        Model inline = openapi.getComponents().getSchemas().get("body");
         assertNotNull(inline);
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
-        RefProperty rpAddress = (RefProperty) impl.getProperties().get("address");
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
+        Schema rpAddress = (Schema) impl.getProperties().get("address");
         assertNotNull(rpAddress);
         assertEquals(rpAddress.getType(), "ref");
         assertEquals(rpAddress.get$ref(), "#/definitions/hello_address");
         assertEquals(rpAddress.getSimpleRef(), "hello_address");
 
-        Model inlineProp = openapi.getDefinitions().get("hello_address");
+        Model inlineProp = openapi.getComponents().getSchemas().get("hello_address");
         assertNotNull(inlineProp);
-        assertTrue(inlineProp instanceof ModelImpl);
-        ModelImpl implProp = (ModelImpl) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema implProp = (ObjectSchema) inlineProp;
         assertNotNull(implProp.getProperties().get("street"));
-        assertTrue(implProp.getProperties().get("street") instanceof StringProperty);
+        assertTrue(implProp.getProperties().get("street") instanceof StringSchema);
     }
 
     @Test
@@ -478,8 +505,8 @@ public class InlineModelResolverTest {
         OpenAPI openapi = new OpenAPI();
 
         ArrayProperty schema = new ArrayProperty()
-                .items(new ObjectProperty()
-                        .property("name", new StringProperty())
+                .items(new ObjectSchema()
+                        .addProperties("name", new StringSchema())
                         .vendorExtension("x-ext", "ext-items"))
                 .vendorExtension("x-ext", "ext-prop");
         openapi.path("/foo/baz", new Path()
@@ -508,19 +535,19 @@ public class InlineModelResolverTest {
 
         assertNotNull(p);
 
-        RefProperty rp = (RefProperty) p;
+        Schema rp = (Schema) p;
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/inline_response_200");
         assertEquals(rp.getSimpleRef(), "inline_response_200");
         assertEquals(1, rp.getVendorExtensions().size());
         assertEquals("ext-items", rp.getVendorExtensions().get("x-ext"));
 
-        Model inline = openapi.getDefinitions().get("inline_response_200");
+        Model inline = openapi.getComponents().getSchemas().get("inline_response_200");
         assertNotNull(inline);
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         assertNotNull(impl.getProperties().get("name"));
-        assertTrue(impl.getProperties().get("name") instanceof StringProperty);
+        assertTrue(impl.getProperties().get("name") instanceof StringSchema);
     }
 
     @Test
@@ -533,9 +560,9 @@ public class InlineModelResolverTest {
                     .vendorExtension("x-foo", "bar")
                     .description("it works!")
                     .schema(new ArrayProperty()
-                        .items(new ObjectProperty()
+                        .items(new ObjectSchema()
                             .title("FooBar")
-                            .property("name", new StringProperty()))))));
+                            .addProperties("name", new StringSchema()))))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -553,17 +580,17 @@ public class InlineModelResolverTest {
 
         assertNotNull(p);
 
-        RefProperty rp = (RefProperty) p;
+        Schema rp = (Schema) p;
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/"+ "FooBar");
         assertEquals(rp.getSimpleRef(), "FooBar");
 
-        Model inline = openapi.getDefinitions().get("FooBar");
+        Model inline = openapi.getComponents().getSchemas().get("FooBar");
         assertNotNull(inline);
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         assertNotNull(impl.getProperties().get("name"));
-        assertTrue(impl.getProperties().get("name") instanceof StringProperty);
+        assertTrue(impl.getProperties().get("name") instanceof StringSchema);
     }
     
     @Test
@@ -571,7 +598,7 @@ public class InlineModelResolverTest {
         OpenAPI openapi = new OpenAPI();
 
         MapProperty schema = new MapProperty();
-        schema.setAdditionalProperties(new StringProperty());
+        schema.setAdditionalProperties(new StringSchema());
         schema.setVendorExtension("x-ext", "ext-prop");
 
         openapi.path("/foo/baz", new Path()
@@ -587,18 +614,18 @@ public class InlineModelResolverTest {
 
         Property property = response.getSchema();
         assertTrue(property instanceof MapProperty);
-        assertTrue(openapi.getDefinitions().size() == 0);
+        assertTrue(openapi.getComponents().getSchemas().size() == 0);
         assertEquals(1, property.getVendorExtensions().size());
         assertEquals("ext-prop", property.getVendorExtensions().get("x-ext"));
     }
 
     @Test
-    public void testInlineMapResponseWithObjectProperty() throws Exception {
+    public void testInlineMapResponseWithObjectSchema() throws Exception {
         OpenAPI openapi = new OpenAPI();
 
         MapProperty schema = new MapProperty();
-        schema.setAdditionalProperties(new ObjectProperty()
-                .property("name", new StringProperty()));
+        schema.setAdditionalProperties(new ObjectSchema()
+                .addProperties("name", new StringSchema()));
         schema.setVendorExtension("x-ext", "ext-prop");
 
         openapi.path("/foo/baz", new Path()
@@ -614,13 +641,13 @@ public class InlineModelResolverTest {
         assertTrue(property instanceof MapProperty);
         assertEquals(1, property.getVendorExtensions().size());
         assertEquals("ext-prop", property.getVendorExtensions().get("x-ext"));
-        assertTrue(openapi.getDefinitions().size() == 1);
+        assertTrue(openapi.getComponents().getSchemas().size() == 1);
 
-        Model inline = openapi.getDefinitions().get("inline_response_200");
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        Model inline = openapi.getComponents().getSchemas().get("inline_response_200");
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         assertNotNull(impl.getProperties().get("name"));
-        assertTrue(impl.getProperties().get("name") instanceof StringProperty);
+        assertTrue(impl.getProperties().get("name") instanceof StringSchema);
     }
 
     @Test
@@ -628,8 +655,8 @@ public class InlineModelResolverTest {
         OpenAPI openapi = new OpenAPI();
 
         ArrayProperty schema = new ArrayProperty();
-        schema.setItems(new ObjectProperty()
-                .property("name", new StringProperty()));
+        schema.setItems(new ObjectSchema()
+                .addProperties("name", new StringSchema()));
 
         openapi.path("/foo/baz", new Path()
                 .get(new Operation()
@@ -644,25 +671,25 @@ public class InlineModelResolverTest {
 
         ArrayProperty am = (ArrayProperty) response.getSchema();
         Property items = am.getItems();
-        assertTrue(items instanceof RefProperty);
-        RefProperty rp = (RefProperty) items;
+        assertTrue(items instanceof Schema);
+        Schema rp = (Schema) items;
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/inline_response_200");
         assertEquals(rp.getSimpleRef(), "inline_response_200");
 
-        Model inline = openapi.getDefinitions().get("inline_response_200");
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        Model inline = openapi.getComponents().getSchemas().get("inline_response_200");
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         assertNotNull(impl.getProperties().get("name"));
-        assertTrue(impl.getProperties().get("name") instanceof StringProperty);
+        assertTrue(impl.getProperties().get("name") instanceof StringSchema);
     }
 
     @Test
     public void testBasicInput() {
         OpenAPI openapi = new OpenAPI();
 
-        ModelImpl user = new ModelImpl()
-                .property("name", new StringProperty());
+        ObjectSchema user = new ObjectSchema()
+                .addProperties("name", new StringSchema());
 
         openapi.path("/foo/baz", new Path()
                 .post(new Operation()
@@ -670,7 +697,7 @@ public class InlineModelResolverTest {
                             .name("myBody")
                             .schema(new RefModel("User")))));
 
-        openapi.addDefinition("User", user);
+        openapi.getComponents().addSchemas("User", user);
 
         new InlineModelResolver().flatten(openapi);
 
@@ -685,14 +712,14 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ModelImpl()))));
+                                .schema(new ObjectSchema()))));
 
         new InlineModelResolver().flatten(openapi);
 
         Operation operation = openapi.getPaths().get("/hello").getGet();
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
-        assertTrue(bp.getSchema() instanceof ModelImpl);
-        ModelImpl m = (ModelImpl) bp.getSchema();
+        assertTrue(bp.getSchema() instanceof ObjectSchema);
+        ObjectSchema m = (ObjectSchema) bp.getSchema();
         assertNull(m.getType());
     }
 
@@ -704,8 +731,8 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ModelImpl()
-                                        .property("arbitrary", new ObjectProperty())))));
+                                .schema(new ObjectSchema()
+                                        .addProperties("arbitrary", new ObjectSchema())))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -713,13 +740,13 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
         assertTrue(bp.getSchema() instanceof RefModel);
 
-        Model body = openapi.getDefinitions().get("body");
-        assertTrue(body instanceof ModelImpl);
+        Model body = openapi.getComponents().getSchemas().get("body");
+        assertTrue(body instanceof ObjectSchema);
 
-        ModelImpl impl = (ModelImpl) body;
+        ObjectSchema impl = (ObjectSchema) body;
         Property p = impl.getProperties().get("arbitrary");
         assertNotNull(p);
-        assertTrue(p instanceof ObjectProperty);
+        assertTrue(p instanceof ObjectSchema);
     }
 
     @Test
@@ -730,8 +757,8 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ArrayModel()
-                                        .items(new ObjectProperty())))));
+                                .schema(new ArraySchema()
+                                        .items(new ObjectSchema())))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -741,13 +768,13 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter) param;
         Model schema = bp.getSchema();
 
-        assertTrue(schema instanceof ArrayModel);
+        assertTrue(schema instanceof ArraySchema);
 
-        ArrayModel am = (ArrayModel) schema;
+        ArraySchema am = (ArraySchema) schema;
         Property inner = am.getItems();
-        assertTrue(inner instanceof ObjectProperty);
+        assertTrue(inner instanceof ObjectSchema);
 
-        ObjectProperty op = (ObjectProperty) inner;
+        ObjectSchema op = (ObjectSchema) inner;
         assertNotNull(op);
         assertNull(op.getProperties());
     }
@@ -760,9 +787,9 @@ public class InlineModelResolverTest {
                 .get(new Operation()
                         .parameter(new BodyParameter()
                                 .name("body")
-                                .schema(new ArrayModel()
-                                        .items(new ObjectProperty()
-                                            .property("arbitrary", new ObjectProperty()))))));
+                                .schema(new ArraySchema()
+                                        .items(new ObjectSchema()
+                                            .addProperties("arbitrary", new ObjectSchema()))))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -772,25 +799,25 @@ public class InlineModelResolverTest {
         BodyParameter bp = (BodyParameter) param;
         Model schema = bp.getSchema();
 
-        assertTrue(schema instanceof ArrayModel);
+        assertTrue(schema instanceof ArraySchema);
 
-        ArrayModel am = (ArrayModel) schema;
+        ArraySchema am = (ArraySchema) schema;
         Property inner = am.getItems();
-        assertTrue(inner instanceof RefProperty);
+        assertTrue(inner instanceof Schema);
 
-        RefProperty rp = (RefProperty) inner;
+        Schema rp = (Schema) inner;
 
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/body");
         assertEquals(rp.getSimpleRef(), "body");
 
-        Model inline = openapi.getDefinitions().get("body");
+        Model inline = openapi.getComponents().getSchemas().get("body");
         assertNotNull(inline);
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         Property p = impl.getProperties().get("arbitrary");
         assertNotNull(p);
-        assertTrue(p instanceof ObjectProperty);
+        assertTrue(p instanceof ObjectSchema);
     }
 
     @Test
@@ -801,15 +828,15 @@ public class InlineModelResolverTest {
             .get(new Operation()
                     .response(200, new Response()
                             .description("it works!")
-                            .schema(new ObjectProperty()))));
+                            .schema(new ObjectSchema()))));
         new InlineModelResolver().flatten(openapi);
 
         Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses();
 
         Response response = responses.get("200");
         assertNotNull(response);
-        assertTrue(response.getSchema() instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) response.getSchema();
+        assertTrue(response.getSchema() instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) response.getSchema();
         assertNull(op.getProperties());
     }
 
@@ -822,7 +849,7 @@ public class InlineModelResolverTest {
                         .response(200, new Response()
                                 .description("it works!")
                                 .schema(new ArrayProperty()
-                                        .items(new ObjectProperty())))));
+                                        .items(new ObjectSchema())))));
         new InlineModelResolver().flatten(openapi);
 
         Response response = openapi.getPaths().get("/foo/baz").getGet().getResponses().get("200");
@@ -830,8 +857,8 @@ public class InlineModelResolverTest {
 
         ArrayProperty am = (ArrayProperty) response.getSchema();
         Property items = am.getItems();
-        assertTrue(items instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) items;
+        assertTrue(items instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) items;
         assertNull(op.getProperties());
     }
 
@@ -845,8 +872,8 @@ public class InlineModelResolverTest {
                                 .vendorExtension("x-foo", "bar")
                                 .description("it works!")
                                 .schema(new ArrayProperty()
-                                        .items(new ObjectProperty()
-                                            .property("arbitrary", new ObjectProperty()))))));
+                                        .items(new ObjectSchema()
+                                            .addProperties("arbitrary", new ObjectSchema()))))));
 
         new InlineModelResolver().flatten(openapi);
 
@@ -861,19 +888,19 @@ public class InlineModelResolverTest {
         Property p = ap.getItems();
         assertNotNull(p);
 
-        RefProperty rp = (RefProperty) p;
+        Schema rp = (Schema) p;
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/inline_response_200");
         assertEquals(rp.getSimpleRef(), "inline_response_200");
 
-        Model inline = openapi.getDefinitions().get("inline_response_200");
+        Model inline = openapi.getComponents().getSchemas().get("inline_response_200");
         assertNotNull(inline);
-        assertTrue(inline instanceof ModelImpl);
-        ModelImpl impl = (ModelImpl) inline;
+        assertTrue(inline instanceof ObjectSchema);
+        ObjectSchema impl = (ObjectSchema) inline;
         Property inlineProp = impl.getProperties().get("arbitrary");
         assertNotNull(inlineProp);
-        assertTrue(inlineProp instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
 
@@ -882,7 +909,7 @@ public class InlineModelResolverTest {
         OpenAPI openapi = new OpenAPI();
 
         MapProperty schema = new MapProperty();
-        schema.setAdditionalProperties(new ObjectProperty());
+        schema.setAdditionalProperties(new ObjectSchema());
 
         openapi.path("/foo/baz", new Path()
                 .get(new Operation()
@@ -895,10 +922,10 @@ public class InlineModelResolverTest {
 
         Property property = response.getSchema();
         assertTrue(property instanceof MapProperty);
-        assertTrue(openapi.getDefinitions().size() == 0);
+        assertTrue(openapi.getComponents().getSchemas().size() == 0);
         Property inlineProp = ((MapProperty) property).getAdditionalProperties();
-        assertTrue(inlineProp instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
 
@@ -906,11 +933,11 @@ public class InlineModelResolverTest {
     public void testArbitraryObjectModelInline() {
         OpenAPI openapi = new OpenAPI();
 
-        openapi.addDefinition("User", new ModelImpl()
+        openapi.getComponents().addSchemas("User", new ObjectSchema()
                 .name("user")
                 .description("a common user")
-                .property("name", new StringProperty())
-                .property("arbitrary", new ObjectProperty()
+                .addProperties("name", new StringSchema())
+                .addProperties("arbitrary", new ObjectSchema()
                         .title("title")
                         ._default("default")
                         .access("access")
@@ -921,11 +948,11 @@ public class InlineModelResolverTest {
 
         new InlineModelResolver().flatten(openapi);
 
-        ModelImpl user = (ModelImpl)openapi.getDefinitions().get("User");
+        ObjectSchema user = (ObjectSchema)openapi.getComponents().getSchemas().get("User");
         assertNotNull(user);
         Property inlineProp = user.getProperties().get("arbitrary");
-        assertTrue(inlineProp instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
 
@@ -933,29 +960,29 @@ public class InlineModelResolverTest {
     public void testArbitraryObjectModelWithArrayInlineWithoutTitle() {
         OpenAPI openapi = new OpenAPI();
 
-        openapi.addDefinition("User", new ArrayModel()
-                .items(new ObjectProperty()
+        openapi.getComponents().addSchemas("User", new ArraySchema()
+                .items(new ObjectSchema()
                         ._default("default")
                         .access("access")
                         .readOnly(false)
                         .required(true)
                         .description("description")
                         .name("name")
-                        .property("arbitrary", new ObjectProperty())));
+                        .addProperties("arbitrary", new ObjectSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        Model model = openapi.getDefinitions().get("User");
-        assertTrue(model instanceof ArrayModel);
-        ArrayModel am = (ArrayModel) model;
+        Schema model = openapi.getComponents().getSchemas().get("User");
+        assertTrue(model instanceof ArraySchema);
+        ArraySchema am = (ArraySchema) model;
         Property inner = am.getItems();
-        assertTrue(inner instanceof RefProperty);
+        assertTrue(inner instanceof Schema);
 
-        ModelImpl userInner = (ModelImpl)openapi.getDefinitions().get("User_inner");
+        ObjectSchema userInner = (ObjectSchema)openapi.getComponents().getSchemas().get("User_inner");
         assertNotNull(userInner);
         Property inlineProp = userInner.getProperties().get("arbitrary");
-        assertTrue(inlineProp instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
     
@@ -963,8 +990,8 @@ public class InlineModelResolverTest {
     public void testArbitraryObjectModelWithArrayInlineWithTitle() {
         OpenAPI openapi = new OpenAPI();
 
-        openapi.addDefinition("User", new ArrayModel()
-                .items(new ObjectProperty()
+        openapi.getComponents().addSchemas("User", new ArraySchema()
+                .items(new ObjectSchema()
                         .title("InnerUserTitle")
                         ._default("default")
                         .access("access")
@@ -972,21 +999,21 @@ public class InlineModelResolverTest {
                         .required(true)
                         .description("description")
                         .name("name")
-                        .property("arbitrary", new ObjectProperty())));
+                        .addProperties("arbitrary", new ObjectSchema())));
 
         new InlineModelResolver().flatten(openapi);
 
-        Model model = openapi.getDefinitions().get("User");
-        assertTrue(model instanceof ArrayModel);
-        ArrayModel am = (ArrayModel) model;
+        Schema model = openapi.getComponents().getSchemas().get("User");
+        assertTrue(model instanceof ArraySchema);
+        ArraySchema am = (ArraySchema) model;
         Property inner = am.getItems();
-        assertTrue(inner instanceof RefProperty);
+        assertTrue(inner instanceof Schema);
 
-        ModelImpl userInner = (ModelImpl)openapi.getDefinitions().get("InnerUserTitle");
+        ObjectSchema userInner = (ObjectSchema)openapi.getComponents().getSchemas().get("InnerUserTitle");
         assertNotNull(userInner);
         Property inlineProp = userInner.getProperties().get("arbitrary");
-        assertTrue(inlineProp instanceof ObjectProperty);
-        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertTrue(inlineProp instanceof ObjectSchema);
+        ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
 
@@ -994,19 +1021,19 @@ public class InlineModelResolverTest {
     public void testEmptyExampleOnStrinngTypeModels() {
         OpenAPI openapi = new OpenAPI();
 
-        RefProperty refProperty = new RefProperty();
-        refProperty.set$ref("#/definitions/Test");
+        Schema Schema = new Schema();
+        Schema.set$ref("#/definitions/Test");
 
         openapi.path("/hello", new Path()
                 .get(new Operation()
                         .response(200, new Response()
                                 .schema(new ArrayProperty()
-                                        .items(refProperty)))));
+                                        .items(Schema)))));
 
-        openapi.addDefinition("Test", new ModelImpl()
+        openapi.getComponents().addSchemas("Test", new ObjectSchema()
                 .example(StringUtils.EMPTY)
                 .type("string"));
         new InlineModelResolver().flatten(openapi);
     }
-}
-*/
\ No newline at end of file
+*/
+}
\ No newline at end of file