Merge branch 'master' into fix1177

Author: HugoMario

.gitignore

@@ -4,6 +4,10 @@
 # Log file
 *.log
 
+# Temporary files
+*.tmp
+tmp/
+
 # BlueJ files
 *.ctxt
 

README.md

@@ -7,7 +7,7 @@
 ## Overview
 **Swagger Codegen Generators** project is a set of classes and templates ([Handlebars](https://jknack.github.io/handlebars.java)) used by [Swagger Codegen 3.0.0 project](https://github.com/swagger-api/swagger-codegen/tree/3.0.0) in its code generation process for a specific language or language framework. The main differents with **Swagger Codegen 2.x.x** are:
 
-- **Handlebars as template engine:** with Handelbars feature is possible to create more logic-less templates.
+- **Handlebars as template engine:** with Handlebars feature is possible to create more logic-less templates.
 - **OAS 3 support:** generator classes work with OpenAPI Specification V3.
 
 More details about these and more differences are referenced at [https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.0](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.0)
@@ -18,16 +18,16 @@ You need the following installed and available in your $PATH:
 * Java 8 (http://java.oracle.com)
 * Apache maven 3.0.4 or greater (http://maven.apache.org/)
 
-## How to contribute.
-Right now the templates and generators classes are migrated from  [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) **3.0.0** branch. 
+## How to Contribute.
+Right now the templates and generators classes are migrated from  [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) **3.0.0** branch.
 If you want to migrate an existing language/framework, you can follow this [guide](https://github.com/swagger-api/swagger-codegen/wiki/Swagger-Codegen-migration-(swagger-codegen-generators-repository)).
-Also you need to keep in mind that **Handlebars** is used as template engines and besides it's pretty similar to **Mustache** there are different that can not be ignored. So you can follow this [guide](https://github.com/swagger-api/swagger-codegen/wiki/Swagger-Codegen-migration-from-Mustache-and-Handlebars-templates.) which explains steps to migrate templates from **Mustaches** to **Handelbars**.
+Also you need to keep in mind that **Handlebars** is used as the template engine. It's pretty similar to **Mustache**, but there are differences that can not be ignored. So you can follow this [guide](https://github.com/swagger-api/swagger-codegen/wiki/Swagger-Codegen-migration-from-Mustache-and-Handlebars-templates.) which explains steps to migrate templates from **Mustaches** to **Handlebars**.
 
-## Security contact
+## Security Contact
 
 Please disclose any security-related issues or vulnerabilities by emailing [[email protected]](mailto:[email protected]), instead of using the public issue tracker.
 
-## License information on Generated Code
+## License Information on Generated Code
 
 The Swagger Codegen project is intended as a benefit for users of the Swagger / Open API Specification.  The project itself has the [License](#license) as specified.  In addition, please understand the following points:
 

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.43-SNAPSHOT</version>
+    <version>1.0.45-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -68,7 +68,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit4</artifactId>
-                        <version>3.0.0</version>
+                        <version>${surefire-version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -251,33 +251,33 @@
         <dependency>
             <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
-            <version>0.9.0</version>
+            <version>0.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.8.47</version>
+            <version>2.28.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-codegen-version>3.0.45</swagger-codegen-version>
-        <swagger-parser-version>2.1.14</swagger-parser-version>
-        <swagger-core-version>2.2.11</swagger-core-version>
-        <jackson-version>2.15.1</jackson-version>
-        <jackson-databind-version>2.15.1</jackson-databind-version>
+        <swagger-codegen-version>3.0.51-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.1.18</swagger-parser-version>
+        <swagger-core-version>2.2.17</swagger-core-version>
+        <jackson-version>2.15.3</jackson-version>
+        <jackson-databind-version>2.15.3</jackson-databind-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <commons-io-version>2.11.0</commons-io-version>
+        <commons-io-version>2.14.0</commons-io-version>
         <commons-cli-version>1.5.0</commons-cli-version>
         <junit-version>4.13.2</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <commons-lang-version>3.12.0</commons-lang-version>
+        <commons-lang-version>3.13.0</commons-lang-version>
         <slf4j-version>1.7.36</slf4j-version>
         <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
-        <testng-version>7.7.1</testng-version>
-        <surefire-version>3.0.0</surefire-version>
+        <testng-version>7.8.0</testng-version>
+        <surefire-version>3.1.2</surefire-version>
         <jmockit-version>1.49</jmockit-version>
         <reflections-version>0.10.2</reflections-version>
 

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -1344,6 +1344,9 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
         codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, typeAliases.containsKey(name));
 
         codegenModel.discriminator = schema.getDiscriminator();
+        if (codegenModel.discriminator != null && codegenModel.discriminator.getPropertyName() != null) {
+            codegenModel.discriminator.setPropertyName(toVarName(codegenModel.discriminator.getPropertyName()));
+        }
 
         if (schema.getXml() != null) {
             codegenModel.xmlPrefix = schema.getXml().getPrefix();
@@ -1404,11 +1407,6 @@ else if (schema instanceof ComposedSchema) {
             final List<Schema> allOf = composed.getAllOf();
             // interfaces (intermediate models)
             if (allOf != null && !allOf.isEmpty()) {
-
-                if (codegenModel.discriminator != null && codegenModel.discriminator.getPropertyName() != null) {
-                    codegenModel.discriminator.setPropertyName(toVarName(codegenModel.discriminator.getPropertyName()));
-                }
-
                 for (int i = 0; i < allOf.size(); i++) {
                     if (i == 0 && !copyFistAllOfProperties) {
                         continue;
@@ -1435,16 +1433,6 @@ else if (schema instanceof ComposedSchema) {
                 }
             }
 
-            final List<Schema> oneOf = composed.getOneOf();
-            if (oneOf != null && !oneOf.isEmpty()) {
-                if (schema.getDiscriminator() != null) {
-                    codegenModel.discriminator = schema.getDiscriminator();
-                    if (codegenModel.discriminator != null && codegenModel.discriminator.getPropertyName() != null) {
-                        codegenModel.discriminator.setPropertyName(toVarName(codegenModel.discriminator.getPropertyName()));
-                    }
-                }
-            }
-
             if (parent != null) {
                 codegenModel.parentSchema = parentName;
                 codegenModel.parent = typeMapping.containsKey(parentName) ? typeMapping.get(parentName): toModelName(parentName);

src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java

@@ -8,6 +8,7 @@
 import io.swagger.codegen.v3.CodegenSecurity;
 import io.swagger.codegen.v3.CodegenType;
 import io.swagger.codegen.v3.SupportingFile;
+import io.swagger.codegen.v3.utils.SemVer;
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.security.SecurityScheme;
@@ -30,7 +31,9 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private static final String ASP_NET_CORE_VERSION_OPTION = "--aspnet-core-version";
     private static final String INTERFACE_ONLY_OPTION = "--interface-only";
     private static final String INTERFACE_CONTROLLER_OPTION = "--interface-controller";
-    private final String DEFAULT_ASP_NET_CORE_VERSION = "3.1";
+    private static final String SWASH_BUCKLE_VERSION_OPTION = "swashBuckleVersion";
+    private static final String TARGET_FRAMEWORK = "targetFramework";
+    private final String DEFAULT_ASP_NET_CORE_VERSION = "7.0";
     private String aspNetCoreVersion;
 
     @SuppressWarnings("hiding")
@@ -162,6 +165,7 @@ public void processOpts() {
             supportingFiles.add(new SupportingFile("Filters" + File.separator + "GeneratePathParamsValidationFilter.mustache", packageFolder + File.separator + "Filters", "GeneratePathParamsValidationFilter.cs"));
             supportingFiles.add(new SupportingFile("Startup.mustache", packageFolder, "Startup.cs"));
         } else {
+            final SemVer semVer = new SemVer(aspNetCoreVersion);
             apiTemplateFiles.put("3.0/controller.mustache", ".cs");
             addInterfaceControllerTemplate();
 
@@ -170,7 +174,20 @@ public void processOpts() {
 
             supportingFiles.add(new SupportingFile("3.0/Startup.mustache", packageFolder, "Startup.cs"));
             supportingFiles.add(new SupportingFile("3.0/Program.mustache", packageFolder, "Program.cs"));
-            if (isThreeDotOneVersion) {
+
+            if (semVer.atLeast("5.0")) {
+                additionalProperties.put(SWASH_BUCKLE_VERSION_OPTION, "6.4.0");
+                supportingFiles.add(new SupportingFile("3.1/Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
+            }
+            if (semVer.atLeast("7.0")) {
+                additionalProperties.put(TARGET_FRAMEWORK, "net7.0");
+            } else if (semVer.atLeast("6.0")) {
+                additionalProperties.put(TARGET_FRAMEWORK, "net6.0");
+            } else if (semVer.atLeast("5.0")) {
+                additionalProperties.put(TARGET_FRAMEWORK, "net5.0");
+            } else if (semVer.atLeast("3.1")) {
+                additionalProperties.put(SWASH_BUCKLE_VERSION_OPTION, "5.5.1");
+                additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp3.1");
                 supportingFiles.add(new SupportingFile("3.1/Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
             } else {
                 supportingFiles.add(new SupportingFile("3.0/Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
@@ -284,7 +301,8 @@ protected void processOperation(CodegenOperation operation) {
             List <CodegenContent> contents = operation.getContents()
                     .stream()
                     .filter(codegenContent -> !codegenContent.getIsForm())
-                    .collect(Collectors.toList());
+                    .collect(
+                        Collectors.toList());
             operation.getContents().clear();
             operation.getContents().addAll(contents);
         }
@@ -345,7 +363,7 @@ private void addInterfaceControllerTemplate() {
         boolean interfaceController = false;
         if (StringUtils.isNotBlank(interfaceControllerOption)) {
             interfaceController = Boolean.valueOf(getOptionValue(INTERFACE_CONTROLLER_OPTION));
-        } else {
+          } else {
             if (additionalProperties.get(INTERFACE_CONTROLLER_OPTION.substring(2)) != null) {
                 interfaceController = Boolean.valueOf(additionalProperties.get(INTERFACE_CONTROLLER_OPTION.substring(2)).toString());
             }
@@ -378,7 +396,8 @@ private void setAspNetCoreVersion() {
         } else {
             this.aspNetCoreVersion = optionValue;
         }
-        if (!this.aspNetCoreVersion.equals("2.0") && !this.aspNetCoreVersion.equals("2.1") && !this.aspNetCoreVersion.equals("2.2") && !this.aspNetCoreVersion.equals("3.0")) {
+        final SemVer semVer = new SemVer(this.aspNetCoreVersion);
+        if (semVer.compareTo(new SemVer("2.0")) < 0) {
             LOGGER.error("version '" + this.aspNetCoreVersion + "' is not supported, switching to default version: '" + DEFAULT_ASP_NET_CORE_VERSION + "'");
             this.aspNetCoreVersion = DEFAULT_ASP_NET_CORE_VERSION;
         }

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

@@ -1052,7 +1052,7 @@ protected void fixUpParentAndInterfaces(CodegenModel codegenModel, Map<String, C
 
         for (CodegenProperty codegenProperty : codegenModel.vars) {
             CodegenModel parentModel = codegenModel.parentModel;
-            
+
             while (parentModel != null) {
                 if (parentModel.vars == null || parentModel.vars.isEmpty()) {
                     parentModel = parentModel.parentModel;
@@ -1677,11 +1677,6 @@ public void setLanguageArguments(List<CodegenArgument> languageArguments) {
         super.setLanguageArguments(languageArguments);
     }
 
-    @Override
-    public boolean defaultIgnoreImportMappingOption() {
-        return true;
-    }
-
     @Override
     public boolean checkAliasModel() {
         return true;

src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyDIServerCodegen.java

@@ -30,7 +30,7 @@ public void addTemplateFiles() {
 
         apiTestTemplateFiles.clear(); // TODO: add test template
         // clear model and api doc template as this codegen
-        // does not support auto-generated markdown doc at the moment
+        // does not support auto-generated markdown doc at the moment.
         // TODO: add doc templates
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");

src/main/java/io/swagger/codegen/v3/generators/typescript/AbstractTypeScriptClientCodegen.java

@@ -40,7 +40,7 @@
 
 public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegenConfig {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractTypeScriptClientCodegen.class);
+    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTypeScriptClientCodegen.class);
 
     private static final String UNDEFINED_VALUE = "undefined";