) _operations.get("operation");
-
+
boolean hasRequiredParams = false;
boolean hasListContainers = false;
boolean hasHttpHeaders = false;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/LoggingFeatures.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/LoggingFeatures.java
index 17a79e1a594..79585448123 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/LoggingFeatures.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/LoggingFeatures.java
@@ -20,7 +20,7 @@ package org.openapitools.codegen.languages.features;
public interface LoggingFeatures extends BeanValidationFeatures {
public static final String USE_LOGGING_FEATURE = "useLoggingFeature";
-
+
public void setUseLoggingFeature(boolean useLoggingFeature);
-
+
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/Markdown.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/Markdown.java
index 0afc19159f3..c713bea34d1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/Markdown.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/Markdown.java
@@ -32,7 +32,7 @@ public class Markdown {
private final Parser parser = Parser.builder().build();
private final HtmlRenderer renderer = HtmlRenderer.builder().build();
- /**
+ /**
* Convert input markdown text to HTML.
* Simple text is not wrapped in ...
.
* @param markdown text with Markdown styles. If null, "" is returned.
@@ -46,7 +46,7 @@ public class Markdown {
html = unwrapped(html);
return html;
}
-
+
// The CommonMark library wraps the HTML with
// ... html ...
\n
// This method removes that markup wrapper if there are no other elements,
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 f570c562930..f4e56f8e0d1 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
@@ -399,7 +399,7 @@ public class ModelUtils {
// see https://tools.ietf.org/html/rfc6901#section-3
// Because the characters '~' (%x7E) and '/' (%x2F) have special meanings in
- // JSON Pointer, '~' needs to be encoded as '~0' and '/' needs to be encoded
+ // JSON Pointer, '~' needs to be encoded as '~0' and '/' needs to be encoded
// as '~1' when these characters appear in a reference token.
// This reverses that encoding.
ref = ref.replace("~1", "/").replace("~0", "~");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java
index 4b850eb6c67..47a43e04bda 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java
@@ -11,8 +11,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.openapitools.codegen.utils.OnceLogger.once;
-
/**
* This class holds data to add to `oneOf` members. Let's consider this example:
*
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OptionUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OptionUtils.java
index 8aea1fa934b..ee25cdadea1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OptionUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OptionUtils.java
@@ -45,7 +45,7 @@ public class OptionUtils {
return results;
}
-
+
public static List splitCommaSeparatedList(String input) {
List results = new ArrayList();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
index 28c9c25e560..167c7d21124 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
@@ -3,7 +3,6 @@ package org.openapitools.codegen.utils;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.CodegenSecurity;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
index d1ee6762b54..f8308a1a66c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
@@ -11,7 +11,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.HashMap;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -266,9 +265,9 @@ public class StringUtils {
return character;
}
}).reduce( (c1, c2) -> "" + c1 + c2).orElse(null);
-
+
if (result != null) return result;
- throw new RuntimeException("Word '" + name + "' could not be escaped.");
+ throw new RuntimeException("Word '" + name + "' could not be escaped.");
});
}
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java
index 43d68ae1af3..af784363e29 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java
@@ -9,7 +9,6 @@ import org.openapitools.codegen.validation.GenericValidator;
import org.openapitools.codegen.validation.ValidationRule;
import java.util.ArrayList;
-import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.HashSet;
@@ -91,7 +90,7 @@ class OpenApiSchemaValidations extends GenericValidator {
* 'null' type is supported in OpenAPI Specification 3.1 and above. It is not supported in OpenAPI 3.0.x.
* Note: the validator invokes checkNullType() for every top-level schema in the OAS document. The method
* is not called for nested schemas that are defined inline.
- *
+ *
* @param schema An input schema, regardless of the type of schema.
* @return {@link ValidationRule.Pass} if the check succeeds, otherwise {@link ValidationRule.Fail}
*/
@@ -122,7 +121,7 @@ class OpenApiSchemaValidations extends GenericValidator {
* JSON Schema uses the 'nullable' attribute.
*
* The 'nullable' attribute is supported in OpenAPI Specification 3.0.x, but it is deprecated in OpenAPI 3.1 and above.
- *
+ *
* @param schema An input schema, regardless of the type of schema
* @return {@link ValidationRule.Pass} if the check succeeds, otherwise {@link ValidationRule.Fail}
*/
@@ -156,7 +155,7 @@ class OpenApiSchemaValidations extends GenericValidator {
* Validate the OAS document uses supported values for the 'type' attribute.
*
* The type must be one of the following values: null, boolean, object, array, number, string, integer.
- *
+ *
* @param schema An input schema, regardless of the type of schema
* @return {@link ValidationRule.Pass} if the check succeeds, otherwise {@link ValidationRule.Fail}
*/
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java
index c834e9522cf..3ce59ff3f16 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java
@@ -1,7 +1,6 @@
package org.openapitools.codegen.validations.oas;
import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.OpenAPI;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.validation.GenericValidator;
import org.openapitools.codegen.validation.ValidationRule;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
index 0ad2213ded7..56f254cfbac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
@@ -96,7 +96,7 @@ public class RuleConfiguration {
/**
* Enable or Disable the recommendation check for schemas containing type definitions, specifically
* for changes between OpenAPI 3.0.x and 3.1.
- *
+ *
*
* For more details, see {@link RuleConfiguration#isEnableSchemaTypeRecommendation()}
*
@@ -120,10 +120,10 @@ public class RuleConfiguration {
public boolean isEnableSchemaTypeRecommendation() {
return enableSchemaTypeRecommendation;
}
-
+
/**
* Enable or Disable the recommendation check for the 'nullable' attribute.
- *
+ *
*
* For more details, see {@link RuleConfiguration#isEnableNullableAttributeRecommendation()}
*
@@ -149,7 +149,7 @@ public class RuleConfiguration {
/**
* Enable or Disable the recommendation check for the 'type' attribute.
- *
+ *
*
* For more details, see {@link RuleConfiguration#isEnableInvalidTypeRecommendation()}
*
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
index 793ad63cbfe..c335e7ad441 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
@@ -124,14 +124,14 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.2"
- spring_web_version = "5.2.13.RELEASE"
+ spring_web_version = "2.4.3"
jackson_version = "2.11.3"
jackson_databind_version = "2.11.3"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.1"
{{/openApiNullable}}
javax_annotation_version = "1.3.2"
- reactor_version = "3.3.10.RELEASE"
+ reactor_version = "3.4.3"
reactor_netty_version = "0.7.15.RELEASE"
jodatime_version = "2.9.9"
junit_version = "4.13.1"
@@ -141,7 +141,7 @@ dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "io.projectreactor:reactor-core:$reactor_version"
- implementation "org.springframework:spring-webflux:$spring_web_version"
+ implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_web_version"
implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
index 39c55beb122..67a888863b4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
@@ -85,10 +85,10 @@
${reactor-version}
-
+
- org.springframework
- spring-webflux
+ org.springframework.boot
+ spring-boot-starter-webflux
${spring-web-version}
@@ -149,7 +149,7 @@
UTF-8
1.6.2
- 5.2.13.RELEASE
+ 2.4.3
2.11.3
2.11.3
{{#openApiNullable}}
@@ -157,7 +157,7 @@
{{/openApiNullable}}
1.3.2
4.13.1
- 3.3.10.RELEASE
+ 3.4.3
0.7.15.RELEASE
{{#joda}}
2.9.9
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Formatters/InputFormatterStream.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Formatters/InputFormatterStream.mustache
new file mode 100644
index 00000000000..f1a002ded67
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Formatters/InputFormatterStream.mustache
@@ -0,0 +1,32 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace {{packageName}}.Formatters
+{
+ // Input Type Formatter to allow model binding to Streams
+ public class InputFormatterStream : InputFormatter
+ {
+ public InputFormatterStream()
+ {
+ SupportedMediaTypes.Add("application/octet-stream");
+ SupportedMediaTypes.Add("image/jpeg");
+ }
+
+ protected override bool CanReadType(Type type)
+ {
+ if (type == typeof(Stream))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ public override Task ReadRequestBodyAsync(InputFormatterContext context)
+ {
+ return InputFormatterResult.SuccessAsync(context.HttpContext.Request.Body);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Startup.mustache
index 2a4c1f53cf2..044ce0c80e0 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Startup.mustache
@@ -10,6 +10,7 @@ using Newtonsoft.Json.Serialization;{{#useSwashbuckle}}
using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen;
using {{packageName}}.Filters;{{/useSwashbuckle}}
+using {{packageName}}.Formatters;
namespace {{packageName}}
{
@@ -40,7 +41,9 @@ namespace {{packageName}}
{
// Add framework services.
services
- .AddMvc()
+ .AddMvc(options => {
+ options.InputFormatters.Insert(0, new InputFormatterStream());
+ })
.AddJsonOptions(opts =>
{
opts.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/bodyParam.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/bodyParam.mustache
index 02b0fa1d2de..61286083304 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/bodyParam.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/bodyParam.mustache
@@ -1 +1 @@
-{{#isBodyParam}}[FromBody]{{&dataType}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
+{{#isBodyParam}}{{^isBinary}}[FromBody]{{/isBinary}}{{&dataType}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache
index 40fc9983db8..de15c470d1e 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
{{#useSwashbuckle}}
using Swashbuckle.AspNetCore.SwaggerGen;
+using Microsoft.AspNetCore.Http;
{{/useSwashbuckle}}
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
@@ -26,6 +27,9 @@ namespace {{packageName}}.Controllers
/// {{message}}{{/responses}}
[{{httpMethod}}]
[Route("{{{basePathWithoutHost}}}{{{path}}}")]
+ {{#vendorExtensions.x-aspnetcore-consumes}}
+ [Consumes({{&vendorExtensions.x-aspnetcore-consumes}})]
+ {{/vendorExtensions.x-aspnetcore-consumes}}
[ValidateModelState]{{#useSwashbuckle}}
[SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}}
[SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/formParam.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/formParam.mustache
index 80eb9f630bb..7c9085c62df 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/formParam.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/formParam.mustache
@@ -1 +1 @@
-{{#isFormParam}}[FromForm (Name = "{{baseName}}")]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isBinary}}[FromForm (Name = "{{baseName}}")]{{/isBinary}}{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Formatters/InputFormatterStream.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Formatters/InputFormatterStream.mustache
new file mode 100644
index 00000000000..f1a002ded67
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Formatters/InputFormatterStream.mustache
@@ -0,0 +1,32 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace {{packageName}}.Formatters
+{
+ // Input Type Formatter to allow model binding to Streams
+ public class InputFormatterStream : InputFormatter
+ {
+ public InputFormatterStream()
+ {
+ SupportedMediaTypes.Add("application/octet-stream");
+ SupportedMediaTypes.Add("image/jpeg");
+ }
+
+ protected override bool CanReadType(Type type)
+ {
+ if (type == typeof(Stream))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ public override Task ReadRequestBodyAsync(InputFormatterContext context)
+ {
+ return InputFormatterResult.SuccessAsync(context.HttpContext.Request.Body);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
index d2f6997dd71..50ad25a5e41 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
@@ -13,6 +13,7 @@ using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen;
using {{packageName}}.Filters;{{/useSwashbuckle}}
using {{packageName}}.Authentication;
+using {{packageName}}.Formatters;
using Microsoft.AspNetCore.Authorization;
namespace {{packageName}}
@@ -56,7 +57,10 @@ namespace {{packageName}}
// Add framework services.
services
- .AddMvc({{^useDefaultRouting}}opts => opts.EnableEndpointRouting = false{{/useDefaultRouting}})
+ .AddMvc(opts => {
+ {{^useDefaultRouting}}opts.EnableEndpointRouting = false;{{/useDefaultRouting}}
+ opts.InputFormatters.Insert(0, new InputFormatterStream());
+ })
{{#compatibilityVersion}}
.SetCompatibilityVersion(CompatibilityVersion.{{compatibilityVersion}})
{{/compatibilityVersion}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/bodyParam.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/bodyParam.mustache
index 02b0fa1d2de..61286083304 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/bodyParam.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/bodyParam.mustache
@@ -1 +1 @@
-{{#isBodyParam}}[FromBody]{{&dataType}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
+{{#isBodyParam}}{{^isBinary}}[FromBody]{{/isBinary}}{{&dataType}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
index 47e36aa25b6..4cc411514c5 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
{{/operationResultTask}}
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
{{#useSwashbuckle}}
using Swashbuckle.AspNetCore.Annotations;
using Swashbuckle.AspNetCore.SwaggerGen;
@@ -42,6 +43,9 @@ namespace {{apiPackage}}
[Authorize{{#scopes}}{{#-first}}(Roles = "{{/-first}}{{scope}}{{^-last}},{{/-last}}{{#-last}}"){{/-last}}{{/scopes}}]
{{/isBasicBearer}}
{{/authMethods}}
+ {{#vendorExtensions.x-aspnetcore-consumes}}
+ [Consumes({{&vendorExtensions.x-aspnetcore-consumes}})]
+ {{/vendorExtensions.x-aspnetcore-consumes}}
[ValidateModelState]{{#useSwashbuckle}}
[SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}}
[SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}}{{^useSwashbuckle}}{{#responses}}{{#dataType}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/formParam.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/formParam.mustache
index e71c9619d85..7c9085c62df 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/formParam.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/formParam.mustache
@@ -1 +1 @@
-{{#isFormParam}}[FromForm (Name = "{{baseName}}")]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isBinary}}[FromForm (Name = "{{baseName}}")]{{/isBinary}}{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Formatters/InputFormatterStream.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Formatters/InputFormatterStream.mustache
new file mode 100644
index 00000000000..f1a002ded67
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Formatters/InputFormatterStream.mustache
@@ -0,0 +1,32 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace {{packageName}}.Formatters
+{
+ // Input Type Formatter to allow model binding to Streams
+ public class InputFormatterStream : InputFormatter
+ {
+ public InputFormatterStream()
+ {
+ SupportedMediaTypes.Add("application/octet-stream");
+ SupportedMediaTypes.Add("image/jpeg");
+ }
+
+ protected override bool CanReadType(Type type)
+ {
+ if (type == typeof(Stream))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ public override Task ReadRequestBodyAsync(InputFormatterContext context)
+ {
+ return InputFormatterResult.SuccessAsync(context.HttpContext.Request.Body);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
index 6b8fd56ff9f..250dcf66584 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
@@ -20,6 +20,7 @@ using {{packageName}}.Authentication;
using {{packageName}}.Filters;
{{/useSwashbuckle}}
using {{packageName}}.OpenApi;
+using {{packageName}}.Formatters;
namespace {{packageName}}
{
@@ -65,7 +66,9 @@ namespace {{packageName}}
// Add framework services.
services
// Don't need the full MVC stack for an API, see https://andrewlock.net/comparing-startup-between-the-asp-net-core-3-templates/
- .AddControllers()
+ .AddControllers(options => {
+ options.InputFormatters.Insert(0, new InputFormatterStream());
+ })
{{#compatibilityVersion}}
// Don't need this for 3.x - see https://docs.microsoft.com/en-us/aspnet/core/mvc/compatibility-version?view=aspnetcore-3.1
//.SetCompatibilityVersion(CompatibilityVersion.{{compatibilityVersion}})
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
index 73e6e4fa9ad..0ff9c364488 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
@@ -6,6 +6,7 @@ using System.ComponentModel.DataAnnotations;
using System.Threading.Tasks;
{{/operationResultTask}}
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
{{#useSwashbuckle}}
using Swashbuckle.AspNetCore.Annotations;
using Microsoft.AspNetCore.Authorization;
@@ -42,6 +43,9 @@ namespace {{apiPackage}}
[Authorize{{#scopes}}{{#-first}}(Roles = "{{/-first}}{{scope}}{{^-last}},{{/-last}}{{#-last}}"){{/-last}}{{/scopes}}]
{{/isBasicBearer}}
{{/authMethods}}
+ {{#vendorExtensions.x-aspnetcore-consumes}}
+ [Consumes({{&vendorExtensions.x-aspnetcore-consumes}})]
+ {{/vendorExtensions.x-aspnetcore-consumes}}
[ValidateModelState]{{#useSwashbuckle}}
[SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}}
[SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}{{/useSwashbuckle}}{{^useSwashbuckle}}{{#responses}}{{#dataType}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/formParam.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/formParam.mustache
index e71c9619d85..f0b9d704280 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/formParam.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/formParam.mustache
@@ -1 +1 @@
-{{#isFormParam}}[FromForm (Name = "{{baseName}}")]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isBinary}}[FromForm{{^isModel}} (Name = "{{baseName}}"){{/isModel}}]{{/isBinary}}{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache
deleted file mode 100644
index de8c602a14d..00000000000
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache
+++ /dev/null
@@ -1,20 +0,0 @@
- ///
- /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
- ///
- {{#description}}
- /// {{description}}
- {{/description}}
- [JsonConverter(typeof(StringEnumConverter))]
- {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}
- {
- {{#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}}
- }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
index ad2ca7ce4b5..4c31f4e127b 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
@@ -319,7 +319,7 @@ namespace {{packageName}}.Client
{
if (options.Data is Stream s)
{
- contentType ??= "application/octet-stream";
+ contentType = contentType ?? "application/octet-stream";
var streamContent = new StreamContent(s);
streamContent.Headers.ContentType = new MediaTypeHeaderValue(contentType);
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
index c1a70a37f2d..39bcd2eddc1 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
@@ -4,9 +4,15 @@
{{#description}}
/// {{description}}
{{/description}}
- {{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}
+ {{#allowableValues}}
+ {{#enumVars}}
+ {{#-first}}
+ {{#isString}}
[JsonConverter(typeof(StringEnumConverter))]
- {{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}
+ {{/isString}}
+ {{/-first}}
+ {{/enumVars}}
+ {{/allowableValues}}
{{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}}: byte{{/vendorExtensions.x-enum-byte}}
{
{{#allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
index 6dc58205f29..c3333605694 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
@@ -30,7 +30,7 @@
{{#description}}
/// {{description}}
{{/description}}
- [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]
+ [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})]
public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; }
{{#isReadOnly}}
@@ -120,7 +120,7 @@
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// {{#description}}
/// {{description}}{{/description}}
- [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]
+ [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/vendorExtensions.x-emit-default-value}})]
{{#isDate}}
[JsonConverter(typeof(OpenAPIDateConverter))]
{{/isDate}}
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
index 8c3a1d5e361..fca8dcd101b 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
@@ -19,11 +19,11 @@
{{#items}}
$asserts[] = new Assert\All([
new Assert\Type("{{dataType}}"),
- {{^isPrimitiveType}}
- new Assert\Valid(),
- {{/isPrimitiveType}}
]);
{{/items}}
+ {{^isPrimitiveType}}
+ $asserts[] = new Assert\Valid();
+ {{/isPrimitiveType}}
{{/isContainer}}
{{^isContainer}}
{{#isDate}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
index a5929f4af73..4e3b98f69a2 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
@@ -18,7 +18,6 @@
package org.openapitools.codegen;
import com.google.common.base.Function;
-import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.mockito.MockSettings;
import org.openapitools.codegen.options.OptionsProvider;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index 17c5864fe00..c2c5b2a0403 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -240,7 +240,8 @@ public class DefaultCodegenTest {
}
@Test
- public void testAdditionalPropertiesV2Spec() {
+ public void testAdditionalPropertiesV2SpecDisallowAdditionalPropertiesIfNotPresentTrue() {
+ // this is the legacy config that most of our tooling uses
OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/additional-properties-for-testing.yaml");
DefaultCodegen codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI);
@@ -254,111 +255,269 @@ public class DefaultCodegenTest {
// 'additionalProperties' keyword for this model, hence assert the value to be null.
Assert.assertNull(addProps);
CodegenModel cm = codegen.fromModel("AdditionalPropertiesClass", schema);
+ Assert.assertNull(cm.getAdditionalProperties());
// When the 'additionalProperties' keyword is not present, the model
// should allow undeclared properties. However, due to bug
// https://github.com/swagger-api/swagger-parser/issues/1369, the swagger
// converter does not retain the value of the additionalProperties.
- Map m = schema.getProperties();
- Schema child = m.get("map_string");
+ Map modelPropSchems = schema.getProperties();
+ Schema map_string_sc = modelPropSchems.get("map_string");
+ CodegenProperty map_string_cp = null;
+ Schema map_with_additional_properties_sc = modelPropSchems.get("map_with_additional_properties");
+ CodegenProperty map_with_additional_properties_cp = null;
+ Schema map_without_additional_properties_sc = modelPropSchems.get("map_without_additional_properties");
+ CodegenProperty map_without_additional_properties_cp = null;
+
+ for(CodegenProperty cp: cm.vars) {
+ if (cp.baseName.equals("map_string")) {
+ map_string_cp = cp;
+ } else if (cp.baseName.equals("map_with_additional_properties")) {
+ map_with_additional_properties_cp = cp;
+ } else if (cp.baseName.equals("map_without_additional_properties")) {
+ map_without_additional_properties_cp = cp;
+ }
+ }
+
+ // map_string
// This property has the following inline schema.
// additionalProperties:
// type: string
- Assert.assertNotNull(child);
- Assert.assertNotNull(child.getAdditionalProperties());
+ Assert.assertNotNull(map_string_sc);
+ Assert.assertNotNull(map_string_sc.getAdditionalProperties());
+ Assert.assertNotNull(map_string_cp.getAdditionalProperties());
- child = m.get("map_with_additional_properties");
+ // map_with_additional_properties
// This property has the following inline schema.
// additionalProperties: true
- Assert.assertNotNull(child);
+ Assert.assertNotNull(map_with_additional_properties_sc);
// It is unfortunate that child.getAdditionalProperties() returns null for a V2 schema.
// We cannot differentiate between 'additionalProperties' not present and
// additionalProperties: true.
- Assert.assertNull(child.getAdditionalProperties());
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNull(map_with_additional_properties_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_with_additional_properties_sc);
Assert.assertNull(addProps);
+ Assert.assertNull(map_with_additional_properties_cp.getAdditionalProperties());
- child = m.get("map_without_additional_properties");
+ // map_without_additional_properties
// This property has the following inline schema.
// additionalProperties: false
- Assert.assertNotNull(child);
+ Assert.assertNotNull(map_without_additional_properties_sc);
// It is unfortunate that child.getAdditionalProperties() returns null for a V2 schema.
// We cannot differentiate between 'additionalProperties' not present and
// additionalProperties: false.
- Assert.assertNull(child.getAdditionalProperties());
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNull(map_without_additional_properties_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_without_additional_properties_sc);
Assert.assertNull(addProps);
+ Assert.assertNull(map_without_additional_properties_cp.getAdditionalProperties());
+
+ // check of composed schema model
+ String schemaName = "Parent";
+ schema = openAPI.getComponents().getSchemas().get(schemaName);
+ cm = codegen.fromModel(schemaName, schema);
+ Assert.assertNull(cm.getAdditionalProperties());
}
@Test
- public void testAdditionalPropertiesV3Spec() {
+ public void testAdditionalPropertiesV2SpecDisallowAdditionalPropertiesIfNotPresentFalse() {
+ OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/additional-properties-for-testing.yaml");
+ DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+ codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+ codegen.supportsAdditionalPropertiesWithComposedSchema = true;
+ /*
+ When this DisallowAdditionalPropertiesIfNotPresent is false:
+ for CodegenModel/CodegenParameter/CodegenProperty/CodegenResponse.getAdditionalProperties
+ if the input additionalProperties is False or unset (null)
+ .getAdditionalProperties is set to AnyTypeSchema
+
+ For the False value this is incorrect, but it is the best that we can do because of this bug:
+ https://github.com/swagger-api/swagger-parser/issues/1369 where swagger parser
+ sets both null/False additionalProperties to null
+ */
+
+ Schema schema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
+ Assert.assertEquals(schema.getAdditionalProperties(), null);
+
+ Schema addProps = ModelUtils.getAdditionalProperties(openAPI, schema);
+ // The petstore-with-fake-endpoints-models-for-testing.yaml does not set the
+ // 'additionalProperties' keyword for this model, hence assert the value to be null.
+ Assert.assertNull(addProps);
+ CodegenModel cm = codegen.fromModel("AdditionalPropertiesClass", schema);
+ Assert.assertNotNull(cm.getAdditionalProperties());
+ // When the 'additionalProperties' keyword is not present, the model
+ // should allow undeclared properties. However, due to bug
+ // https://github.com/swagger-api/swagger-parser/issues/1369, the swagger
+ // converter does not retain the value of the additionalProperties.
+
+ Map modelPropSchems = schema.getProperties();
+ Schema map_string_sc = modelPropSchems.get("map_string");
+ CodegenProperty map_string_cp = null;
+ Schema map_with_additional_properties_sc = modelPropSchems.get("map_with_additional_properties");
+ CodegenProperty map_with_additional_properties_cp = null;
+ Schema map_without_additional_properties_sc = modelPropSchems.get("map_without_additional_properties");
+ CodegenProperty map_without_additional_properties_cp = null;
+
+ for(CodegenProperty cp: cm.vars) {
+ if (cp.baseName.equals("map_string")) {
+ map_string_cp = cp;
+ } else if (cp.baseName.equals("map_with_additional_properties")) {
+ map_with_additional_properties_cp = cp;
+ } else if (cp.baseName.equals("map_without_additional_properties")) {
+ map_without_additional_properties_cp = cp;
+ }
+ }
+
+ // map_string
+ // This property has the following inline schema.
+ // additionalProperties:
+ // type: string
+ Assert.assertNotNull(map_string_sc);
+ Assert.assertNotNull(map_string_sc.getAdditionalProperties());
+ Assert.assertNotNull(map_string_cp.getAdditionalProperties());
+
+ // map_with_additional_properties
+ // This property has the following inline schema.
+ // additionalProperties: true
+ Assert.assertNotNull(map_with_additional_properties_sc);
+ // It is unfortunate that child.getAdditionalProperties() returns null for a V2 schema.
+ // We cannot differentiate between 'additionalProperties' not present and
+ // additionalProperties: true.
+ Assert.assertNull(map_with_additional_properties_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_with_additional_properties_sc);
+ Assert.assertNull(addProps);
+ Assert.assertNotNull(map_with_additional_properties_cp.getAdditionalProperties());
+
+ // map_without_additional_properties
+ // This property has the following inline schema.
+ // additionalProperties: false
+ Assert.assertNotNull(map_without_additional_properties_sc);
+ // It is unfortunate that child.getAdditionalProperties() returns null for a V2 schema.
+ // We cannot differentiate between 'additionalProperties' not present and
+ // additionalProperties: false.
+ Assert.assertNull(map_without_additional_properties_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_without_additional_properties_sc);
+ Assert.assertNull(addProps);
+ Assert.assertNotNull(map_without_additional_properties_cp.getAdditionalProperties());
+
+ // check of composed schema model
+ String schemaName = "Parent";
+ schema = openAPI.getComponents().getSchemas().get(schemaName);
+ cm = codegen.fromModel(schemaName, schema);
+ Assert.assertNotNull(cm.getAdditionalProperties());
+ }
+
+ @Test
+ public void testAdditionalPropertiesV3SpecDisallowAdditionalPropertiesIfNotPresentFalse() {
OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml");
DefaultCodegen codegen = new DefaultCodegen();
codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+ codegen.supportsAdditionalPropertiesWithComposedSchema = true;
codegen.setOpenAPI(openAPI);
- Schema schema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
- Assert.assertNull(schema.getAdditionalProperties());
+ Schema componentSchema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
+ Assert.assertNull(componentSchema.getAdditionalProperties());
// When the 'additionalProperties' keyword is not present, the schema may be
// extended with any undeclared properties.
- Schema addProps = ModelUtils.getAdditionalProperties(openAPI, schema);
+ Schema addProps = ModelUtils.getAdditionalProperties(openAPI, componentSchema);
Assert.assertNotNull(addProps);
Assert.assertTrue(addProps instanceof ObjectSchema);
- CodegenModel cm = codegen.fromModel("AdditionalPropertiesClass", schema);
+ CodegenModel cm = codegen.fromModel("AdditionalPropertiesClass", componentSchema);
+ Assert.assertNotNull(cm.getAdditionalProperties());
- Map m = schema.getProperties();
- Schema child = m.get("map_with_undeclared_properties_string");
+ Map modelPropSchems = componentSchema.getProperties();
+ Schema map_with_undeclared_properties_string_sc = modelPropSchems.get("map_with_undeclared_properties_string");
+ CodegenProperty map_with_undeclared_properties_string_cp = null;
+ Schema map_with_undeclared_properties_anytype_1_sc = modelPropSchems.get("map_with_undeclared_properties_anytype_1");
+ CodegenProperty map_with_undeclared_properties_anytype_1_cp = null;
+ Schema map_with_undeclared_properties_anytype_2_sc = modelPropSchems.get("map_with_undeclared_properties_anytype_2");
+ CodegenProperty map_with_undeclared_properties_anytype_2_cp = null;
+ Schema map_with_undeclared_properties_anytype_3_sc = modelPropSchems.get("map_with_undeclared_properties_anytype_3");
+ CodegenProperty map_with_undeclared_properties_anytype_3_cp = null;
+ Schema empty_map_sc = modelPropSchems.get("empty_map");
+ CodegenProperty empty_map_cp = null;
+
+ for(CodegenProperty cp: cm.vars) {
+ if (cp.baseName.equals("map_with_undeclared_properties_string")) {
+ map_with_undeclared_properties_string_cp = cp;
+ } else if (cp.baseName.equals("map_with_undeclared_properties_anytype_1")) {
+ map_with_undeclared_properties_anytype_1_cp = cp;
+ } else if (cp.baseName.equals("map_with_undeclared_properties_anytype_2")) {
+ map_with_undeclared_properties_anytype_2_cp = cp;
+ } else if (cp.baseName.equals("map_with_undeclared_properties_anytype_3")) {
+ map_with_undeclared_properties_anytype_3_cp = cp;
+ } else if (cp.baseName.equals("empty_map")) {
+ empty_map_cp = cp;
+ }
+ }
+
+ // map_with_undeclared_properties_string
// This property has the following inline schema.
// additionalProperties:
// type: string
- Assert.assertNotNull(child);
- Assert.assertNotNull(child.getAdditionalProperties());
+ Assert.assertNotNull(map_with_undeclared_properties_string_sc);
+ Assert.assertNotNull(map_with_undeclared_properties_string_sc.getAdditionalProperties());
+ Assert.assertNotNull(map_with_undeclared_properties_string_cp.getAdditionalProperties());
- child = m.get("map_with_undeclared_properties_anytype_1");
+ // map_with_undeclared_properties_anytype_1
// This property does not use the additionalProperties keyword,
// which means by default undeclared properties are allowed.
- Assert.assertNotNull(child);
- Assert.assertNull(child.getAdditionalProperties());
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_1_sc);
+ Assert.assertNull(map_with_undeclared_properties_anytype_1_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_with_undeclared_properties_anytype_1_sc);
Assert.assertNotNull(addProps);
Assert.assertTrue(addProps instanceof ObjectSchema);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_1_cp.getAdditionalProperties());
- child = m.get("map_with_undeclared_properties_anytype_2");
+ // map_with_undeclared_properties_anytype_2
// This property does not use the additionalProperties keyword,
// which means by default undeclared properties are allowed.
- Assert.assertNotNull(child);
- Assert.assertNull(child.getAdditionalProperties());
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_2_sc);
+ Assert.assertNull(map_with_undeclared_properties_anytype_2_sc.getAdditionalProperties());
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_with_undeclared_properties_anytype_2_sc);
Assert.assertNotNull(addProps);
Assert.assertTrue(addProps instanceof ObjectSchema);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_2_cp.getAdditionalProperties());
- child = m.get("map_with_undeclared_properties_anytype_3");
+ // map_with_undeclared_properties_anytype_3
// This property has the following inline schema.
// additionalProperties: true
- Assert.assertNotNull(child);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_3_sc);
// Unlike the V2 spec, in V3 we CAN differentiate between 'additionalProperties' not present and
// additionalProperties: true.
- Assert.assertNotNull(child.getAdditionalProperties());
- Assert.assertEquals(child.getAdditionalProperties(), Boolean.TRUE);
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_3_sc.getAdditionalProperties());
+ Assert.assertEquals(map_with_undeclared_properties_anytype_3_sc.getAdditionalProperties(), Boolean.TRUE);
+ addProps = ModelUtils.getAdditionalProperties(openAPI, map_with_undeclared_properties_anytype_3_sc);
Assert.assertNotNull(addProps);
Assert.assertTrue(addProps instanceof ObjectSchema);
+ Assert.assertNotNull(map_with_undeclared_properties_anytype_3_cp.getAdditionalProperties());
- child = m.get("empty_map");
+ // empty_map
// This property has the following inline schema.
// additionalProperties: false
- Assert.assertNotNull(child);
+ Assert.assertNotNull(empty_map_sc);
// Unlike the V2 spec, in V3 we CAN differentiate between 'additionalProperties' not present and
// additionalProperties: false.
- Assert.assertNotNull(child.getAdditionalProperties());
- Assert.assertEquals(child.getAdditionalProperties(), Boolean.FALSE);
- addProps = ModelUtils.getAdditionalProperties(openAPI, child);
+ Assert.assertNotNull(empty_map_sc.getAdditionalProperties());
+ Assert.assertEquals(empty_map_sc.getAdditionalProperties(), Boolean.FALSE);
+ addProps = ModelUtils.getAdditionalProperties(openAPI, empty_map_sc);
Assert.assertNull(addProps);
+ Assert.assertNull(empty_map_cp.getAdditionalProperties());
+
+ // check of composed schema model
+ String schemaName = "SomeObject";
+ Schema schema = openAPI.getComponents().getSchemas().get(schemaName);
+ cm = codegen.fromModel(schemaName, schema);
+ Assert.assertNotNull(cm.getAdditionalProperties());
}
@Test
- public void testAdditionalPropertiesV3SpecLegacy() {
+ public void testAdditionalPropertiesV3SpecDisallowAdditionalPropertiesIfNotPresentTrue() {
+ // As per OAS spec, when the 'additionalProperties' keyword is not present, the schema may be
+ // extended with any undeclared properties.
+ // However, in legacy 'additionalProperties' mode, this is interpreted as
+ // 'no additional properties are allowed'.
OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml");
DefaultCodegen codegen = new DefaultCodegen();
codegen.setDisallowAdditionalPropertiesIfNotPresent(true);
@@ -367,10 +526,6 @@ public class DefaultCodegenTest {
Schema schema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
Assert.assertNull(schema.getAdditionalProperties());
- // As per OAS spec, when the 'additionalProperties' keyword is not present, the schema may be
- // extended with any undeclared properties.
- // However, in legacy 'additionalProperties' mode, this is interpreted as
- // 'no additional properties are allowed'.
Schema addProps = ModelUtils.getAdditionalProperties(openAPI, schema);
Assert.assertNull(addProps);
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
index 4baa1b4ed78..1dee6ced301 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
@@ -11,11 +11,8 @@ import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
-import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.config.GlobalSettings;
-import org.openapitools.codegen.meta.GeneratorMetadata;
-import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
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 2ebc0d52143..36e8f2ab697 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
@@ -268,7 +268,7 @@ public class InlineModelResolverTest {
public void testInlineResponseModelType() {
OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/6150_model_json_inline.yaml");
new InlineModelResolver().flatten(openAPI);
-
+
Schema InlineResponse200 = openAPI.getComponents().getSchemas().get("inline_response_200");
assertEquals("object", InlineResponse200.getType());
assertEquals("unknown", InlineResponse200.getFormat());
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
index d510d5fef02..d1d5fe81dfb 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
@@ -30,7 +30,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.stream.Collectors;
public class TestUtils {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java
index e9aba9cbdbb..0933a120a35 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java
@@ -11,7 +11,6 @@ import org.apache.commons.io.FileUtils;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.languages.AsciidocDocumentationCodegen;
@@ -112,7 +111,7 @@ public class AsciidocGeneratorTest {
Assert.assertTrue(markupFileGenerated, "index.adoc is not generated!");
}
-
+
@Test
public void testHeaderAttributesFlagRemovesAttributesFromMarkupHeaderSection() throws Exception {
@@ -147,6 +146,6 @@ public class AsciidocGeneratorTest {
}
}
Assert.assertTrue(markupFileGenerated, "index.adoc is not generated!");
- }
+ }
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/bash/BashTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/bash/BashTest.java
index 2e6e6586569..7ac35d964e6 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/bash/BashTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/bash/BashTest.java
@@ -99,57 +99,57 @@ public class BashTest {
((BashClientCodegen)codegen).setProcessMarkdown(false);
- Assert.assertEquals(codegen.escapeText("__Bold text__"),
+ Assert.assertEquals(codegen.escapeText("__Bold text__"),
"__Bold text__");
- Assert.assertEquals(codegen.escapeText("**Bold text**"),
+ Assert.assertEquals(codegen.escapeText("**Bold text**"),
"**Bold text**");
- Assert.assertEquals(codegen.escapeText("*Italic text*"),
+ Assert.assertEquals(codegen.escapeText("*Italic text*"),
"*Italic text*");
- Assert.assertEquals(codegen.escapeText("_Italic text_"),
+ Assert.assertEquals(codegen.escapeText("_Italic text_"),
"_Italic text_");
((BashClientCodegen)codegen).setProcessMarkdown(true);
- Assert.assertEquals(codegen.escapeText("__Bold text__"),
+ Assert.assertEquals(codegen.escapeText("__Bold text__"),
"$(tput bold) Bold text $(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("**Bold text**"),
+ Assert.assertEquals(codegen.escapeText("**Bold text**"),
"$(tput bold) Bold text $(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("*Italic text*"),
+ Assert.assertEquals(codegen.escapeText("*Italic text*"),
"$(tput dim) Italic text $(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("_Italic text_"),
+ Assert.assertEquals(codegen.escapeText("_Italic text_"),
"$(tput dim) Italic text $(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("# SECTION NAME"),
+ Assert.assertEquals(codegen.escapeText("# SECTION NAME"),
"\n$(tput bold)$(tput setaf 7)SECTION NAME$(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("## SECTION NAME"),
+ Assert.assertEquals(codegen.escapeText("## SECTION NAME"),
"\n$(tput bold)$(tput setaf 7)SECTION NAME$(tput sgr0)");
- Assert.assertEquals(codegen.escapeText("### SECTION NAME"),
+ Assert.assertEquals(codegen.escapeText("### SECTION NAME"),
"\n$(tput bold)$(tput setaf 7)SECTION NAME$(tput sgr0)");
Assert.assertEquals(codegen.escapeText(
"```\nnice -n 100 mvn test\n```"),
- "\n---\nnice -n 100 mvn test\n---");
+ "\n---\nnice -n 100 mvn test\n---");
}
@Test(description = "test Bash client codegen escapeUnsafeCharacters method")
public void escapeUnsafeCharactersTest() {
final DefaultCodegen codegen = new BashClientCodegen();
- Assert.assertEquals(codegen.escapeUnsafeCharacters("`no backticks`"),
+ Assert.assertEquals(codegen.escapeUnsafeCharacters("`no backticks`"),
"'no backticks'");
}
-
+
@Test(description = "test Bash client codegen escapeReservedWord method")
public void escapeReservedWordTest() {
final DefaultCodegen codegen = new BashClientCodegen();
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java
index 1711eee45bd..5352c9aa0f8 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
import java.util.Map;
public class ConfluenceWikiTest {
-
+
@Test(description = "convert a model with an enum")
public void converterTest() {
final StringSchema enumSchema = new StringSchema();
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java
index 05dbe6cc9b2..44b44b5b73b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java
@@ -23,7 +23,6 @@ import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
-import org.openapitools.codegen.languages.JavaClientCodegen;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java
index 0e57791ce2f..e0ad1e14e8a 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Locale;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.languages.DartDioClientCodegen;
-import org.openapitools.codegen.languages.DartDioClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -66,7 +65,7 @@ public class DartDioClientCodegenTest {
final DartDioClientCodegen codegen = new DartDioClientCodegen();
List reservedWordsList = new ArrayList();
- try {
+ try {
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8")));
while(reader.ready()) { reservedWordsList.add(reader.readLine()); }
reader.close();
@@ -74,11 +73,11 @@ public class DartDioClientCodegenTest {
String errorString = String.format(Locale.ROOT, "Error reading dart keywords: %s", e);
Assert.fail(errorString, e);
}
-
+
Assert.assertEquals(reservedWordsList.size() > 20, true);
Assert.assertEquals(codegen.reservedWords().size() == reservedWordsList.size(), true);
for(String keyword : reservedWordsList) {
- // reserved words are stored in lowercase
+ // reserved words are stored in lowercase
Assert.assertEquals(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), true, String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
}
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioModelTest.java
index adc15af5100..95449c3edb9 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioModelTest.java
@@ -18,7 +18,6 @@
package org.openapitools.codegen.dart.dio;
import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
@@ -26,17 +25,11 @@ import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
-import org.openapitools.codegen.ClientOptInput;
-import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
-import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.languages.DartDioClientCodegen;
-import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java
index 61622224bfd..3886a252193 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java
@@ -66,7 +66,7 @@ public class DartDioNextClientCodegenTest {
final DartDioClientCodegen codegen = new DartDioClientCodegen();
List reservedWordsList = new ArrayList();
- try {
+ try {
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8")));
while(reader.ready()) { reservedWordsList.add(reader.readLine()); }
reader.close();
@@ -74,11 +74,11 @@ public class DartDioNextClientCodegenTest {
String errorString = String.format(Locale.ROOT, "Error reading dart keywords: %s", e);
Assert.fail(errorString, e);
}
-
+
Assert.assertEquals(reservedWordsList.size() > 20, true);
Assert.assertEquals(codegen.reservedWords().size() == reservedWordsList.size(), true);
for(String keyword : reservedWordsList) {
- // reserved words are stored in lowercase
+ // reserved words are stored in lowercase
Assert.assertEquals(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), true, String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
}
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextModelTest.java
index 928647ae681..1190240faa0 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextModelTest.java
@@ -20,7 +20,6 @@ import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.*;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.DartDioNextClientCodegen;
-import org.openapitools.codegen.languages.DartDioNextClientCodegen;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java
index 585ec9188de..47c23b2ea73 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java
@@ -16,7 +16,6 @@
package org.openapitools.codegen.fsharp;
import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.languages.AbstractFSharpCodegen;
import org.openapitools.codegen.languages.FsharpGiraffeServerCodegen;
import org.testng.Assert;
@@ -63,15 +62,15 @@ public class FSharpServerCodegenTest {
models.put("wheel", Collections.singletonMap("models", Collections.singletonList(Collections.singletonMap("model", wheel))));
Map sorted = codegen.postProcessDependencyOrders(models);
-
+
Object[] keys = sorted.keySet().toArray();
-
+
Assert.assertTrue("wheel".equals(keys[0]));
Assert.assertTrue("bike".equals(keys[1]) || "car".equals(keys[1]));
Assert.assertTrue("bike".equals(keys[2]) || "car".equals(keys[2]));
Assert.assertEquals(keys[3], "parent");
Assert.assertEquals(keys[4], "child");
-
+
}
@Test(description = "modify model imports to explicit set namespace and package name")
@@ -80,10 +79,10 @@ public class FSharpServerCodegenTest {
codegen.setPackageName("MyNamespace");
codegen.setModelPackage("Model");
String modified = codegen.toModelImport("Foo");
- Assert.assertEquals(modified, "MyNamespace.Model.Foo");
+ Assert.assertEquals(modified, "MyNamespace.Model.Foo");
}
-
+
private static class P_AbstractFSharpCodegen extends AbstractFSharpCodegen {
-
+
}
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java
index b1e0d924fa8..f5b730e1ccf 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java
@@ -25,7 +25,6 @@ import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.java.AbstractJavaCodegenTest;
import org.openapitools.codegen.languages.AbstractGoCodegen;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellServantCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellServantCodegenTest.java
index cfb85d538be..4e7b149546b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellServantCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellServantCodegenTest.java
@@ -16,18 +16,12 @@
package org.openapitools.codegen.haskellservant;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.Arrays;
-
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.HaskellServantCodegen;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
index 4f8b9807378..362f4cc3da0 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
@@ -440,7 +440,7 @@ public class AbstractJavaCodegenTest {
ModelUtils.setGenerateAliasAsModel(true);
defaultValue = codegen.toDefaultValue(schema);
Assert.assertEquals(defaultValue, "new HashMap()");
-
+
// Test default value for date format
DateSchema dateSchema = new DateSchema();
LocalDate defaultLocalDate = LocalDate.of(2019,2,15);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
index 0c040954612..893e8c8cba6 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
@@ -5,7 +5,6 @@ import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*;
-import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen;
import org.openapitools.codegen.languages.JavaCXFExtServerCodegen;
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
index 5668a4398bd..9d32f0929f7 100644
--- 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
@@ -4,9 +4,6 @@ import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema;
-import io.swagger.v3.oas.models.media.Content;
-import io.swagger.v3.oas.models.media.MediaType;
-import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
@@ -31,7 +28,6 @@ import java.util.Map;
import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles;
-import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
/**
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsResteasyServerCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsResteasyServerCodegenModelTest.java
index 43db1850cfa..9b2670665ba 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsResteasyServerCodegenModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsResteasyServerCodegenModelTest.java
@@ -1,11 +1,15 @@
package org.openapitools.codegen.java.jaxrs;
import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.JavaResteasyServerCodegen;
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -33,4 +37,27 @@ public class JavaJaxrsResteasyServerCodegenModelTest extends JavaJaxrsBaseTest {
assertTrue(cm.imports.contains("HashMap"));
}
+ @Test(description = "remove suffix for int64, float and double types")
+ public void testDefaultValuesFixed() {
+ // we had an issue where int64, float, and double values were having single character string suffixes
+ // included in their defaultValues
+ // This test verifies that those characters are no longer present
+ final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue8986.yaml");
+ final JavaResteasyServerCodegen codegen = new JavaResteasyServerCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String int64Val = "100";
+ String floatVal = "3.14159";
+ String doubleVal = "3.14159";
+ // make sure that the operation parameters omit character suffixes.
+ String route = "/numericqueryparams";
+ Operation op = openAPI.getPaths().get(route).getGet();
+ CodegenOperation co = codegen.fromOperation(route, "GET", op, null);
+ CodegenParameter int64Param = co.queryParams.get(0);
+ CodegenParameter floatParam = co.queryParams.get(1);
+ CodegenParameter doubleParam = co.queryParams.get(2);
+ Assert.assertEquals(int64Param.defaultValue, int64Val);
+ Assert.assertEquals(floatParam.defaultValue, floatVal);
+ Assert.assertEquals(doubleParam.defaultValue, doubleVal);
+ }
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
index fb950fbe552..54e122aa03c 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
@@ -3,21 +3,13 @@ package org.openapitools.codegen.java.jaxrs;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.DefaultCodegen;
-import org.openapitools.codegen.MockDefaultGenerator;
-import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
-import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.JavaJerseyServerCodegen;
import org.openapitools.codegen.languages.features.CXFServerFeatures;
-import org.openapitools.codegen.templating.MustacheEngineAdapter;
import org.openapitools.codegen.DefaultGenerator;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
index f81ba9f22a8..c594cbb90bf 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
@@ -17,13 +17,9 @@
package org.openapitools.codegen.javascript;
-import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.ArraySchema;
-import io.swagger.v3.oas.models.media.MediaType;
import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.parameters.RequestBody;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.JavascriptClientCodegen;
import org.testng.Assert;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java
index a6443024506..3c9781bd63e 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java
@@ -16,7 +16,6 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import java.io.File;
-import java.util.HashSet;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java
index 4f43823c193..a86cf6f1397 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java
@@ -20,7 +20,6 @@ import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.*;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ktorm/KtormSchemaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ktorm/KtormSchemaCodegenTest.java
index 6accc27c9ce..bad3d2a3ccf 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ktorm/KtormSchemaCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ktorm/KtormSchemaCodegenTest.java
@@ -18,7 +18,6 @@ package org.openapitools.codegen.ktorm;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.KtormSchemaCodegen;
import org.testng.Assert;
@@ -55,19 +54,19 @@ public class KtormSchemaCodegenTest {
codegen.postProcessModels(toObjs(cm));
return cm;
}
-
+
private Map getExtension(CodegenProperty property) {
- return (Map)
+ return (Map)
property.vendorExtensions.get(KtormSchemaCodegen.VENDOR_EXTENSION_SCHEMA);
}
-
+
private Map getColumnDefinition(Map schema) {
- return (Map)
+ return (Map)
schema.get("columnDefinition");
}
private Map getRelationDefinition(Map schema) {
- return (Map)
+ return (Map)
schema.get("relationDefinition");
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
index 2575bc1f93a..03fe8e266ef 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
@@ -44,12 +44,12 @@ public class ObjcModelTest {
OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
codegen.setOpenAPI(openAPI);
final CodegenModel cm = codegen.fromModel("sample", model);
-
+
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
Assert.assertEquals(cm.description, "a sample model");
Assert.assertEquals(cm.vars.size(), 1);
-
+
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
Assert.assertEquals(property1.dataType, "NSDictionary*>*");
@@ -59,7 +59,7 @@ public class ObjcModelTest {
Assert.assertFalse(property1.required);
Assert.assertTrue(property1.isContainer);
}
-
+
@Test(description = "convert a simple java model")
public void simpleModelTest() {
final Schema model = new Schema()
@@ -177,7 +177,7 @@ public class ObjcModelTest {
Assert.assertTrue(property1.isPrimitiveType);
}
-
+
@Test(description = "convert a model with complex property")
public void complexPropertyTest() {
final Schema model = new Schema()
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/BashClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/BashClientOptionsProvider.java
index 2a4564db2b9..b2c8415fdca 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/BashClientOptionsProvider.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/BashClientOptionsProvider.java
@@ -30,11 +30,11 @@ public class BashClientOptionsProvider implements OptionsProvider {
public static final String SCRIPT_NAME = "petstore-cli";
public static final String GENERATE_BASH_COMPLETION = "true";
public static final String GENERATE_ZSH_COMPLETION = "false";
- public static final String HOST_ENVIRONMENT_VARIABLE_NAME
+ public static final String HOST_ENVIRONMENT_VARIABLE_NAME
= "PETSTORE_HOSTNAME";
- public static final String BASIC_AUTH_ENVIRONMENT_VARIABLE_NAME
+ public static final String BASIC_AUTH_ENVIRONMENT_VARIABLE_NAME
= "PETSTORE_BASIC_AUTH";
- public static final String APIKEY_AUTH_ENVIRONMENT_VARIABLE_NAME
+ public static final String APIKEY_AUTH_ENVIRONMENT_VARIABLE_NAME
= "PETSTORE_APIKEY";
public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE
= "false";
@@ -47,23 +47,23 @@ public class BashClientOptionsProvider implements OptionsProvider {
@Override
public Map createOptions() {
-
- ImmutableMap.Builder builder
+
+ ImmutableMap.Builder builder
= new ImmutableMap.Builder();
return builder
.put(BashClientCodegen.CURL_OPTIONS, CURL_OPTIONS)
.put(BashClientCodegen.SCRIPT_NAME, SCRIPT_NAME)
.put(BashClientCodegen.PROCESS_MARKDOWN, PROCESS_MARKDOWN)
- .put(BashClientCodegen.GENERATE_BASH_COMPLETION,
+ .put(BashClientCodegen.GENERATE_BASH_COMPLETION,
GENERATE_BASH_COMPLETION)
- .put(BashClientCodegen.GENERATE_ZSH_COMPLETION,
+ .put(BashClientCodegen.GENERATE_ZSH_COMPLETION,
GENERATE_ZSH_COMPLETION)
- .put(BashClientCodegen.HOST_ENVIRONMENT_VARIABLE_NAME,
+ .put(BashClientCodegen.HOST_ENVIRONMENT_VARIABLE_NAME,
HOST_ENVIRONMENT_VARIABLE_NAME)
- .put(BashClientCodegen.BASIC_AUTH_ENVIRONMENT_VARIABLE_NAME,
+ .put(BashClientCodegen.BASIC_AUTH_ENVIRONMENT_VARIABLE_NAME,
BASIC_AUTH_ENVIRONMENT_VARIABLE_NAME)
- .put(BashClientCodegen.APIKEY_AUTH_ENVIRONMENT_VARIABLE_NAME,
+ .put(BashClientCodegen.APIKEY_AUTH_ENVIRONMENT_VARIABLE_NAME,
APIKEY_AUTH_ENVIRONMENT_VARIABLE_NAME)
.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "false")
.put(CodegenConstants.SORT_MODEL_PROPERTIES_BY_REQUIRED_FLAG, "false")
@@ -73,13 +73,13 @@ public class BashClientOptionsProvider implements OptionsProvider {
.put(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "true")
.put(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT, "true")
.build();
-
+
}
@Override
public boolean isServer() {
-
+
return false;
-
+
}
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/NimClientCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/NimClientCodegenOptionsProvider.java
index 24cad9416a5..c5e5eb63aa5 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/NimClientCodegenOptionsProvider.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/NimClientCodegenOptionsProvider.java
@@ -1,6 +1,5 @@
package org.openapitools.codegen.options;
-import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.languages.NimClientCodegen;
import com.google.common.collect.ImmutableMap;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
index e133911796b..4face161d7e 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
@@ -16,17 +16,8 @@
package org.openapitools.codegen.python;
import com.google.common.io.Resources;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.Paths;
-import io.swagger.v3.oas.models.parameters.RequestBody;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
-import javax.validation.constraints.AssertTrue;
-import org.apache.commons.io.IOUtils;
import org.openapitools.codegen.config.CodegenConfigurator;
import com.google.common.collect.Sets;
@@ -47,7 +38,6 @@ import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.PythonClientCodegen;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
-import org.testng.TestNGAntTask.Mode;
import org.testng.annotations.Test;
@SuppressWarnings("static-method")
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java
index 45c784f40ed..d3bff53a8ea 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java
@@ -24,13 +24,11 @@ import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.PythonLegacyClientCodegen;
-import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.regex.Pattern;
public class PythonLegacyClientCodegenTest {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubysinatra/RubySinatraServerOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubysinatra/RubySinatraServerOptionsTest.java
index 33623381607..9971da32afd 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubysinatra/RubySinatraServerOptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubysinatra/RubySinatraServerOptionsTest.java
@@ -23,7 +23,6 @@ import org.openapitools.codegen.languages.RubySinatraServerCodegen;
import org.openapitools.codegen.options.RubySinatraServerOptionsProvider;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
public class RubySinatraServerOptionsTest extends AbstractOptionsTest {
private RubySinatraServerCodegen clientCodegen = mock(RubySinatraServerCodegen.class, mockSettings);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
index 03a08b56759..d78b487d286 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
@@ -24,7 +24,6 @@ import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator;
-import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.languages.ScalaAkkaClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
index e514444519b..2832f431dd9 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
@@ -25,7 +25,6 @@ import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.ScalaAkkaClientCodegen;
import org.openapitools.codegen.languages.ScalaHttpClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/serializer/SerializerUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/serializer/SerializerUtilsTest.java
index 046645ec0db..adfcaaed03d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/serializer/SerializerUtilsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/serializer/SerializerUtilsTest.java
@@ -179,7 +179,7 @@ public class SerializerUtilsTest {
" operationId: pingOp\n" +
" responses:\n" +
" \"200\":\n" +
- " description: Ok\n";
+ " description: Ok\n";
assertEquals(content, expected);
}
@@ -210,7 +210,7 @@ public class SerializerUtilsTest {
" }\n" +
" }\n" +
" }\n" +
- "}";
+ "}";
assertEquals(content, expected);
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java
index f505c221cbd..c56d675a663 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java
@@ -30,11 +30,8 @@ import org.testng.annotations.Test;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
import java.util.List;
public class Swift5ClientCodegenTest {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5OptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5OptionsTest.java
index 04ec85ecfbe..0dbbaedf3db 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5OptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5OptionsTest.java
@@ -20,7 +20,6 @@ package org.openapitools.codegen.swift5;
import org.openapitools.codegen.AbstractOptionsTest;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.languages.Swift5ClientCodegen;
-import org.openapitools.codegen.options.Swift4OptionsProvider;
import org.openapitools.codegen.options.Swift5OptionsProvider;
import static org.mockito.Mockito.mock;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
index 2b9f1991f1f..e695fbe04bf 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
@@ -18,7 +18,6 @@ package org.openapitools.codegen.typescript.typescriptnode;
import org.openapitools.codegen.AbstractIntegrationTest;
import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
import org.openapitools.codegen.languages.TypeScriptNodeClientCodegen;
import org.openapitools.codegen.testutils.IntegrationTestPathsConfig;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java
index 211f23d910b..4a5e7da18a7 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java
@@ -347,7 +347,7 @@ public class JsonCacheTest {
// private void assertEquals(String string, float f, float float1, float minValue) {
// // TODO Auto-generated method stub
-//
+//
// }
@Test
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/OnceLoggerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/OnceLoggerTest.java
index 280079c9ac8..5e2c3729a6d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/OnceLoggerTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/OnceLoggerTest.java
@@ -1,6 +1,5 @@
package org.openapitools.codegen.utils;
-import com.google.common.base.Ticker;
import com.google.common.testing.FakeTicker;
import org.mockito.Mockito;
import org.openapitools.codegen.config.GlobalSettings;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/URLPathUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/URLPathUtilsTest.java
index 5169c2e75aa..f4fa3d68f6d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/URLPathUtilsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/URLPathUtilsTest.java
@@ -27,7 +27,6 @@ import org.testng.annotations.Test;
import java.net.URL;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Map;
public class URLPathUtilsTest {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaTypeTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaTypeTest.java
index cc7dfe2fc51..934da7997dd 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaTypeTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaTypeTest.java
@@ -1,6 +1,5 @@
package org.openapitools.codegen.validations.oas;
-import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.OpenAPI;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.validation.Invalid;
@@ -9,7 +8,6 @@ import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/yaml/YamlGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/yaml/YamlGeneratorTest.java
index 534a303b0d9..c264a8a251c 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/yaml/YamlGeneratorTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/yaml/YamlGeneratorTest.java
@@ -19,10 +19,8 @@ package org.openapitools.codegen.yaml;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.config.CodegenConfigurator;
-import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.languages.OpenAPIYamlGenerator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/modules/openapi-generator/src/test/resources/2_0/additional-properties-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/additional-properties-for-testing.yaml
index 5cfa74c27c8..2864ab034c2 100644
--- a/modules/openapi-generator/src/test/resources/2_0/additional-properties-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/additional-properties-for-testing.yaml
@@ -9,6 +9,18 @@ info:
host: petstore.swagger.io:80
basePath: /v2
definitions:
+ Grandparent:
+ type: object
+ properties:
+ radioWaves:
+ type: boolean
+ Parent:
+ allOf:
+ - $ref: '#/definitions/Grandparent'
+ - type: object
+ properties:
+ teleVision:
+ type: boolean
AdditionalPropertiesClass:
type: object
properties:
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue8986.yaml b/modules/openapi-generator/src/test/resources/3_0/issue8986.yaml
new file mode 100644
index 00000000000..cececacc150
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue8986.yaml
@@ -0,0 +1,40 @@
+openapi: 3.0.0
+info:
+ title: My title
+ description: API under test
+ version: 1.0.7
+servers:
+ - url: https://localhost:9999/root
+paths:
+ /numericqueryparams:
+ get:
+ tags:
+ - user
+ summary: a test route for numeric query params
+ description: ''
+ operationId: numericQueryParams
+ produces:
+ - application/json
+ parameters:
+ - in: query
+ name: int64
+ schema:
+ type: integer
+ format: int64
+ default: 100
+ - in: query
+ name: float
+ schema:
+ type: number
+ format: float
+ default: 3.14159
+ - in: query
+ name: double
+ schema:
+ type: number
+ format: double
+ default: 3.14159
+ responses:
+ default:
+ description: successful operation
+securityDefinitions: {}
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 843298825ab..05b1c7abd35 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1793,6 +1793,8 @@ components:
'$special[property.name]':
type: integer
format: int64
+ '_special_model.name_':
+ type: string
xml:
name: '$special[model.name]'
HealthCheckResult:
diff --git a/pom.xml b/pom.xml
index d9cf582c4f9..23b9abfeef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1352,17 +1352,6 @@
samples/client/petstore/javascript-promise-es6
samples/server/petstore/go-api-server
samples/server/petstore/go-gin-api-server
- samples/client/petstore/dart2/petstore_client_lib
- samples/client/petstore/dart2/petstore
- samples/openapi3/client/petstore/dart2/petstore_client_lib
- samples/openapi3/client/petstore/dart2/petstore
-
- samples/client/petstore/dart-dio/petstore_client_lib
- samples/openapi3/client/petstore/dart-dio/petstore_client_lib
- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
- samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake
- samples/client/petstore/dart-jaguar/openapi
- samples/client/petstore/dart-jaguar/flutter_petstore/openapi
@@ -1424,6 +1413,12 @@
+ samples/openapi3/client/petstore/dart2/petstore_client_lib
+ samples/openapi3/client/petstore/dart2/petstore
+ samples/openapi3/client/petstore/dart-dio/petstore_client_lib
+ samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
+ samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake
+
samples/client/petstore/R
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
index 8a1bd169a2f..c29a6287433 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
@@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
index a27e685165a..648179799e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
@@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**SpecialPropertyName** | **long** | | [optional]
+**_SpecialModelName** | **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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
index 60ba4090776..43dba569483 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -305,7 +305,7 @@ namespace Org.OpenAPITools.Client
{
if (options.Data is Stream s)
{
- contentType ??= "application/octet-stream";
+ contentType = contentType ?? "application/octet-stream";
var streamContent = new StreamContent(s);
streamContent.Headers.ContentType = new MediaTypeHeaderValue(contentType);
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs
index 7501463d801..a1203358492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs
@@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Mealy
///
- [DataMember(Name = "mealy", EmitDefaultValue = false)]
+ [DataMember(Name = "mealy", EmitDefaultValue = true)]
public bool Mealy { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs
index 6e7c0c7fb3b..4a52e918a46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Sweet
///
- [DataMember(Name = "sweet", EmitDefaultValue = false)]
+ [DataMember(Name = "sweet", EmitDefaultValue = true)]
public bool Sweet { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs
index 1c6fa0f4220..3fd19648bb9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs
index ed6a94eedeb..8d61cf77b64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs
@@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs
index 99f8afbbbfd..48b3d7d0e7e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines EnumClass
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum EnumClass
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs
index 16f1dc95bab..4ee431a9b2f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -38,15 +38,15 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
this.AdditionalProperties = new Dictionary();
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name = "client", EmitDefaultValue = false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Gets or Sets additional properties
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -106,8 +106,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs
index 975f3b711dd..6b572bfef78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Complete
///
- [DataMember(Name = "complete", EmitDefaultValue = false)]
+ [DataMember(Name = "complete", EmitDefaultValue = true)]
public bool Complete { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs
index 61c4bca3e3c..1e4e03993e0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets MyBoolean
///
- [DataMember(Name = "my_boolean", EmitDefaultValue = false)]
+ [DataMember(Name = "my_boolean", EmitDefaultValue = true)]
public bool MyBoolean { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs
index 3b2dc2a110a..2aa496a2e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnum
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnum
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 04d88ac8fec..dd79c7010d6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumDefaultValue
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumDefaultValue
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index da111ad9341..44dc91c700a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumInteger
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index ff0d8505623..b927507cf97 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumIntegerDefaultValue
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs
index f7199da4c03..26861d98d34 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -36,9 +36,11 @@ namespace Org.OpenAPITools.Model
/// Initializes a new instance of the class.
///
/// specialPropertyName.
- public SpecialModelName(long specialPropertyName = default(long))
+ /// specialModelName.
+ public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string))
{
this.SpecialPropertyName = specialPropertyName;
+ this._SpecialModelName = specialModelName;
this.AdditionalProperties = new Dictionary();
}
@@ -48,6 +50,12 @@ namespace Org.OpenAPITools.Model
[DataMember(Name = "$special[property.name]", EmitDefaultValue = false)]
public long SpecialPropertyName { get; set; }
+ ///
+ /// Gets or Sets _SpecialModelName
+ ///
+ [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)]
+ public string _SpecialModelName { get; set; }
+
///
/// Gets or Sets additional properties
///
@@ -63,6 +71,7 @@ namespace Org.OpenAPITools.Model
var sb = new StringBuilder();
sb.Append("class SpecialModelName {\n");
sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+ sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -107,6 +116,8 @@ namespace Org.OpenAPITools.Model
{
int hashCode = 41;
hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+ if (this._SpecialModelName != null)
+ hashCode = hashCode * 59 + this._SpecialModelName.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs
index fdecfefd679..80fbf9c368c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs
@@ -58,13 +58,13 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets HasBaleen
///
- [DataMember(Name = "hasBaleen", EmitDefaultValue = false)]
+ [DataMember(Name = "hasBaleen", EmitDefaultValue = true)]
public bool HasBaleen { get; set; }
///
/// Gets or Sets HasTeeth
///
- [DataMember(Name = "hasTeeth", EmitDefaultValue = false)]
+ [DataMember(Name = "hasTeeth", EmitDefaultValue = true)]
public bool HasTeeth { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c415e6768bc..254cb0c9fc2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -2,7 +2,7 @@
false
- netstandard2.1
+ netstandard2.0
Org.OpenAPITools
Org.OpenAPITools
Library
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
index 8a1bd169a2f..c29a6287433 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
@@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_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/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
index a27e685165a..648179799e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
@@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**SpecialPropertyName** | **long** | | [optional]
+**_SpecialModelName** | **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/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs
index 7501463d801..a1203358492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs
@@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Mealy
///
- [DataMember(Name = "mealy", EmitDefaultValue = false)]
+ [DataMember(Name = "mealy", EmitDefaultValue = true)]
public bool Mealy { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs
index 6e7c0c7fb3b..4a52e918a46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Sweet
///
- [DataMember(Name = "sweet", EmitDefaultValue = false)]
+ [DataMember(Name = "sweet", EmitDefaultValue = true)]
public bool Sweet { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs
index 1c6fa0f4220..3fd19648bb9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs
index ed6a94eedeb..8d61cf77b64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs
@@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs
index 99f8afbbbfd..48b3d7d0e7e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines EnumClass
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum EnumClass
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs
index 16f1dc95bab..4ee431a9b2f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -38,15 +38,15 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
this.AdditionalProperties = new Dictionary();
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name = "client", EmitDefaultValue = false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Gets or Sets additional properties
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -106,8 +106,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs
index 975f3b711dd..6b572bfef78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Complete
///
- [DataMember(Name = "complete", EmitDefaultValue = false)]
+ [DataMember(Name = "complete", EmitDefaultValue = true)]
public bool Complete { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs
index 61c4bca3e3c..1e4e03993e0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets MyBoolean
///
- [DataMember(Name = "my_boolean", EmitDefaultValue = false)]
+ [DataMember(Name = "my_boolean", EmitDefaultValue = true)]
public bool MyBoolean { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs
index 3b2dc2a110a..2aa496a2e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnum
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnum
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 04d88ac8fec..dd79c7010d6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumDefaultValue
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumDefaultValue
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index da111ad9341..44dc91c700a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumInteger
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index ff0d8505623..b927507cf97 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumIntegerDefaultValue
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs
index f7199da4c03..26861d98d34 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -36,9 +36,11 @@ namespace Org.OpenAPITools.Model
/// Initializes a new instance of the class.
///
/// specialPropertyName.
- public SpecialModelName(long specialPropertyName = default(long))
+ /// specialModelName.
+ public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string))
{
this.SpecialPropertyName = specialPropertyName;
+ this._SpecialModelName = specialModelName;
this.AdditionalProperties = new Dictionary();
}
@@ -48,6 +50,12 @@ namespace Org.OpenAPITools.Model
[DataMember(Name = "$special[property.name]", EmitDefaultValue = false)]
public long SpecialPropertyName { get; set; }
+ ///
+ /// Gets or Sets _SpecialModelName
+ ///
+ [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)]
+ public string _SpecialModelName { get; set; }
+
///
/// Gets or Sets additional properties
///
@@ -63,6 +71,7 @@ namespace Org.OpenAPITools.Model
var sb = new StringBuilder();
sb.Append("class SpecialModelName {\n");
sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+ sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -107,6 +116,8 @@ namespace Org.OpenAPITools.Model
{
int hashCode = 41;
hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+ if (this._SpecialModelName != null)
+ hashCode = hashCode * 59 + this._SpecialModelName.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs
index fdecfefd679..80fbf9c368c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs
@@ -58,13 +58,13 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets HasBaleen
///
- [DataMember(Name = "hasBaleen", EmitDefaultValue = false)]
+ [DataMember(Name = "hasBaleen", EmitDefaultValue = true)]
public bool HasBaleen { get; set; }
///
/// Gets or Sets HasTeeth
///
- [DataMember(Name = "hasTeeth", EmitDefaultValue = false)]
+ [DataMember(Name = "hasTeeth", EmitDefaultValue = true)]
public bool HasTeeth { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
index 8a1bd169a2f..c29a6287433 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
@@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
index a27e685165a..648179799e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
@@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**SpecialPropertyName** | **long** | | [optional]
+**_SpecialModelName** | **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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs
index 7501463d801..a1203358492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs
@@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Mealy
///
- [DataMember(Name = "mealy", EmitDefaultValue = false)]
+ [DataMember(Name = "mealy", EmitDefaultValue = true)]
public bool Mealy { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs
index 6e7c0c7fb3b..4a52e918a46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Sweet
///
- [DataMember(Name = "sweet", EmitDefaultValue = false)]
+ [DataMember(Name = "sweet", EmitDefaultValue = true)]
public bool Sweet { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs
index 1c6fa0f4220..3fd19648bb9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs
index ed6a94eedeb..8d61cf77b64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs
@@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs
index 99f8afbbbfd..48b3d7d0e7e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines EnumClass
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum EnumClass
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs
index 16f1dc95bab..4ee431a9b2f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -38,15 +38,15 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
this.AdditionalProperties = new Dictionary();
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name = "client", EmitDefaultValue = false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Gets or Sets additional properties
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -106,8 +106,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs
index 975f3b711dd..6b572bfef78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Complete
///
- [DataMember(Name = "complete", EmitDefaultValue = false)]
+ [DataMember(Name = "complete", EmitDefaultValue = true)]
public bool Complete { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs
index 61c4bca3e3c..1e4e03993e0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets MyBoolean
///
- [DataMember(Name = "my_boolean", EmitDefaultValue = false)]
+ [DataMember(Name = "my_boolean", EmitDefaultValue = true)]
public bool MyBoolean { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs
index 3b2dc2a110a..2aa496a2e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnum
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnum
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 04d88ac8fec..dd79c7010d6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumDefaultValue
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumDefaultValue
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index da111ad9341..44dc91c700a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumInteger
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index ff0d8505623..b927507cf97 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumIntegerDefaultValue
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
index f7199da4c03..26861d98d34 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -36,9 +36,11 @@ namespace Org.OpenAPITools.Model
/// Initializes a new instance of the class.
///
/// specialPropertyName.
- public SpecialModelName(long specialPropertyName = default(long))
+ /// specialModelName.
+ public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string))
{
this.SpecialPropertyName = specialPropertyName;
+ this._SpecialModelName = specialModelName;
this.AdditionalProperties = new Dictionary();
}
@@ -48,6 +50,12 @@ namespace Org.OpenAPITools.Model
[DataMember(Name = "$special[property.name]", EmitDefaultValue = false)]
public long SpecialPropertyName { get; set; }
+ ///
+ /// Gets or Sets _SpecialModelName
+ ///
+ [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)]
+ public string _SpecialModelName { get; set; }
+
///
/// Gets or Sets additional properties
///
@@ -63,6 +71,7 @@ namespace Org.OpenAPITools.Model
var sb = new StringBuilder();
sb.Append("class SpecialModelName {\n");
sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+ sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -107,6 +116,8 @@ namespace Org.OpenAPITools.Model
{
int hashCode = 41;
hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+ if (this._SpecialModelName != null)
+ hashCode = hashCode * 59 + this._SpecialModelName.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs
index fdecfefd679..80fbf9c368c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs
@@ -58,13 +58,13 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets HasBaleen
///
- [DataMember(Name = "hasBaleen", EmitDefaultValue = false)]
+ [DataMember(Name = "hasBaleen", EmitDefaultValue = true)]
public bool HasBaleen { get; set; }
///
/// Gets or Sets HasTeeth
///
- [DataMember(Name = "hasTeeth", EmitDefaultValue = false)]
+ [DataMember(Name = "hasTeeth", EmitDefaultValue = true)]
public bool HasTeeth { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
index 8a1bd169a2f..c29a6287433 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
@@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_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/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
index a27e685165a..648179799e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
@@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**SpecialPropertyName** | **long** | | [optional]
+**_SpecialModelName** | **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/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
index 6491bd5d97a..9a5f17e0431 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
@@ -144,6 +144,11 @@ namespace Org.OpenAPITools.Test
// test to ensure both Cat and Animal (parent) can have "AdditionalProperties", which result in warnings
Cat c = JsonConvert.DeserializeObject("{\"className\":\"cat\",\"bar\":\"from json bar\"}");
Assert.Equal("from json bar", c.AdditionalProperties["bar"]);
+
+ Cat c2 = new Cat();
+ c2.Color = "red";
+ c2.Declawed = false;
+ Assert.Equal("{\"declawed\":false,\"className\":\"Cat\",\"color\":\"red\"}", JsonConvert.SerializeObject(c2));
}
///
@@ -153,10 +158,18 @@ namespace Org.OpenAPITools.Test
public void TestAdditionalProperties()
{
Foo f = new Foo();
-
Assert.NotNull(f.GetType().GetProperty("AdditionalProperties"));
Assert.Null(f.GetType().GetProperty("unknown_property"));
+ }
+ ///
+ /// Test OuterEnumInteger
+ ///
+ [Fact]
+ public void OuterEnumIntegerInstanceTest()
+ {
+ OuterEnumInteger instance = OuterEnumInteger.NUMBER_1;
+ Assert.Equal(1, (int)instance);
}
}
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs
index 7501463d801..a1203358492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs
@@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Mealy
///
- [DataMember(Name = "mealy", EmitDefaultValue = false)]
+ [DataMember(Name = "mealy", EmitDefaultValue = true)]
public bool Mealy { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs
index 6e7c0c7fb3b..4a52e918a46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Sweet
///
- [DataMember(Name = "sweet", EmitDefaultValue = false)]
+ [DataMember(Name = "sweet", EmitDefaultValue = true)]
public bool Sweet { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
index 1c6fa0f4220..3fd19648bb9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs
index ed6a94eedeb..8d61cf77b64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs
@@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
index 99f8afbbbfd..48b3d7d0e7e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines EnumClass
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum EnumClass
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
index 16f1dc95bab..4ee431a9b2f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -38,15 +38,15 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
this.AdditionalProperties = new Dictionary();
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name = "client", EmitDefaultValue = false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Gets or Sets additional properties
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -106,8 +106,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
index 975f3b711dd..6b572bfef78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Complete
///
- [DataMember(Name = "complete", EmitDefaultValue = false)]
+ [DataMember(Name = "complete", EmitDefaultValue = true)]
public bool Complete { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
index 61c4bca3e3c..1e4e03993e0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets MyBoolean
///
- [DataMember(Name = "my_boolean", EmitDefaultValue = false)]
+ [DataMember(Name = "my_boolean", EmitDefaultValue = true)]
public bool MyBoolean { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
index 3b2dc2a110a..2aa496a2e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnum
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnum
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 04d88ac8fec..dd79c7010d6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumDefaultValue
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumDefaultValue
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index da111ad9341..44dc91c700a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumInteger
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index ff0d8505623..b927507cf97 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumIntegerDefaultValue
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
index f7199da4c03..26861d98d34 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -36,9 +36,11 @@ namespace Org.OpenAPITools.Model
/// Initializes a new instance of the class.
///
/// specialPropertyName.
- public SpecialModelName(long specialPropertyName = default(long))
+ /// specialModelName.
+ public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string))
{
this.SpecialPropertyName = specialPropertyName;
+ this._SpecialModelName = specialModelName;
this.AdditionalProperties = new Dictionary();
}
@@ -48,6 +50,12 @@ namespace Org.OpenAPITools.Model
[DataMember(Name = "$special[property.name]", EmitDefaultValue = false)]
public long SpecialPropertyName { get; set; }
+ ///
+ /// Gets or Sets _SpecialModelName
+ ///
+ [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)]
+ public string _SpecialModelName { get; set; }
+
///
/// Gets or Sets additional properties
///
@@ -63,6 +71,7 @@ namespace Org.OpenAPITools.Model
var sb = new StringBuilder();
sb.Append("class SpecialModelName {\n");
sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+ sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n");
sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
sb.Append("}\n");
return sb.ToString();
@@ -107,6 +116,8 @@ namespace Org.OpenAPITools.Model
{
int hashCode = 41;
hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+ if (this._SpecialModelName != null)
+ hashCode = hashCode * 59 + this._SpecialModelName.GetHashCode();
if (this.AdditionalProperties != null)
hashCode = hashCode * 59 + this.AdditionalProperties.GetHashCode();
return hashCode;
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs
index fdecfefd679..80fbf9c368c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs
@@ -58,13 +58,13 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets HasBaleen
///
- [DataMember(Name = "hasBaleen", EmitDefaultValue = false)]
+ [DataMember(Name = "hasBaleen", EmitDefaultValue = true)]
public bool HasBaleen { get; set; }
///
/// Gets or Sets HasTeeth
///
- [DataMember(Name = "hasTeeth", EmitDefaultValue = false)]
+ [DataMember(Name = "hasTeeth", EmitDefaultValue = true)]
public bool HasTeeth { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
index 8a1bd169a2f..c29a6287433 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
@@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_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/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
index a27e685165a..648179799e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
@@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**SpecialPropertyName** | **long** | | [optional]
+**_SpecialModelName** | **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/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs
index 7501463d801..a1203358492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs
@@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Mealy
///
- [DataMember(Name = "mealy", EmitDefaultValue = false)]
+ [DataMember(Name = "mealy", EmitDefaultValue = true)]
public bool Mealy { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs
index 6e7c0c7fb3b..4a52e918a46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs
@@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Sweet
///
- [DataMember(Name = "sweet", EmitDefaultValue = false)]
+ [DataMember(Name = "sweet", EmitDefaultValue = true)]
public bool Sweet { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
index e06a1195ef2..6e69c56515a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
@@ -53,7 +53,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs
index a88daf85ea4..e2ce418c50d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs
@@ -44,7 +44,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Declawed
///
- [DataMember(Name = "declawed", EmitDefaultValue = false)]
+ [DataMember(Name = "declawed", EmitDefaultValue = true)]
public bool Declawed { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
index 99f8afbbbfd..48b3d7d0e7e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines EnumClass
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum EnumClass
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
index 09257478b56..45be979525c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -38,14 +38,14 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name = "client", EmitDefaultValue = false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Returns the string presentation of the object
@@ -55,7 +55,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append("}\n");
return sb.ToString();
}
@@ -98,8 +98,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
return hashCode;
}
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
index 12a1f7706e4..7f1cf4b8492 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
@@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets Complete
///
- [DataMember(Name = "complete", EmitDefaultValue = false)]
+ [DataMember(Name = "complete", EmitDefaultValue = true)]
public bool Complete { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
index 5fc1357b116..046476b4758 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -60,7 +60,7 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets MyBoolean
///
- [DataMember(Name = "my_boolean", EmitDefaultValue = false)]
+ [DataMember(Name = "my_boolean", EmitDefaultValue = true)]
public bool MyBoolean { get; set; }
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
index 3b2dc2a110a..2aa496a2e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnum
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnum
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 04d88ac8fec..dd79c7010d6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumDefaultValue
///
-
[JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumDefaultValue
{
///
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index da111ad9341..44dc91c700a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumInteger
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index ff0d8505623..b927507cf97 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model
///
/// Defines OuterEnumIntegerDefaultValue
///
-
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
index c467ab0c57d..7f69f554b46 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -36,9 +36,11 @@ namespace Org.OpenAPITools.Model
/// Initializes a new instance of the class.
///
/// specialPropertyName.
- public SpecialModelName(long specialPropertyName = default(long))
+ /// specialModelName.
+ public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string))
{
this.SpecialPropertyName = specialPropertyName;
+ this._SpecialModelName = specialModelName;
}
///
@@ -47,6 +49,12 @@ namespace Org.OpenAPITools.Model
[DataMember(Name = "$special[property.name]", EmitDefaultValue = false)]
public long SpecialPropertyName { get; set; }
+ ///
+ /// Gets or Sets _SpecialModelName
+ ///
+ [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)]
+ public string _SpecialModelName { get; set; }
+
///
/// Returns the string presentation of the object
///
@@ -56,6 +64,7 @@ namespace Org.OpenAPITools.Model
var sb = new StringBuilder();
sb.Append("class SpecialModelName {\n");
sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+ sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n");
sb.Append("}\n");
return sb.ToString();
}
@@ -99,6 +108,8 @@ namespace Org.OpenAPITools.Model
{
int hashCode = 41;
hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode();
+ if (this._SpecialModelName != null)
+ hashCode = hashCode * 59 + this._SpecialModelName.GetHashCode();
return hashCode;
}
}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs
index 61941b59713..15277d507ab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs
@@ -54,13 +54,13 @@ namespace Org.OpenAPITools.Model
///
/// Gets or Sets HasBaleen
///
- [DataMember(Name = "hasBaleen", EmitDefaultValue = false)]
+ [DataMember(Name = "hasBaleen", EmitDefaultValue = true)]
public bool HasBaleen { get; set; }
///
/// Gets or Sets HasTeeth
///
- [DataMember(Name = "hasTeeth", EmitDefaultValue = false)]
+ [DataMember(Name = "hasTeeth", EmitDefaultValue = true)]
public bool HasTeeth { get; set; }
///
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
index e36e1fad802..80bd5d6edba 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md
@@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**__Client** | **string** | | [optional]
+**_Client** | **string** | | [optional]
[[Back to Model list]](../README.md#documentation-for-models)
[[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
index 15d88accfdc..9c1e8a26e5c 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -36,14 +36,14 @@ namespace Org.OpenAPITools.Model
/// _client.
public ModelClient(string _client = default(string))
{
- this.__Client = _client;
+ this._Client = _client;
}
///
- /// Gets or Sets __Client
+ /// Gets or Sets _Client
///
[DataMember(Name="client", EmitDefaultValue=false)]
- public string __Client { get; set; }
+ public string _Client { get; set; }
///
/// Returns the string presentation of the object
@@ -53,7 +53,7 @@ namespace Org.OpenAPITools.Model
{
var sb = new StringBuilder();
sb.Append("class ModelClient {\n");
- sb.Append(" __Client: ").Append(__Client).Append("\n");
+ sb.Append(" _Client: ").Append(_Client).Append("\n");
sb.Append("}\n");
return sb.ToString();
}
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
return
(
- this.__Client == input.__Client ||
- (this.__Client != null &&
- this.__Client.Equals(input.__Client))
+ this._Client == input._Client ||
+ (this._Client != null &&
+ this._Client.Equals(input._Client))
);
}
@@ -104,8 +104,8 @@ namespace Org.OpenAPITools.Model
unchecked // Overflow is fine, just wrap
{
int hashCode = 41;
- if (this.__Client != null)
- hashCode = hashCode * 59 + this.__Client.GetHashCode();
+ if (this._Client != null)
+ hashCode = hashCode * 59 + this._Client.GetHashCode();
return hashCode;
}
}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index 25bd78709de..58b3eac73b1 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -28,27 +28,22 @@ namespace Org.OpenAPITools.Model
/// Defines OuterEnumInteger
///
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumInteger
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index 4084fc1d6f0..d45f40bbbe8 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -28,27 +28,22 @@ namespace Org.OpenAPITools.Model
/// Defines OuterEnumIntegerDefaultValue
///
- [JsonConverter(typeof(StringEnumConverter))]
-
public enum OuterEnumIntegerDefaultValue
{
///
/// Enum NUMBER_0 for value: 0
///
- [EnumMember(Value = "0")]
- NUMBER_0 = 1,
+ NUMBER_0 = 0,
///
/// Enum NUMBER_1 for value: 1
///
- [EnumMember(Value = "1")]
- NUMBER_1 = 2,
+ NUMBER_1 = 1,
///
/// Enum NUMBER_2 for value: 2
///
- [EnumMember(Value = "2")]
- NUMBER_2 = 3
+ NUMBER_2 = 2
}
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/.gitignore b/samples/client/petstore/dart-jaguar/flutter_petstore/.gitignore
deleted file mode 100644
index eb15c3d27ca..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.DS_Store
-.atom/
-.idea
-.packages
-.pub/
-build/
-ios/.generated/
-packages
-pubspec.lock
-.flutter-plugins
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/.metadata b/samples/client/petstore/dart-jaguar/flutter_petstore/.metadata
deleted file mode 100644
index a700013d0b7..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/.metadata
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
- revision: 8f65fec5f5f7d7afbb0965f4a44bdb330a28fb19
- channel: alpha
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/README.md
deleted file mode 100644
index 608ce5afa7a..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# flutter_petstore
-
-OpenApi petstore sample flutter
-
-## Getting Started
-
-For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/android/.gitignore b/samples/client/petstore/dart-jaguar/flutter_petstore/android/.gitignore
deleted file mode 100644
index 1658458c924..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/android/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-GeneratedPluginRegistrant.java
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/build.gradle b/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/build.gradle
deleted file mode 100644
index 535c29bb389..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/build.gradle
+++ /dev/null
@@ -1,52 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withInputStream { stream ->
- localProperties.load(stream)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 25
- buildToolsVersion '25.0.3'
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.yourcompany.flutterpetstore"
- minSdkVersion 16
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- androidTestCompile 'com.android.support:support-annotations:25.4.0'
- androidTestCompile 'com.android.support.test:runner:0.5'
- androidTestCompile 'com.android.support.test:rules:0.5'
-}
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/AndroidManifest.xml b/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 4532f539988..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/java/com/yourcompany/flutterpetstore/MainActivity.java b/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/java/com/yourcompany/flutterpetstore/MainActivity.java
deleted file mode 100644
index 5c99c848d53..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/java/com/yourcompany/flutterpetstore/MainActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yourcompany.flutterpetstore;
-
-import android.os.Bundle;
-
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- GeneratedPluginRegistrant.registerWith(this);
- }
-}
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/res/drawable/launch_background.xml b/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/res/drawable/launch_background.xml
deleted file mode 100644
index 304732f8842..00000000000
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/android/app/src/main/res/drawable/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-