diff --git a/.github/workflows/samples-kotlin.yaml b/.github/workflows/samples-kotlin.yaml
index c6f6f3745c0..d1d812cbadb 100644
--- a/.github/workflows/samples-kotlin.yaml
+++ b/.github/workflows/samples-kotlin.yaml
@@ -30,8 +30,7 @@ jobs:
#- samples/client/petstore/kotlin-json-request-string
- samples/client/petstore/kotlin-jvm-okhttp4-coroutines
- samples/client/petstore/kotlin-moshi-codegen
- # need some special setup
- #- samples/client/petstore/kotlin-multiplatform
+ - samples/client/petstore/kotlin-multiplatform
- samples/client/petstore/kotlin-nonpublic
- samples/client/petstore/kotlin-nullable
- samples/client/petstore/kotlin-okhttp3
diff --git a/README.md b/README.md
index 8aca24c1a67..210de6791d2 100644
--- a/README.md
+++ b/README.md
@@ -223,21 +223,21 @@ Examples:
# Execute latest released openapi-generator-cli
openapi-generator-cli version
-# Execute version 3.1.0 for the current invocation, regardless of the latest released version
-OPENAPI_GENERATOR_VERSION=3.1.0 openapi-generator-cli version
+# Execute version 4.1.0 for the current invocation, regardless of the latest released version
+OPENAPI_GENERATOR_VERSION=4.1.0 openapi-generator-cli version
-# Execute version 3.1.0-SNAPSHOT for the current invocation
-OPENAPI_GENERATOR_VERSION=3.1.0-SNAPSHOT openapi-generator-cli version
+# Execute version 4.1.0-SNAPSHOT for the current invocation
+OPENAPI_GENERATOR_VERSION=4.1.0-SNAPSHOT openapi-generator-cli version
-# Execute version 3.0.2 for every invocation in the current shell session
-export OPENAPI_GENERATOR_VERSION=3.0.2
-openapi-generator-cli version # is 3.0.2
-openapi-generator-cli version # is also 3.0.2
+# Execute version 4.0.2 for every invocation in the current shell session
+export OPENAPI_GENERATOR_VERSION=4.0.2
+openapi-generator-cli version # is 4.0.2
+openapi-generator-cli version # is also 4.0.2
# To "install" a specific version, set the variable in .bashrc/.bash_profile
-echo "export OPENAPI_GENERATOR_VERSION=3.0.2" >> ~/.bashrc
+echo "export OPENAPI_GENERATOR_VERSION=4.0.2" >> ~/.bashrc
source ~/.bashrc
-openapi-generator-cli version # is always 3.0.2, unless any of the above overrides are done ad hoc
+openapi-generator-cli version # is always 4.0.2, unless any of the above overrides are done ad hoc
```
### [1.4 - Build Projects](#table-of-contents)
@@ -844,6 +844,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- 2021-10-02 - [How to Write Fewer Lines of Code with the OpenAPI Generator](https://hackernoon.com/how-to-write-fewer-lines-of-code-with-the-openapi-generator) by [Mikhail Alfa](https://hackernoon.com/u/alphamikle)
- 2021-10-12 - [OpenAPI Generator : 4000 étoiles sur GitHub et des spaghettis](https://www.youtube.com/watch?v=9hEsNBSqTFk) by [Jérémie Bresson](https://github.com/jmini) at [Devoxx FR 2021](https://cfp.devoxx.fr/2021/speaker/jeremie_bresson)
- 2021-10-17 - [Generate a TypeScript HTTP Client From An OpenAPI Spec In DotNET 5](https://richardwillis.info/blog/generate-a-type-script-http-client-from-an-open-api-spec-in-dot-net-5) by [Richard Willis](https://github.com/badsyntax)
+- 2021-11-06 - [スタートアップの開発で意識したこと](https://zenn.dev/woo_noo/articles/5cb09f8e2899ae782ad1) by [woo-noo](https://zenn.dev/woo_noo)
+- 2021-11-09 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/effective-software-development-using-openapi-generator) by Ajil Oomme
## [6 - About Us](#table-of-contents)
@@ -1060,7 +1062,7 @@ If you want to join the committee, please kindly apply by sending an email to te
| GraphQL | @renepardon (2018/12) |
| Groovy | |
| Haskell | |
-| Java | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @nmuesch (2021/01) |
+| Java | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) |
| JMeter | @kannkyo (2021/01) |
| Kotlin | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) |
| Lua | @daurnimator (2017/08) |
diff --git a/bin/configs/swift5-frozenEnums.yaml b/bin/configs/swift5-frozenEnums.yaml
new file mode 100644
index 00000000000..64dc04a4f81
--- /dev/null
+++ b/bin/configs/swift5-frozenEnums.yaml
@@ -0,0 +1,12 @@
+generatorName: swift5
+outputDir: samples/client/petstore/swift5/frozenEnums
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift5
+generateAliasAsModel: true
+additionalProperties:
+ podAuthors: ""
+ podSummary: PetstoreClient
+ sortParamsByRequiredFlag: false
+ generateFrozenEnums: false
+ projectName: PetstoreClient
+ podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/typescript-angular-v13-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v13-provided-in-root-with-npm.yaml
new file mode 100644
index 00000000000..22284f92f6c
--- /dev/null
+++ b/bin/configs/typescript-angular-v13-provided-in-root-with-npm.yaml
@@ -0,0 +1,11 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+ ngVersion: 13.0.1
+ npmVersion: 1.0.0
+ npmName: '@openapitools/typescript-angular-petstore'
+ npmRepository: https://skimdb.npmjs.com/registry
+ snapshot: false
+ supportsES6: true
diff --git a/bin/configs/typescript-angular-v13-provided-in-root.yaml b/bin/configs/typescript-angular-v13-provided-in-root.yaml
new file mode 100644
index 00000000000..bf16e022ded
--- /dev/null
+++ b/bin/configs/typescript-angular-v13-provided-in-root.yaml
@@ -0,0 +1,7 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+ ngVersion: 13.0.1
+ supportsES6: true
diff --git a/docs/generators.md b/docs/generators.md
index ed80e860e49..8d8433cd23f 100644
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -86,6 +86,7 @@ The following generators are available:
* [cpp-qt-qhttpengine-server](generators/cpp-qt-qhttpengine-server.md)
* [cpp-restbed-server](generators/cpp-restbed-server.md)
* [csharp-nancyfx](generators/csharp-nancyfx.md)
+* [csharp-netcore-functions](generators/csharp-netcore-functions.md)
* [erlang-server](generators/erlang-server.md)
* [fsharp-functions (beta)](generators/fsharp-functions.md)
* [fsharp-giraffe-server (beta)](generators/fsharp-giraffe-server.md)
diff --git a/docs/generators/csharp-netcore-functions.md b/docs/generators/csharp-netcore-functions.md
new file mode 100644
index 00000000000..50ec49b34a1
--- /dev/null
+++ b/docs/generators/csharp-netcore-functions.md
@@ -0,0 +1,300 @@
+---
+title: Config Options for csharp-netcore-functions
+sidebar_label: csharp-netcore-functions
+---
+
+These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
+|conditionalSerialization|Serialize only those properties which are initialized by user, accepted values are true or false, default value is false.| |false|
+|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
+|library|HTTP library template (sub-template) to use|
**httpclient**
HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. May subject to breaking changes without further notice.)
|restsharp|
+|licenseId|The identifier of the license| |null|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
+|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
+|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.0 or newer.| |false|
+|optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
+|optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
+|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
+|optionalProjectFile|Generate {PackageName}.csproj.| |true|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
+|packageTags|Tags to identify the package| |null|
+|packageVersion|C# package version.| |1.0.0|
+|releaseNote|Release note, default to 'Minor update'.| |Minor update|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.0`|
**netstandard1.3**
.NET Standard 1.3 compatible
**netstandard1.4**
.NET Standard 1.4 compatible
**netstandard1.5**
.NET Standard 1.5 compatible
**netstandard1.6**
.NET Standard 1.6 compatible
**netstandard2.0**
.NET Standard 2.0 compatible
**netstandard2.1**
.NET Standard 2.1 compatible
**netcoreapp2.0**
.NET Core 2.0 compatible
**netcoreapp2.1**
.NET Core 2.1 compatible
**netcoreapp3.0**
.NET Core 3.0 compatible
**netcoreapp3.1**
.NET Core 3.1 compatible
**net47**
.NET Framework 4.7 compatible
**net5.0**
.NET 5.0 compatible
|netstandard2.0|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
+|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
+|validatable|Generates self-validatable models.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+
+
Boolean
+
Collection
+
DateTime
+
DateTime?
+
DateTimeOffset
+
DateTimeOffset?
+
Decimal
+
Dictionary
+
Double
+
Float
+
Guid
+
Guid?
+
ICollection
+
Int32
+
Int64
+
List
+
Object
+
String
+
System.IO.Stream
+
bool
+
bool?
+
byte[]
+
decimal
+
decimal?
+
double
+
double?
+
float
+
float?
+
int
+
int?
+
long
+
long?
+
string
+
+
+## RESERVED WORDS
+
+
+
Client
+
Configuration
+
Version
+
abstract
+
as
+
base
+
bool
+
break
+
byte
+
case
+
catch
+
char
+
checked
+
class
+
client
+
const
+
continue
+
decimal
+
default
+
delegate
+
do
+
double
+
else
+
enum
+
event
+
explicit
+
extern
+
false
+
finally
+
fixed
+
float
+
for
+
foreach
+
goto
+
if
+
implicit
+
in
+
int
+
interface
+
internal
+
is
+
localVarFileParams
+
localVarFormParams
+
localVarHeaderParams
+
localVarHttpContentType
+
localVarHttpContentTypes
+
localVarHttpHeaderAccept
+
localVarHttpHeaderAccepts
+
localVarPath
+
localVarPathParams
+
localVarPostBody
+
localVarQueryParams
+
localVarResponse
+
localVarStatusCode
+
lock
+
long
+
namespace
+
new
+
null
+
object
+
operator
+
out
+
override
+
parameter
+
params
+
private
+
protected
+
public
+
readonly
+
ref
+
return
+
sbyte
+
sealed
+
short
+
sizeof
+
stackalloc
+
static
+
string
+
struct
+
switch
+
this
+
throw
+
true
+
try
+
typeof
+
uint
+
ulong
+
unchecked
+
unsafe
+
ushort
+
using
+
virtual
+
void
+
volatile
+
while
+
+
+## FEATURE SET
+
+
+### Client Modification Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasePath|✓|ToolingExtension
+|Authorizations|✗|ToolingExtension
+|UserAgent|✓|ToolingExtension
+|MockServer|✗|ToolingExtension
+
+### Data Type Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Custom|✗|OAS2,OAS3
+|Int32|✓|OAS2,OAS3
+|Int64|✓|OAS2,OAS3
+|Float|✓|OAS2,OAS3
+|Double|✓|OAS2,OAS3
+|Decimal|✓|ToolingExtension
+|String|✓|OAS2,OAS3
+|Byte|✓|OAS2,OAS3
+|Binary|✓|OAS2,OAS3
+|Boolean|✓|OAS2,OAS3
+|Date|✓|OAS2,OAS3
+|DateTime|✓|OAS2,OAS3
+|Password|✓|OAS2,OAS3
+|File|✓|OAS2
+|Array|✓|OAS2,OAS3
+|Maps|✓|ToolingExtension
+|CollectionFormat|✓|OAS2
+|CollectionFormatMulti|✓|OAS2
+|Enum|✓|OAS2,OAS3
+|ArrayOfEnum|✓|ToolingExtension
+|ArrayOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
+|ArrayOfCollectionOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfEnum|✓|ToolingExtension
+|MapOfEnum|✓|ToolingExtension
+|MapOfModel|✓|ToolingExtension
+|MapOfCollectionOfPrimitives|✓|ToolingExtension
+|MapOfCollectionOfModel|✓|ToolingExtension
+|MapOfCollectionOfEnum|✓|ToolingExtension
+
+### Documentation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Readme|✓|ToolingExtension
+|Model|✓|ToolingExtension
+|Api|✓|ToolingExtension
+
+### Global Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Host|✓|OAS2,OAS3
+|BasePath|✓|OAS2,OAS3
+|Info|✓|OAS2,OAS3
+|Schemes|✗|OAS2,OAS3
+|PartialSchemes|✓|OAS2,OAS3
+|Consumes|✓|OAS2
+|Produces|✓|OAS2
+|ExternalDocumentation|✓|OAS2,OAS3
+|Examples|✓|OAS2,OAS3
+|XMLStructureDefinitions|✗|OAS2,OAS3
+|MultiServer|✗|OAS3
+|ParameterizedServer|✗|OAS3
+|ParameterStyling|✗|OAS3
+|Callbacks|✗|OAS3
+|LinkObjects|✗|OAS3
+
+### Parameter Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Path|✓|OAS2,OAS3
+|Query|✓|OAS2,OAS3
+|Header|✓|OAS2,OAS3
+|Body|✓|OAS2
+|FormUnencoded|✓|OAS2
+|FormMultipart|✓|OAS2
+|Cookie|✓|OAS3
+
+### Schema Support Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Simple|✓|OAS2,OAS3
+|Composite|✓|OAS2,OAS3
+|Polymorphism|✓|OAS2,OAS3
+|Union|✗|OAS3
+
+### Security Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasicAuth|✓|OAS2,OAS3
+|ApiKey|✓|OAS2,OAS3
+|OpenIDConnect|✗|OAS3
+|BearerToken|✗|OAS3
+|OAuth2_Implicit|✓|OAS2,OAS3
+|OAuth2_Password|✗|OAS2,OAS3
+|OAuth2_ClientCredentials|✗|OAS2,OAS3
+|OAuth2_AuthorizationCode|✗|OAS2,OAS3
+
+### Wire Format Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|JSON|✓|OAS2,OAS3
+|XML|✓|OAS2,OAS3
+|PROTOBUF|✗|ToolingExtension
+|Custom|✗|OAS2,OAS3
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index e74a239be25..9404a2fd458 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -11,6 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|apiNamePrefix|Prefix that will be appended to all API names ('tags'). Default: empty string. e.g. Pet => Pet.| |null|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|generateFrozenEnums|Generate frozen enums (default: true)| |true|
|generateModelAdditionalProperties|Generate model additional properties (default: true)| |true|
|hashableModels|Make hashable models (default: true)| |true|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index ab8b3da35fc..2083b09cadf 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -19,7 +19,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|modelFileSuffix|The suffix of the file of the generated model (model<suffix>.ts).| |null|
|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
|modelSuffix|The suffix of the generated model.| |null|
-|ngVersion|The version of Angular. (At least 6.0.0)| |12.2.12|
+|ngVersion|The version of Angular. (At least 6.0.0)| |13.0.1|
|npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
|npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
|npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
index ef348bbb266..83413a9ee11 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -29,7 +29,8 @@ public class CodegenOperation {
isArray, isMultipart,
isResponseBinary = false, isResponseFile = false, hasReference = false,
isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
- isRestful, isDeprecated, isCallbackRequest, uniqueItems, hasDefaultResponse = false;
+ isRestful, isDeprecated, isCallbackRequest, uniqueItems, hasDefaultResponse = false,
+ hasErrorResponseObject; // if 4xx, 5xx repsonses have at least one error object defined
public String path, operationId, returnType, returnFormat, httpMethod, returnBaseType,
returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse;
public CodegenDiscriminator discriminator;
@@ -297,6 +298,7 @@ public class CodegenOperation {
sb.append(", isResponseFile=").append(isResponseFile);
sb.append(", hasReference=").append(hasReference);
sb.append(", hasDefaultResponse=").append(hasDefaultResponse);
+ sb.append(", hasErrorResponseObject=").append(hasErrorResponseObject);
sb.append(", isRestfulIndex=").append(isRestfulIndex);
sb.append(", isRestfulShow=").append(isRestfulShow);
sb.append(", isRestfulCreate=").append(isRestfulCreate);
@@ -371,6 +373,7 @@ public class CodegenOperation {
isResponseFile == that.isResponseFile &&
hasReference == that.hasReference &&
hasDefaultResponse == that.hasDefaultResponse &&
+ hasErrorResponseObject == that.hasErrorResponseObject &&
isRestfulIndex == that.isRestfulIndex &&
isRestfulShow == that.isRestfulShow &&
isRestfulCreate == that.isRestfulCreate &&
@@ -435,6 +438,7 @@ public class CodegenOperation {
produces, prioritizedContentTypes, servers, bodyParam, allParams, bodyParams, pathParams, queryParams,
headerParams, formParams, cookieParams, requiredParams, optionalParams, authMethods, tags,
responses, callbacks, imports, examples, requestBodyExamples, externalDocs, vendorExtensions,
- nickname, operationIdOriginal, operationIdLowerCase, operationIdCamelCase, operationIdSnakeCase);
+ nickname, operationIdOriginal, operationIdLowerCase, operationIdCamelCase, operationIdSnakeCase,
+ hasErrorResponseObject);
}
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 046d8609d3c..e97a6caf557 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -570,14 +570,7 @@ public class DefaultCodegen implements CodegenConfig {
List> models = (List>) inner.get("models");
for (Map mo : models) {
CodegenModel cm = (CodegenModel) mo.get("model");
- for (CodegenProperty cp : cm.allVars) {
- // detect self import
- if (cp.dataType.equalsIgnoreCase(cm.classname) ||
- (cp.isContainer && cp.items != null && cp.items.dataType.equalsIgnoreCase(cm.classname))) {
- cm.imports.remove(cm.classname); // remove self import
- cp.isSelfReference = true;
- }
- }
+ removeSelfReferenceImports(cm);
}
}
setCircularReferences(allModels);
@@ -585,6 +578,23 @@ public class DefaultCodegen implements CodegenConfig {
return objs;
}
+ /**
+ * Removes imports from the model that points to itself
+ * Marks a self referencing property, if detected
+ *
+ * @param model Self imports will be removed from this model.imports collection
+ */
+ protected void removeSelfReferenceImports(CodegenModel model) {
+ for (CodegenProperty cp : model.allVars) {
+ // detect self import
+ if (cp.dataType.equalsIgnoreCase(model.classname) ||
+ (cp.isContainer && cp.items != null && cp.items.dataType.equalsIgnoreCase(model.classname))) {
+ model.imports.remove(model.classname); // remove self import
+ cp.isSelfReference = true;
+ }
+ }
+ }
+
public void setCircularReferences(Map models) {
final Map> dependencyMap = models.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry -> getModelDependencies(entry.getValue())));
@@ -3966,6 +3976,12 @@ public class DefaultCodegen implements CodegenConfig {
if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.is2xx) && Boolean.FALSE.equals(op.isResponseFile)) {
op.isResponseFile = Boolean.TRUE;
}
+
+ // check if any 4xx or 5xx reponse has an error response object defined
+ if ((Boolean.TRUE.equals(r.is4xx) || Boolean.TRUE.equals(r.is5xx)) &&
+ Boolean.FALSE.equals(r.primitiveType) && Boolean.FALSE.equals(r.simpleType)) {
+ op.hasErrorResponseObject = Boolean.TRUE;
+ }
}
op.responses.sort((a, b) -> {
int aScore = a.isWildcard() ? 2 : a.isRange() ? 1 : 0;
@@ -4259,6 +4275,7 @@ public class DefaultCodegen implements CodegenConfig {
r.setComposedSchemas(getComposedSchemas(responseSchema));
if (ModelUtils.isArraySchema(responseSchema)) {
r.simpleType = false;
+ r.isArray = true;
r.containerType = cp.containerType;
ArraySchema as = (ArraySchema) responseSchema;
CodegenProperty items = fromProperty("response", getSchemaItems(as));
@@ -4314,6 +4331,8 @@ public class DefaultCodegen implements CodegenConfig {
} else if (ModelUtils.isTypeObjectSchema(responseSchema)) {
if (ModelUtils.isFreeFormObject(openAPI, responseSchema)) {
r.isFreeFormObject = true;
+ } else {
+ r.isModel = true;
}
r.simpleType = false;
r.containerType = cp.containerType;
@@ -4325,9 +4344,6 @@ public class DefaultCodegen implements CodegenConfig {
LOGGER.debug("Property type is not primitive: {}", cp.dataType);
}
- if (!r.isMap && !r.isArray) {
- r.simpleType = true;
- }
r.primitiveType = (r.baseType == null || languageSpecificPrimitives().contains(r.baseType));
if (r.baseType == null) {
@@ -4774,12 +4790,12 @@ public class DefaultCodegen implements CodegenConfig {
final CodegenSecurity cs = defaultCodegenSecurity(key, securityScheme);
cs.isKeyInHeader = cs.isKeyInQuery = cs.isKeyInCookie = cs.isApiKey = cs.isOAuth = false;
cs.isBasic = true;
- if ("basic".equals(securityScheme.getScheme())) {
+ if ("basic".equalsIgnoreCase(securityScheme.getScheme())) {
cs.isBasicBasic = true;
- } else if ("bearer".equals(securityScheme.getScheme())) {
+ } else if ("bearer".equalsIgnoreCase(securityScheme.getScheme())) {
cs.isBasicBearer = true;
cs.bearerFormat = securityScheme.getBearerFormat();
- } else if ("signature".equals(securityScheme.getScheme())) {
+ } else if ("signature".equalsIgnoreCase(securityScheme.getScheme())) {
// HTTP signature as defined in https://datatracker.ietf.org/doc/draft-cavage-http-signatures/
// The registry of security schemes is maintained by IANA.
// https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml
@@ -5168,17 +5184,7 @@ public class DefaultCodegen implements CodegenConfig {
cm.hasOnlyReadOnly = false;
}
- // TODO revise the logic to include map
- if (cp.isContainer) {
- addImport(cm, typeMapping.get("array"));
- }
-
- addImport(cm, cp.baseType);
- CodegenProperty innerCp = cp;
- while (innerCp != null) {
- addImport(cm, innerCp.complexType);
- innerCp = innerCp.items;
- }
+ addImportsForPropertyType(cm, cp);
// if required, add to the list "requiredVars"
if (Boolean.TRUE.equals(cp.required)) {
@@ -5199,6 +5205,28 @@ public class DefaultCodegen implements CodegenConfig {
return;
}
+ /**
+ * For a given property, adds all needed imports to the model
+ * This includes a flat property type (e.g. property type: ReferencedModel)
+ * as well as container type (property type: array of ReferencedModel's)
+ *
+ * @param model The codegen representation of the OAS schema.
+ * @param property The codegen representation of the OAS schema's property.
+ */
+ protected void addImportsForPropertyType(CodegenModel model, CodegenProperty property) {
+ // TODO revise the logic to include map
+ if (property.isContainer) {
+ addImport(model, typeMapping.get("array"));
+ }
+
+ addImport(model, property.baseType);
+ CodegenProperty innerCp = property;
+ while (innerCp != null) {
+ addImport(model, innerCp.complexType);
+ innerCp = innerCp.items;
+ }
+ }
+
/**
* Determine all of the types in the model definitions (schemas) that are aliases of
* simple types.
@@ -6558,6 +6586,10 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.pattern = toRegularExpression(schema.getPattern());
}
+ protected String toMediaTypeSchemaName(String contentType) {
+ return toModelName(contentType + "Schema");
+ }
+
protected LinkedHashMap getContent(Content content, Set imports) {
if (content == null) {
return null;
@@ -6605,9 +6637,9 @@ public class DefaultCodegen implements CodegenConfig {
ceMap.put(propName, ce);
}
}
- CodegenProperty schemaProp = fromProperty("schema", mt.getSchema());
- CodegenMediaType codegenMt = new CodegenMediaType(schemaProp, ceMap);
String contentType = contentEntry.getKey();
+ CodegenProperty schemaProp = fromProperty(toMediaTypeSchemaName(contentType), mt.getSchema());
+ CodegenMediaType codegenMt = new CodegenMediaType(schemaProp, ceMap);
cmtContent.put(contentType, codegenMt);
}
return cmtContent;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 86af0181b3d..75e466165a5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -505,7 +505,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
super.postProcessModelProperty(model, property);
if (!model.isEnum && property.isEnum) {
// These are inner enums, enums which do not exist as models, just as properties.
- // They are handled via the enum_inline template and and are generated in the
+ // They are handled via the enum_inline template and are generated in the
// same file as the containing class. To prevent name clashes the inline enum classes
// are prefix with the classname of the containing class in the template.
// Here the datatypeWithEnum template variable gets updated to match that scheme.
@@ -529,9 +529,9 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, List servers) {
final CodegenOperation op = super.fromOperation(path, httpMethod, operation, servers);
for (CodegenResponse r : op.responses) {
- // By default only set types are automatically added to operation imports, not sure why.
+ // By default, only set types are automatically added to operation imports, not sure why.
// Add all container type imports here, by default 'dart:core' imports are skipped
- // but other sub classes may required specific container type imports.
+ // but other sub-classes may require specific container type imports.
if (r.containerType != null && typeMapping().containsKey(r.containerType)) {
final String value = typeMapping().get(r.containerType);
if (needToImport(value)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
new file mode 100644
index 00000000000..8f189b444ba
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
@@ -0,0 +1,1151 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.languages;
+
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.openapitools.codegen.*;
+import org.openapitools.codegen.meta.features.*;
+import org.openapitools.codegen.utils.ModelUtils;
+import org.openapitools.codegen.utils.ProcessUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+import static org.openapitools.codegen.utils.StringUtils.underscore;
+
+@SuppressWarnings("Duplicates")
+public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
+ // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
+ protected static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
+ protected static final String SUPPORTS_UWP = "supportsUWP";
+ protected static final String SUPPORTS_RETRY = "supportsRetry";
+
+ protected static final String NET_STANDARD = "netStandard";
+
+ // HTTP libraries
+ protected static final String RESTSHARP = "restsharp";
+ protected static final String HTTPCLIENT = "httpclient";
+
+ // Project Variable, determined from target framework. Not intended to be user-settable.
+ protected static final String TARGET_FRAMEWORK_IDENTIFIER = "targetFrameworkIdentifier";
+ // Project Variable, determined from target framework. Not intended to be user-settable.
+ protected static final String TARGET_FRAMEWORK_VERSION = "targetFrameworkVersion";
+
+ @SuppressWarnings("hiding")
+ private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
+ private static final List frameworkStrategies = Arrays.asList(
+ FrameworkStrategy.NETSTANDARD_1_3,
+ FrameworkStrategy.NETSTANDARD_1_4,
+ FrameworkStrategy.NETSTANDARD_1_5,
+ FrameworkStrategy.NETSTANDARD_1_6,
+ FrameworkStrategy.NETSTANDARD_2_0,
+ FrameworkStrategy.NETSTANDARD_2_1,
+ FrameworkStrategy.NETCOREAPP_2_0,
+ FrameworkStrategy.NETCOREAPP_2_1,
+ FrameworkStrategy.NETCOREAPP_3_0,
+ FrameworkStrategy.NETCOREAPP_3_1,
+ FrameworkStrategy.NETFRAMEWORK_4_7,
+ FrameworkStrategy.NET_5_0
+ );
+ private static FrameworkStrategy defaultFramework = FrameworkStrategy.NETSTANDARD_2_0;
+ protected final Map frameworks;
+ protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
+ protected String clientPackage = "Org.OpenAPITools.Client";
+ protected String apiDocPath = "docs/";
+ protected String modelDocPath = "docs/";
+
+ // Defines TargetFrameworkVersion in csproj files
+ protected String targetFramework = defaultFramework.name;
+ protected String testTargetFramework = defaultFramework.testTargetFramework;
+
+ // Defines nuget identifiers for target framework
+ protected String targetFrameworkNuget = targetFramework;
+
+ protected boolean supportsRetry = Boolean.TRUE;
+ protected boolean supportsAsync = Boolean.TRUE;
+ protected boolean netStandard = Boolean.FALSE;
+
+ protected boolean validatable = Boolean.TRUE;
+ protected Map regexModifiers;
+ // By default, generated code is considered public
+ protected boolean nonPublicApi = Boolean.FALSE;
+
+ protected boolean caseInsensitiveResponseHeaders = Boolean.FALSE;
+ protected String releaseNote = "Minor update";
+ protected String licenseId;
+ protected String packageTags;
+ protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup
+
+ protected boolean needsCustomHttpMethod = false;
+ protected boolean needsUriBuilder = false;
+
+ public CSharpNetCoreReducedClientCodegen() {
+ super();
+
+ modifyFeatureSet(features -> features
+ .includeDocumentationFeatures(DocumentationFeature.Readme)
+ .securityFeatures(EnumSet.of(
+ SecurityFeature.OAuth2_Implicit,
+ SecurityFeature.BasicAuth,
+ SecurityFeature.ApiKey
+ ))
+ .excludeGlobalFeatures(
+ GlobalFeature.XMLStructureDefinitions,
+ GlobalFeature.Callbacks,
+ GlobalFeature.LinkObjects,
+ GlobalFeature.ParameterStyling
+ )
+ .includeSchemaSupportFeatures(
+ SchemaSupportFeature.Polymorphism
+ )
+ .includeParameterFeatures(
+ ParameterFeature.Cookie
+ )
+ .includeClientModificationFeatures(
+ ClientModificationFeature.BasePath,
+ ClientModificationFeature.UserAgent
+ )
+ );
+
+ // mapped non-nullable type without ?
+ typeMapping = new HashMap();
+ typeMapping.put("string", "string");
+ typeMapping.put("binary", "byte[]");
+ typeMapping.put("ByteArray", "byte[]");
+ typeMapping.put("boolean", "bool");
+ typeMapping.put("integer", "int");
+ typeMapping.put("float", "float");
+ typeMapping.put("long", "long");
+ typeMapping.put("double", "double");
+ typeMapping.put("number", "decimal");
+ typeMapping.put("decimal", "decimal");
+ typeMapping.put("DateTime", "DateTime");
+ typeMapping.put("date", "DateTime");
+ typeMapping.put("file", "System.IO.Stream");
+ typeMapping.put("array", "List");
+ typeMapping.put("list", "List");
+ typeMapping.put("map", "Dictionary");
+ typeMapping.put("object", "Object");
+ typeMapping.put("UUID", "Guid");
+ typeMapping.put("URI", "string");
+ typeMapping.put("AnyType", "Object");
+
+ setSupportNullable(Boolean.TRUE);
+ hideGenerationTimestamp = Boolean.TRUE;
+ supportsInheritance = true;
+ modelTemplateFiles.put("model.mustache", ".cs");
+ apiTemplateFiles.put("api.mustache", ".cs");
+ modelDocTemplateFiles.put("model_doc.mustache", ".md");
+ apiDocTemplateFiles.put("api_doc.mustache", ".md");
+ embeddedTemplateDir = templateDir = "csharp-netcore";
+
+ cliOptions.clear();
+
+ // CLI options
+ addOption(CodegenConstants.PACKAGE_NAME,
+ "C# package name (convention: Title.Case).",
+ this.packageName);
+
+ addOption(CodegenConstants.PACKAGE_VERSION,
+ "C# package version.",
+ this.packageVersion);
+
+ addOption(CodegenConstants.SOURCE_FOLDER,
+ CodegenConstants.SOURCE_FOLDER_DESC,
+ sourceFolder);
+
+ addOption(CodegenConstants.OPTIONAL_PROJECT_GUID,
+ CodegenConstants.OPTIONAL_PROJECT_GUID_DESC,
+ null);
+
+ addOption(CodegenConstants.INTERFACE_PREFIX,
+ CodegenConstants.INTERFACE_PREFIX_DESC,
+ interfacePrefix);
+
+ addOption(CodegenConstants.LICENSE_ID,
+ CodegenConstants.LICENSE_ID_DESC,
+ this.licenseId);
+
+ addOption(CodegenConstants.RELEASE_NOTE,
+ CodegenConstants.RELEASE_NOTE_DESC,
+ this.releaseNote);
+
+ addOption(CodegenConstants.PACKAGE_TAGS,
+ CodegenConstants.PACKAGE_TAGS_DESC,
+ this.packageTags);
+
+ CliOption framework = new CliOption(
+ CodegenConstants.DOTNET_FRAMEWORK,
+ CodegenConstants.DOTNET_FRAMEWORK_DESC
+ );
+
+ CliOption disallowAdditionalPropertiesIfNotPresentOpt = CliOption.newBoolean(
+ CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT,
+ CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC).defaultValue(Boolean.TRUE.toString());
+ Map disallowAdditionalPropertiesIfNotPresentOpts = new HashMap<>();
+ disallowAdditionalPropertiesIfNotPresentOpts.put("false",
+ "The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.");
+ disallowAdditionalPropertiesIfNotPresentOpts.put("true",
+ "Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.");
+ disallowAdditionalPropertiesIfNotPresentOpt.setEnum(disallowAdditionalPropertiesIfNotPresentOpts);
+ cliOptions.add(disallowAdditionalPropertiesIfNotPresentOpt);
+ this.setDisallowAdditionalPropertiesIfNotPresent(true);
+
+ ImmutableMap.Builder frameworkBuilder = new ImmutableMap.Builder<>();
+ for (FrameworkStrategy frameworkStrategy : frameworkStrategies) {
+ frameworkBuilder.put(frameworkStrategy.name, frameworkStrategy.description);
+ }
+
+ frameworks = frameworkBuilder.build();
+
+ framework.defaultValue(this.targetFramework);
+ framework.setEnum(frameworks);
+ cliOptions.add(framework);
+
+ CliOption modelPropertyNaming = new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC);
+ cliOptions.add(modelPropertyNaming.defaultValue("PascalCase"));
+
+ // CLI Switches
+ addSwitch(CodegenConstants.NULLABLE_REFERENCE_TYPES,
+ CodegenConstants.NULLABLE_REFERENCE_TYPES_DESC,
+ this.nullReferenceTypesFlag);
+
+ addSwitch(CodegenConstants.HIDE_GENERATION_TIMESTAMP,
+ CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC,
+ this.hideGenerationTimestamp);
+
+ addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
+ CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC,
+ this.sortParamsByRequiredFlag);
+
+ addSwitch(CodegenConstants.USE_DATETIME_OFFSET,
+ CodegenConstants.USE_DATETIME_OFFSET_DESC,
+ this.useDateTimeOffsetFlag);
+
+ addSwitch(CodegenConstants.USE_COLLECTION,
+ CodegenConstants.USE_COLLECTION_DESC,
+ this.useCollection);
+
+ addSwitch(CodegenConstants.RETURN_ICOLLECTION,
+ CodegenConstants.RETURN_ICOLLECTION_DESC,
+ this.returnICollection);
+
+ addSwitch(CodegenConstants.OPTIONAL_METHOD_ARGUMENT,
+ "C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).",
+ this.optionalMethodArgumentFlag);
+
+ addSwitch(CodegenConstants.OPTIONAL_ASSEMBLY_INFO,
+ CodegenConstants.OPTIONAL_ASSEMBLY_INFO_DESC,
+ this.optionalAssemblyInfoFlag);
+
+ addSwitch(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES,
+ CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES_DESC,
+ this.optionalEmitDefaultValuesFlag);
+
+ addSwitch(CodegenConstants.OPTIONAL_CONDITIONAL_SERIALIZATION,
+ CodegenConstants.OPTIONAL_CONDITIONAL_SERIALIZATION_DESC,
+ this.conditionalSerialization);
+
+ addSwitch(CodegenConstants.OPTIONAL_PROJECT_FILE,
+ CodegenConstants.OPTIONAL_PROJECT_FILE_DESC,
+ this.optionalProjectFileFlag);
+
+ // NOTE: This will reduce visibility of all public members in templates. Users can use InternalsVisibleTo
+ // https://msdn.microsoft.com/en-us/library/system.runtime.compilerservices.internalsvisibletoattribute(v=vs.110).aspx
+ // to expose to shared code if the generated code is not embedded into another project. Otherwise, users of codegen
+ // should rely on default public visibility.
+ addSwitch(CodegenConstants.NON_PUBLIC_API,
+ CodegenConstants.NON_PUBLIC_API_DESC,
+ this.nonPublicApi);
+
+ addSwitch(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS,
+ CodegenConstants.ALLOW_UNICODE_IDENTIFIERS_DESC,
+ this.allowUnicodeIdentifiers);
+
+ addSwitch(CodegenConstants.NETCORE_PROJECT_FILE,
+ CodegenConstants.NETCORE_PROJECT_FILE_DESC,
+ this.netCoreProjectFileFlag);
+
+ addSwitch(CodegenConstants.VALIDATABLE,
+ CodegenConstants.VALIDATABLE_DESC,
+ this.validatable);
+
+ addSwitch(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP,
+ CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC,
+ this.caseInsensitiveResponseHeaders);
+
+ addSwitch(CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS,
+ CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS_DESC,
+ this.caseInsensitiveResponseHeaders);
+
+ regexModifiers = new HashMap<>();
+ regexModifiers.put('i', "IgnoreCase");
+ regexModifiers.put('m', "Multiline");
+ regexModifiers.put('s', "Singleline");
+ regexModifiers.put('x', "IgnorePatternWhitespace");
+
+ supportedLibraries.put(HTTPCLIENT, "HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) "
+ + "(Experimental. May subject to breaking changes without further notice.)");
+ supportedLibraries.put(RESTSHARP, "RestSharp (https://github.com/restsharp/RestSharp)");
+
+ CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "HTTP library template (sub-template) to use");
+ libraryOption.setEnum(supportedLibraries);
+ // set RESTSHARP as the default
+ libraryOption.setDefault(RESTSHARP);
+ cliOptions.add(libraryOption);
+ setLibrary(RESTSHARP);
+ }
+
+ @Override
+ public String apiDocFileFolder() {
+ return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+ }
+
+ @Override
+ public String apiTestFileFolder() {
+ return outputFolder + File.separator + testFolder + File.separator + testPackageName() + File.separator + apiPackage();
+ }
+
+ @Override
+ public CodegenModel fromModel(String name, Schema model) {
+ Map allDefinitions = ModelUtils.getSchemas(this.openAPI);
+ CodegenModel codegenModel = super.fromModel(name, model);
+ if (allDefinitions != null && codegenModel != null && codegenModel.parent != null) {
+ final Schema parentModel = allDefinitions.get(toModelName(codegenModel.parent));
+ if (parentModel != null) {
+ final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
+ if (codegenModel.hasEnums) {
+ codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
+ }
+
+ Map propertyHash = new HashMap<>(codegenModel.vars.size());
+ for (final CodegenProperty property : codegenModel.vars) {
+ propertyHash.put(property.name, property);
+ }
+
+ for (final CodegenProperty property : codegenModel.readWriteVars) {
+ if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) {
+ property.defaultValue = "\"" + name + "\"";
+ }
+ }
+
+ CodegenProperty last = null;
+ for (final CodegenProperty property : parentCodegenModel.vars) {
+ // helper list of parentVars simplifies templating
+ if (!propertyHash.containsKey(property.name)) {
+ final CodegenProperty parentVar = property.clone();
+ parentVar.isInherited = true;
+ last = parentVar;
+ LOGGER.debug("adding parent variable {}", property.name);
+ codegenModel.parentVars.add(parentVar);
+ }
+ }
+ }
+ }
+
+ // Cleanup possible duplicates. Currently, readWriteVars can contain the same property twice. May or may not be isolated to C#.
+ if (codegenModel != null && codegenModel.readWriteVars != null && codegenModel.readWriteVars.size() > 1) {
+ int length = codegenModel.readWriteVars.size() - 1;
+ for (int i = length; i > (length / 2); i--) {
+ final CodegenProperty codegenProperty = codegenModel.readWriteVars.get(i);
+ // If the property at current index is found earlier in the list, remove this last instance.
+ if (codegenModel.readWriteVars.indexOf(codegenProperty) < i) {
+ codegenModel.readWriteVars.remove(i);
+ }
+ }
+ }
+
+ return codegenModel;
+ }
+
+ @Override
+ public String getHelp() {
+ return "Generates a C# client library (.NET Standard, .NET Core).";
+ }
+
+ public String getModelPropertyNaming() {
+ return this.modelPropertyNaming;
+ }
+
+ public void setModelPropertyNaming(String naming) {
+ if ("original".equals(naming) || "camelCase".equals(naming) ||
+ "PascalCase".equals(naming) || "snake_case".equals(naming)) {
+ this.modelPropertyNaming = naming;
+ } else {
+ throw new IllegalArgumentException("Invalid model property naming '" +
+ naming + "'. Must be 'original', 'camelCase', " +
+ "'PascalCase' or 'snake_case'");
+ }
+ }
+
+ @Override
+ public String getName() {
+ return "csharp-netcore";
+ }
+
+ public String getNameUsingModelPropertyNaming(String name) {
+ switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) {
+ case original:
+ return name;
+ case camelCase:
+ return camelize(name, true);
+ case PascalCase:
+ return camelize(name);
+ case snake_case:
+ return underscore(name);
+ default:
+ throw new IllegalArgumentException("Invalid model property naming '" +
+ name + "'. Must be 'original', 'camelCase', " +
+ "'PascalCase' or 'snake_case'");
+ }
+ }
+
+ @Override
+ public String getNullableType(Schema p, String type) {
+ if (languageSpecificPrimitives.contains(type)) {
+ if (isSupportNullable() && ModelUtils.isNullable(p) && nullableType.contains(type)) {
+ return type + "?";
+ } else {
+ return type;
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public CodegenType getTag() {
+ return CodegenType.CLIENT;
+ }
+
+ public boolean isNonPublicApi() {
+ return nonPublicApi;
+ }
+
+ public void setNonPublicApi(final boolean nonPublicApi) {
+ this.nonPublicApi = nonPublicApi;
+ }
+
+ @Override
+ public String modelDocFileFolder() {
+ return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+ }
+
+ @Override
+ public String modelTestFileFolder() {
+ return outputFolder + File.separator + testFolder + File.separator + testPackageName() + File.separator + modelPackage();
+ }
+
+ @Override
+ public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+ postProcessPattern(property.pattern, property.vendorExtensions);
+ postProcessEmitDefaultValue(property.vendorExtensions);
+
+ super.postProcessModelProperty(model, property);
+ }
+
+ @Override
+ public void postProcessParameter(CodegenParameter parameter) {
+ postProcessPattern(parameter.pattern, parameter.vendorExtensions);
+ postProcessEmitDefaultValue(parameter.vendorExtensions);
+ super.postProcessParameter(parameter);
+ }
+
+ /*
+ * The pattern spec follows the Perl convention and style of modifiers. .NET
+ * does not support this syntax directly so we need to convert the pattern to a .NET compatible
+ * format and apply modifiers in a compatible way.
+ * See https://msdn.microsoft.com/en-us/library/yd1hzczs(v=vs.110).aspx for .NET options.
+ */
+ public void postProcessPattern(String pattern, Map vendorExtensions) {
+ if (pattern != null) {
+ int i = pattern.lastIndexOf('/');
+
+ //Must follow Perl /pattern/modifiers convention
+ if (pattern.charAt(0) != '/' || i < 2) {
+ throw new IllegalArgumentException("Pattern must follow the Perl "
+ + "/pattern/modifiers convention. " + pattern + " is not valid.");
+ }
+
+ String regex = pattern.substring(1, i).replace("'", "\'").replace("\"", "\"\"");
+ List modifiers = new ArrayList();
+
+ // perl requires an explicit modifier to be culture specific and .NET is the reverse.
+ modifiers.add("CultureInvariant");
+
+ for (char c : pattern.substring(i).toCharArray()) {
+ if (regexModifiers.containsKey(c)) {
+ String modifier = regexModifiers.get(c);
+ modifiers.add(modifier);
+ } else if (c == 'l') {
+ modifiers.remove("CultureInvariant");
+ }
+ }
+
+ vendorExtensions.put("x-regex", regex);
+ vendorExtensions.put("x-modifiers", modifiers);
+ }
+ }
+
+ public void postProcessEmitDefaultValue(Map vendorExtensions) {
+ vendorExtensions.put("x-emit-default-value", optionalEmitDefaultValuesFlag);
+ }
+
+ @Override
+ public Mustache.Compiler processCompiler(Mustache.Compiler compiler) {
+ // To avoid unexpected behaviors when options are passed programmatically such as { "supportsAsync": "" }
+ return super.processCompiler(compiler).emptyStringIsFalse(true);
+ }
+
+ @Override
+ public void processOpts() {
+ this.setLegacyDiscriminatorBehavior(false);
+
+ super.processOpts();
+
+ /*
+ * NOTE: When supporting boolean additionalProperties, you should read the value and write it back as a boolean.
+ * This avoids oddities where additionalProperties contains "false" rather than false, which will cause the
+ * templating engine to behave unexpectedly.
+ *
+ * Use the pattern:
+ * if (additionalProperties.containsKey(prop)) convertPropertyToBooleanAndWriteBack(prop);
+ */
+
+ if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) {
+ this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.parseBoolean(additionalProperties
+ .get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString()));
+ }
+
+ if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES)) {
+ setOptionalEmitDefaultValuesFlag(convertPropertyToBooleanAndWriteBack(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES));
+ } else {
+ additionalProperties.put(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, optionalEmitDefaultValuesFlag);
+ }
+
+ if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_CONDITIONAL_SERIALIZATION)) {
+ setConditionalSerialization(convertPropertyToBooleanAndWriteBack(CodegenConstants.OPTIONAL_CONDITIONAL_SERIALIZATION));
+ } else {
+ additionalProperties.put(CodegenConstants.OPTIONAL_CONDITIONAL_SERIALIZATION, conditionalSerialization);
+ }
+
+ if (additionalProperties.containsKey(CodegenConstants.MODEL_PROPERTY_NAMING)) {
+ setModelPropertyNaming((String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING));
+ }
+
+ if (isEmpty(apiPackage)) {
+ setApiPackage("Api");
+ }
+ if (isEmpty(modelPackage)) {
+ setModelPackage("Model");
+ }
+
+ clientPackage = "Client";
+
+ if (RESTSHARP.equals(getLibrary())) {
+ additionalProperties.put("useRestSharp", true);
+ needsCustomHttpMethod = true;
+ } else if (HTTPCLIENT.equals(getLibrary())) {
+ setLibrary(HTTPCLIENT);
+ additionalProperties.put("useHttpClient", true);
+ needsUriBuilder = true;
+ } else {
+ throw new RuntimeException("Invalid HTTP library " + getLibrary() + ". Only restsharp, httpclient are supported.");
+ }
+
+ String inputFramework = (String) additionalProperties.getOrDefault(CodegenConstants.DOTNET_FRAMEWORK, defaultFramework.name);
+ String[] frameworks;
+ List strategies = new ArrayList<>();
+
+ if (inputFramework.contains(";")) {
+ // multiple target framework
+ frameworks = inputFramework.split(";");
+ additionalProperties.put("multiTarget", true);
+ } else {
+ // just a single value
+ frameworks = new String [] {inputFramework};
+ }
+
+ for (String framework : frameworks) {
+ boolean strategyMatched = false;
+ for (FrameworkStrategy frameworkStrategy : frameworkStrategies) {
+ if (framework.equals(frameworkStrategy.name)) {
+ strategies.add(frameworkStrategy);
+ strategyMatched = true;
+ }
+
+ if (frameworkStrategy != FrameworkStrategy.NETSTANDARD_2_0 && "restsharp".equals(getLibrary())) {
+ LOGGER.warn("If using built-in templates, RestSharp only supports netstandard 2.0 or later.");
+ }
+ }
+
+ if (!strategyMatched) {
+ // throws exception if the input targetFramework is invalid
+ throw new IllegalArgumentException("The input (" + inputFramework + ") contains Invalid .NET framework version: " +
+ framework + ". List of supported versions: " +
+ frameworkStrategies.stream()
+ .map(p -> p.name)
+ .collect(Collectors.joining(", ")));
+ }
+ }
+
+ configureAdditionalPropertiesForFrameworks(additionalProperties, strategies);
+ setTargetFrameworkNuget(strategies);
+ setTargetFramework(strategies);
+ setTestTargetFramework(strategies);
+
+ setSupportsAsync(Boolean.TRUE);
+ setNetStandard(strategies.stream().anyMatch(p -> Boolean.TRUE.equals(p.isNetStandard)));
+
+ if (!netStandard) {
+ setNetCoreProjectFileFlag(true);
+ }
+
+ if (additionalProperties.containsKey(CodegenConstants.GENERATE_PROPERTY_CHANGED)) {
+ LOGGER.warn("{} is not supported in the .NET Standard generator.", CodegenConstants.GENERATE_PROPERTY_CHANGED);
+ additionalProperties.remove(CodegenConstants.GENERATE_PROPERTY_CHANGED);
+ }
+
+ final AtomicReference excludeTests = new AtomicReference<>();
+ syncBooleanProperty(additionalProperties, CodegenConstants.EXCLUDE_TESTS, excludeTests::set, false);
+
+ syncStringProperty(additionalProperties, "clientPackage", (s) -> { }, clientPackage);
+
+ syncStringProperty(additionalProperties, CodegenConstants.API_PACKAGE, this::setApiPackage, apiPackage);
+ syncStringProperty(additionalProperties, CodegenConstants.MODEL_PACKAGE, this::setModelPackage, modelPackage);
+ syncStringProperty(additionalProperties, CodegenConstants.OPTIONAL_PROJECT_GUID, this::setPackageGuid, packageGuid);
+ syncStringProperty(additionalProperties, "targetFrameworkNuget", this::setTargetFrameworkNuget, this.targetFrameworkNuget);
+ syncStringProperty(additionalProperties, "testTargetFramework", this::setTestTargetFramework, this.testTargetFramework);
+
+ syncBooleanProperty(additionalProperties, "netStandard", this::setNetStandard, this.netStandard);
+
+ syncBooleanProperty(additionalProperties, CodegenConstants.VALIDATABLE, this::setValidatable, this.validatable);
+ syncBooleanProperty(additionalProperties, CodegenConstants.SUPPORTS_ASYNC, this::setSupportsAsync, this.supportsAsync);
+ syncBooleanProperty(additionalProperties, SUPPORTS_RETRY, this::setSupportsRetry, this.supportsRetry);
+ syncBooleanProperty(additionalProperties, CodegenConstants.OPTIONAL_METHOD_ARGUMENT, this::setOptionalMethodArgumentFlag, optionalMethodArgumentFlag);
+ syncBooleanProperty(additionalProperties, CodegenConstants.NON_PUBLIC_API, this::setNonPublicApi, isNonPublicApi());
+ syncBooleanProperty(additionalProperties, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, this::setUseOneOfDiscriminatorLookup, this.useOneOfDiscriminatorLookup);
+
+ final String testPackageName = testPackageName();
+ String packageFolder = sourceFolder + File.separator + packageName;
+ String clientPackageDir = packageFolder + File.separator + clientPackage;
+ String modelPackageDir = packageFolder + File.separator + modelPackage;
+ String testPackageFolder = testFolder + File.separator + testPackageName;
+
+ additionalProperties.put("testPackageName", testPackageName);
+
+ //Compute the relative path to the bin directory where the external assemblies live
+ //This is necessary to properly generate the project file
+ int packageDepth = packageFolder.length() - packageFolder.replace(java.io.File.separator, "").length();
+ String binRelativePath = "..\\";
+ for (int i = 0; i < packageDepth; i = i + 1) {
+ binRelativePath += "..\\";
+ }
+ binRelativePath += "vendor";
+ additionalProperties.put("binRelativePath", binRelativePath);
+
+ if(HTTPCLIENT.equals(getLibrary())) {
+ supportingFiles.add(new SupportingFile("FileParameter.mustache", clientPackageDir, "FileParameter.cs"));
+ typeMapping.put("file", "FileParameter");
+ }
+
+ supportingFiles.add(new SupportingFile("IApiAccessor.mustache", clientPackageDir, "IApiAccessor.cs"));
+ supportingFiles.add(new SupportingFile("Configuration.mustache", clientPackageDir, "Configuration.cs"));
+ supportingFiles.add(new SupportingFile("ApiClient.mustache", clientPackageDir, "ApiClient.cs"));
+ supportingFiles.add(new SupportingFile("ApiException.mustache", clientPackageDir, "ApiException.cs"));
+ supportingFiles.add(new SupportingFile("ApiResponse.mustache", clientPackageDir, "ApiResponse.cs"));
+ supportingFiles.add(new SupportingFile("ExceptionFactory.mustache", clientPackageDir, "ExceptionFactory.cs"));
+ supportingFiles.add(new SupportingFile("OpenAPIDateConverter.mustache", clientPackageDir, "OpenAPIDateConverter.cs"));
+ supportingFiles.add(new SupportingFile("ClientUtils.mustache", clientPackageDir, "ClientUtils.cs"));
+ if(needsCustomHttpMethod) {
+ supportingFiles.add(new SupportingFile("HttpMethod.mustache", clientPackageDir, "HttpMethod.cs"));
+ }
+ if(needsUriBuilder) {
+ supportingFiles.add(new SupportingFile("WebRequestPathBuilder.mustache", clientPackageDir, "WebRequestPathBuilder.cs"));
+ }
+ if (ProcessUtils.hasHttpSignatureMethods(openAPI)) {
+ supportingFiles.add(new SupportingFile("HttpSigningConfiguration.mustache", clientPackageDir, "HttpSigningConfiguration.cs"));
+ }
+ if (supportsAsync) {
+ supportingFiles.add(new SupportingFile("IAsynchronousClient.mustache", clientPackageDir, "IAsynchronousClient.cs"));
+ }
+ supportingFiles.add(new SupportingFile("ISynchronousClient.mustache", clientPackageDir, "ISynchronousClient.cs"));
+ supportingFiles.add(new SupportingFile("RequestOptions.mustache", clientPackageDir, "RequestOptions.cs"));
+ supportingFiles.add(new SupportingFile("Multimap.mustache", clientPackageDir, "Multimap.cs"));
+
+ if (supportsRetry) {
+ supportingFiles.add(new SupportingFile("RetryConfiguration.mustache", clientPackageDir, "RetryConfiguration.cs"));
+ }
+
+ supportingFiles.add(new SupportingFile("IReadableConfiguration.mustache",
+ clientPackageDir, "IReadableConfiguration.cs"));
+ supportingFiles.add(new SupportingFile("GlobalConfiguration.mustache",
+ clientPackageDir, "GlobalConfiguration.cs"));
+
+ // Only write out test related files if excludeTests is unset or explicitly set to false (see start of this method)
+ if (Boolean.FALSE.equals(excludeTests.get())) {
+ modelTestTemplateFiles.put("model_test.mustache", ".cs");
+ apiTestTemplateFiles.put("api_test.mustache", ".cs");
+ }
+
+ supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+ supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+ supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
+ supportingFiles.add(new SupportingFile("appveyor.mustache", "", "appveyor.yml"));
+ supportingFiles.add(new SupportingFile("AbstractOpenAPISchema.mustache", modelPackageDir, "AbstractOpenAPISchema.cs"));
+
+ additionalProperties.put("apiDocPath", apiDocPath);
+ additionalProperties.put("modelDocPath", modelDocPath);
+ }
+
+ public void setNetStandard(Boolean netStandard) {
+ this.netStandard = netStandard;
+ }
+
+ public void setOptionalAssemblyInfoFlag(boolean flag) {
+ this.optionalAssemblyInfoFlag = flag;
+ }
+
+ public void setOptionalEmitDefaultValuesFlag(boolean flag) {
+ this.optionalEmitDefaultValuesFlag = flag;
+ }
+
+ public void setConditionalSerialization(boolean flag){
+ this.conditionalSerialization = flag;
+ }
+
+ public void setOptionalProjectFileFlag(boolean flag) {
+ this.optionalProjectFileFlag = flag;
+ }
+
+ public void setPackageGuid(String packageGuid) {
+ this.packageGuid = packageGuid;
+ }
+
+ @Override
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
+
+ @Override
+ public void setPackageVersion(String packageVersion) {
+ this.packageVersion = packageVersion;
+ }
+
+ public void setSupportsAsync(Boolean supportsAsync) {
+ this.supportsAsync = supportsAsync;
+ }
+
+ public void setSupportsRetry(Boolean supportsRetry) {
+ this.supportsRetry = supportsRetry;
+ }
+
+ public void setTargetFramework(String dotnetFramework) {
+ if (!frameworks.containsKey(dotnetFramework)) {
+ throw new IllegalArgumentException("Invalid .NET framework version: " +
+ dotnetFramework + ". List of supported versions: " +
+ frameworkStrategies.stream()
+ .map(p -> p.name)
+ .collect(Collectors.joining(", ")));
+ } else {
+ this.targetFramework = dotnetFramework;
+ }
+ LOGGER.info("Generating code for .NET Framework {}", this.targetFramework);
+ }
+
+ public void setTargetFramework(List strategies) {
+ for (FrameworkStrategy strategy : strategies) {
+ if (!frameworks.containsKey(strategy.name)) {
+ throw new IllegalArgumentException("Invalid .NET framework version: " +
+ strategy.name + ". List of supported versions: " +
+ frameworkStrategies.stream()
+ .map(p -> p.name)
+ .collect(Collectors.joining(", ")));
+ }
+ }
+ this.targetFramework = strategies.stream().map(p -> p.name)
+ .collect(Collectors.joining(";"));
+ LOGGER.info("Generating code for .NET Framework {}", this.targetFramework);
+ }
+
+ public void setTestTargetFramework(String testTargetFramework) {
+ this.testTargetFramework = testTargetFramework;
+ }
+
+ public void setTestTargetFramework(List strategies) {
+ this.testTargetFramework = strategies.stream().map(p -> p.testTargetFramework)
+ .collect(Collectors.joining(";"));
+ }
+
+ public void setTargetFrameworkNuget(String targetFrameworkNuget) {
+ this.targetFrameworkNuget = targetFrameworkNuget;
+ }
+
+ public void setTargetFrameworkNuget(List strategies) {
+ this.targetFrameworkNuget = strategies.stream().map(p -> p.getNugetFrameworkIdentifier())
+ .collect(Collectors.joining(";"));
+ }
+
+ public void setValidatable(boolean validatable) {
+ this.validatable = validatable;
+ }
+
+ public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) {
+ this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders;
+ }
+
+ public void setLicenseId(String licenseId) {
+ this.licenseId = licenseId;
+ }
+
+ @Override
+ public void setReleaseNote(String releaseNote) {
+ this.releaseNote = releaseNote;
+ }
+
+ public void setPackageTags(String packageTags) {
+ this.packageTags = packageTags;
+ }
+
+ public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) {
+ this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup;
+ }
+
+ public boolean getUseOneOfDiscriminatorLookup() {
+ return this.useOneOfDiscriminatorLookup;
+ }
+
+ @Override
+ public String toEnumVarName(String value, String datatype) {
+ if (value.length() == 0) {
+ return "Empty";
+ }
+
+ // for symbol, e.g. $, #
+ if (getSymbolName(value) != null) {
+ return camelize(getSymbolName(value));
+ }
+
+ // number
+ if (datatype.startsWith("int") || datatype.startsWith("long") ||
+ datatype.startsWith("double") || datatype.startsWith("float")) {
+ String varName = "NUMBER_" + value;
+ varName = varName.replaceAll("-", "MINUS_");
+ varName = varName.replaceAll("\\+", "PLUS_");
+ varName = varName.replaceAll("\\.", "_DOT_");
+ return varName;
+ }
+
+ // string
+ String var = value.replaceAll(" ", "_");
+ var = camelize(var);
+ var = var.replaceAll("\\W+", "");
+
+ if (var.matches("\\d.*")) {
+ return "_" + var;
+ } else {
+ return var;
+ }
+ }
+
+ @Override
+ public String toModelDocFilename(String name) {
+ return toModelFilename(name);
+ }
+
+ @Override
+ public String toVarName(String name) {
+ // sanitize name
+ name = sanitizeName(name);
+
+ // if it's all upper case, do nothing
+ if (name.matches("^[A-Z_]*$")) {
+ return name;
+ }
+
+ name = getNameUsingModelPropertyNaming(name);
+
+ // for reserved word or word starting with number, append _
+ if (isReservedWord(name) || name.matches("^\\d.*")) {
+ name = escapeReservedWord(name);
+ }
+
+ // for function names in the model, escape with the "Property" prefix
+ if (propertySpecialKeywords.contains(name)) {
+ return camelize("property_" + name);
+ }
+
+ return name;
+ }
+
+ private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
+ // This generator uses inline classes to define enums, which breaks when
+ // dealing with models that have subTypes. To clean this up, we will analyze
+ // the parent and child models, look for enums that match, and remove
+ // them from the child models and leave them in the parent.
+ // Because the child models extend the parents, the enums will be available via the parent.
+
+ // Only bother with reconciliation if the parent model has enums.
+ if (parentCodegenModel.hasEnums) {
+
+ // Get the properties for the parent and child models
+ final List parentModelCodegenProperties = parentCodegenModel.vars;
+ List codegenProperties = codegenModel.vars;
+
+ // Iterate over all of the parent model properties
+ boolean removedChildEnum = false;
+ for (CodegenProperty parentModelCodegenProperty : parentModelCodegenProperties) {
+ // Look for enums
+ if (parentModelCodegenProperty.isEnum) {
+ // Now that we have found an enum in the parent class,
+ // and search the child class for the same enum.
+ Iterator iterator = codegenProperties.iterator();
+ while (iterator.hasNext()) {
+ CodegenProperty codegenProperty = iterator.next();
+ if (codegenProperty.isEnum && codegenProperty.equals(parentModelCodegenProperty)) {
+ // We found an enum in the child class that is
+ // a duplicate of the one in the parent, so remove it.
+ iterator.remove();
+ removedChildEnum = true;
+ }
+ }
+ }
+ }
+
+ if (removedChildEnum) {
+ codegenModel.vars = codegenProperties;
+ }
+ }
+
+ return codegenModel;
+ }
+
+ private void syncBooleanProperty(final Map additionalProperties, final String key, final Consumer setter, final Boolean defaultValue) {
+ if (additionalProperties.containsKey(key)) {
+ setter.accept(convertPropertyToBooleanAndWriteBack(key));
+ } else {
+ additionalProperties.put(key, defaultValue);
+ setter.accept(defaultValue);
+ }
+ }
+
+ private void syncStringProperty(final Map additionalProperties, final String key, final Consumer setter, final String defaultValue) {
+ if (additionalProperties.containsKey(key)) {
+ setter.accept((String) additionalProperties.get(key));
+ } else {
+ additionalProperties.put(key, defaultValue);
+ setter.accept(defaultValue);
+ }
+ }
+
+ // https://docs.microsoft.com/en-us/dotnet/standard/net-standard
+ @SuppressWarnings("Duplicates")
+ private static abstract class FrameworkStrategy {
+
+ private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
+
+ static FrameworkStrategy NETSTANDARD_1_3 = new FrameworkStrategy("netstandard1.3", ".NET Standard 1.3 compatible", "netcoreapp2.0") {
+ };
+ static FrameworkStrategy NETSTANDARD_1_4 = new FrameworkStrategy("netstandard1.4", ".NET Standard 1.4 compatible", "netcoreapp2.0") {
+ };
+ static FrameworkStrategy NETSTANDARD_1_5 = new FrameworkStrategy("netstandard1.5", ".NET Standard 1.5 compatible", "netcoreapp2.0") {
+ };
+ static FrameworkStrategy NETSTANDARD_1_6 = new FrameworkStrategy("netstandard1.6", ".NET Standard 1.6 compatible", "netcoreapp2.0") {
+ };
+ static FrameworkStrategy NETSTANDARD_2_0 = new FrameworkStrategy("netstandard2.0", ".NET Standard 2.0 compatible", "netcoreapp2.0") {
+ };
+ static FrameworkStrategy NETSTANDARD_2_1 = new FrameworkStrategy("netstandard2.1", ".NET Standard 2.1 compatible", "netcoreapp3.0") {
+ };
+ static FrameworkStrategy NETCOREAPP_2_0 = new FrameworkStrategy("netcoreapp2.0", ".NET Core 2.0 compatible", "netcoreapp2.0", Boolean.FALSE) {
+ };
+ static FrameworkStrategy NETCOREAPP_2_1 = new FrameworkStrategy("netcoreapp2.1", ".NET Core 2.1 compatible", "netcoreapp2.1", Boolean.FALSE) {
+ };
+ static FrameworkStrategy NETCOREAPP_3_0 = new FrameworkStrategy("netcoreapp3.0", ".NET Core 3.0 compatible", "netcoreapp3.0", Boolean.FALSE) {
+ };
+ static FrameworkStrategy NETCOREAPP_3_1 = new FrameworkStrategy("netcoreapp3.1", ".NET Core 3.1 compatible", "netcoreapp3.1", Boolean.FALSE) {
+ };
+ static FrameworkStrategy NETFRAMEWORK_4_7 = new FrameworkStrategy("net47", ".NET Framework 4.7 compatible", "net47", Boolean.FALSE) {
+ };
+ static FrameworkStrategy NET_5_0 = new FrameworkStrategy("net5.0", ".NET 5.0 compatible", "net5.0", Boolean.FALSE) {
+ };
+ protected String name;
+ protected String description;
+ protected String testTargetFramework;
+ private Boolean isNetStandard = Boolean.TRUE;
+
+ FrameworkStrategy(String name, String description, String testTargetFramework) {
+ this.name = name;
+ this.description = description;
+ this.testTargetFramework = testTargetFramework;
+ }
+
+ FrameworkStrategy(String name, String description, String testTargetFramework, Boolean isNetStandard) {
+ this.name = name;
+ this.description = description;
+ this.testTargetFramework = testTargetFramework;
+ this.isNetStandard = isNetStandard;
+ }
+
+ protected void configureAdditionalProperties(final Map properties) {
+ properties.putIfAbsent(CodegenConstants.DOTNET_FRAMEWORK, this.name);
+
+ // not intended to be user-settable
+ properties.put(TARGET_FRAMEWORK_IDENTIFIER, this.getTargetFrameworkIdentifier());
+ properties.put(TARGET_FRAMEWORK_VERSION, this.getTargetFrameworkVersion());
+ properties.putIfAbsent(MCS_NET_VERSION_KEY, "4.6-api");
+
+ properties.put(NET_STANDARD, this.isNetStandard);
+ if (properties.containsKey(SUPPORTS_UWP)) {
+ LOGGER.warn(".NET {} generator does not support the UWP option. Use the csharp generator instead.",
+ this.name);
+ properties.remove(SUPPORTS_UWP);
+ }
+ }
+
+ protected String getNugetFrameworkIdentifier() {
+ return this.name.toLowerCase(Locale.ROOT);
+ }
+
+ protected String getTargetFrameworkIdentifier() {
+ if (this.isNetStandard) return ".NETStandard";
+ else return ".NETCoreApp";
+ }
+
+ protected String getTargetFrameworkVersion() {
+ if (this.isNetStandard) return "v" + this.name.replace("netstandard", "");
+ else return "v" + this.name.replace("netcoreapp", "");
+ }
+ }
+
+ protected void configureAdditionalPropertiesForFrameworks(final Map properties, List strategies) {
+ properties.putIfAbsent(CodegenConstants.DOTNET_FRAMEWORK, strategies.stream()
+ .map(p -> p.name)
+ .collect(Collectors.joining(";")));
+
+ // not intended to be user-settable
+ properties.put(TARGET_FRAMEWORK_IDENTIFIER, strategies.stream()
+ .map(p -> p.getTargetFrameworkIdentifier())
+ .collect(Collectors.joining(";")));
+ properties.put(TARGET_FRAMEWORK_VERSION, strategies.stream()
+ .map(p -> p.getTargetFrameworkVersion())
+ .collect(Collectors.joining(";")));
+ properties.putIfAbsent(MCS_NET_VERSION_KEY, "4.6-api");
+
+ properties.put(NET_STANDARD, strategies.stream().anyMatch(p -> Boolean.TRUE.equals(p.isNetStandard)));
+ }
+
+ /**
+ * Return the instantiation type of the property, especially for map and array
+ *
+ * @param schema property schema
+ * @return string presentation of the instantiation type of the property
+ */
+ @Override
+ public String toInstantiationType(Schema schema) {
+ if (ModelUtils.isMapSchema(schema)) {
+ Schema additionalProperties = getAdditionalProperties(schema);
+ String inner = getSchemaType(additionalProperties);
+ if (ModelUtils.isMapSchema(additionalProperties)) {
+ inner = toInstantiationType(additionalProperties);
+ }
+ return instantiationTypes.get("map") + "";
+ } else if (ModelUtils.isArraySchema(schema)) {
+ ArraySchema arraySchema = (ArraySchema) schema;
+ String inner = getSchemaType(arraySchema.getItems());
+ return instantiationTypes.get("array") + "<" + inner + ">";
+ } else {
+ return null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Map postProcessModels(Map objs) {
+ objs = super.postProcessModels(objs);
+ List