Merge pull request #4011 from jimschubert/aspnet5-rename

[aspnetcore] Deprecating aspnet5 for aspnetcore

.gitignore

@@ -143,6 +143,6 @@ samples/client/petstore/typescript-angular/**/typings
 samples/client/petstore/typescript-fetch/**/dist/
 samples/client/petstore/typescript-fetch/**/typings
 
-# aspnet5
-samples/server/petstore/aspnet5/.vs/
+# aspnetcore
+samples/server/petstore/aspnetcore/.vs/
 

README.md

@@ -450,6 +450,7 @@ AbstractTypeScriptClientCodegen.java
 AkkaScalaClientCodegen.java
 AndroidClientCodegen.java
 AspNet5ServerCodegen.java
+AspNetCoreServerCodegen.java
 AsyncScalaClientCodegen.java
 CSharpClientCodegen.java
 ClojureClientCodegen.java

bin/aspnetcore-petstore-server.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -l aspnet5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnet5"
+ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore"
 
 java $JAVA_OPTS -jar $executable $ags

bin/windows/aspnetcore-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnetcore -o samples\server\petstore\aspnetcore\
 
 java %JAVA_OPTS% -jar %executable% %ags%

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java

@@ -1,74 +1,15 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.*;
-import io.swagger.models.properties.*;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.util.*;
-
-import static java.util.UUID.randomUUID;
-
-public class AspNet5ServerCodegen extends AbstractCSharpCodegen {
-
-    protected String sourceFolder = "src" + File.separator + packageName;
-
-    private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
+public class AspNet5ServerCodegen extends AspNetCoreServerCodegen {
 
     @SuppressWarnings("hiding")
     protected Logger LOGGER = LoggerFactory.getLogger(AspNet5ServerCodegen.class);
 
     public AspNet5ServerCodegen() {
         super();
-
-        outputFolder = "generated-code" + File.separator + this.getName();
-
-        modelTemplateFiles.put("model.mustache", ".cs");
-        apiTemplateFiles.put("controller.mustache", ".cs");
-
-        // contextually reserved words
-        setReservedWordsLowerCase(
-            Arrays.asList("var", "async", "await", "dynamic", "yield")
-        );
-
-        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);
-
-        // CLI Switches
-        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);
-    }
-
-    @Override
-    public CodegenType getTag() {
-        return CodegenType.SERVER;
     }
 
     @Override
@@ -76,68 +17,10 @@ public class AspNet5ServerCodegen extends AbstractCSharpCodegen {
         return "aspnet5";
     }
 
-    @Override
-    public String getHelp() {
-        return "Generates an ASP.NET 5 Web API server.";
-    }
-
     @Override
     public void processOpts() {
         super.processOpts();
 
-        additionalProperties.put("packageGuid", packageGuid);
-
-        apiPackage = packageName + ".Controllers";
-        modelPackage = packageName + ".Models";
-
-        supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config"));
-        supportingFiles.add(new SupportingFile("global.json", "", "global.json"));
-        supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh"));
-        supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat"));
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln"));
-        supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile"));
-        supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore"));
-        supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json"));
-
-        supportingFiles.add(new SupportingFile("project.json.mustache", this.sourceFolder, "project.json"));
-        supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs"));
-        supportingFiles.add(new SupportingFile("Program.mustache", this.sourceFolder, "Program.cs"));
-        supportingFiles.add(new SupportingFile("web.config", this.sourceFolder, "web.config"));
-
-        supportingFiles.add(new SupportingFile("Project.xproj.mustache", this.sourceFolder, this.packageName + ".xproj"));
-
-        supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json"));
-
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md"));
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html"));
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config"));
-    }
-
-    @Override
-    public String apiFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + "Controllers";
-    }
-
-    @Override
-    public String modelFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + "Models";
-    }
-
-    @Override
-    protected void processOperation(CodegenOperation operation) {
-        super.processOperation(operation);
-
-        // HACK: Unlikely in the wild, but we need to clean operation paths for MVC Routing
-        if (operation.path != null) {
-            String original = operation.path;
-            operation.path = operation.path.replace("?", "/");
-            if (!original.equals(operation.path)) {
-                LOGGER.warn("Normalized " + original + " to " + operation.path + ". Please verify generated source.");
-            }
-        }
-
-        // Converts, for example, PUT to HttpPut for controller attributes
-        operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase();
+        LOGGER.warn("aspnet5 is deprecated. Please use aspnetcore.");
     }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java

@@ -0,0 +1,144 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.SupportingFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.Arrays;
+
+import static java.util.UUID.randomUUID;
+
+public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
+
+    protected String sourceFolder = "src" + File.separator + packageName;
+
+    private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
+
+    @SuppressWarnings("hiding")
+    protected Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
+
+    public AspNetCoreServerCodegen() {
+        super();
+
+        outputFolder = "generated-code" + File.separator + this.getName();
+
+        modelTemplateFiles.put("model.mustache", ".cs");
+        apiTemplateFiles.put("controller.mustache", ".cs");
+
+        // contextually reserved words
+        setReservedWordsLowerCase(
+            Arrays.asList("var", "async", "await", "dynamic", "yield")
+        );
+
+        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);
+
+        // CLI Switches
+        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);
+    }
+
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    @Override
+    public String getName() {
+        return "aspnetcore";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates an ASP.NET Core Web API server.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        additionalProperties.put("packageGuid", packageGuid);
+
+        apiPackage = packageName + ".Controllers";
+        modelPackage = packageName + ".Models";
+
+        supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config"));
+        supportingFiles.add(new SupportingFile("global.json", "", "global.json"));
+        supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh"));
+        supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln"));
+        supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile"));
+        supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore"));
+        supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json"));
+
+        supportingFiles.add(new SupportingFile("project.json.mustache", this.sourceFolder, "project.json"));
+        supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs"));
+        supportingFiles.add(new SupportingFile("Program.mustache", this.sourceFolder, "Program.cs"));
+        supportingFiles.add(new SupportingFile("web.config", this.sourceFolder, "web.config"));
+
+        supportingFiles.add(new SupportingFile("Project.xproj.mustache", this.sourceFolder, this.packageName + ".xproj"));
+
+        supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json"));
+
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config"));
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "Controllers";
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "Models";
+    }
+
+    @Override
+    protected void processOperation(CodegenOperation operation) {
+        super.processOperation(operation);
+
+        // HACK: Unlikely in the wild, but we need to clean operation paths for MVC Routing
+        if (operation.path != null) {
+            String original = operation.path;
+            operation.path = operation.path.replace("?", "/");
+            if (!original.equals(operation.path)) {
+                LOGGER.warn("Normalized " + original + " to " + operation.path + ". Please verify generated source.");
+            }
+        }
+
+        // Converts, for example, PUT to HttpPut for controller attributes
+        operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase();
+    }
+}

modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig

@@ -1,5 +1,6 @@
 io.swagger.codegen.languages.AndroidClientCodegen
 io.swagger.codegen.languages.AspNet5ServerCodegen
+io.swagger.codegen.languages.AspNetCoreServerCodegen
 io.swagger.codegen.languages.AsyncScalaClientCodegen
 io.swagger.codegen.languages.ConfluenceWikiGenerator
 io.swagger.codegen.languages.CSharpClientCodegen

modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java

@@ -1,19 +1,19 @@
-package io.swagger.codegen.aspnet5;
+package io.swagger.codegen.aspnetcore;
 
 import io.swagger.codegen.AbstractOptionsTest;
 import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.languages.AspNet5ServerCodegen;
-import io.swagger.codegen.options.AspNet5ServerOptionsProvider;
+import io.swagger.codegen.languages.AspNetCoreServerCodegen;
+import io.swagger.codegen.options.AspNetCoreServerOptionsProvider;
 import mockit.Expectations;
 import mockit.Tested;
 
-public class AspNet5ServerOptionsTest extends AbstractOptionsTest {
+public class AspNetCoreServerOptionsTest extends AbstractOptionsTest {
 
     @Tested
-    private AspNet5ServerCodegen serverCodegen;
+    private AspNetCoreServerCodegen serverCodegen;
 
-    public AspNet5ServerOptionsTest() {
-        super(new AspNet5ServerOptionsProvider());
+    public AspNetCoreServerOptionsTest() {
+        super(new AspNetCoreServerOptionsProvider());
     }
 
     @Override
@@ -25,11 +25,11 @@ public class AspNet5ServerOptionsTest extends AbstractOptionsTest {
     @Override
     protected void setExpectations() {
         new Expectations(serverCodegen) {{
-            serverCodegen.setPackageName(AspNet5ServerOptionsProvider.PACKAGE_NAME_VALUE);
+            serverCodegen.setPackageName(AspNetCoreServerOptionsProvider.PACKAGE_NAME_VALUE);
             times = 1;
-            serverCodegen.setPackageVersion(AspNet5ServerOptionsProvider.PACKAGE_VERSION_VALUE);
+            serverCodegen.setPackageVersion(AspNetCoreServerOptionsProvider.PACKAGE_VERSION_VALUE);
             times = 1;
-            serverCodegen.setSourceFolder(AspNet5ServerOptionsProvider.SOURCE_FOLDER_VALUE);
+            serverCodegen.setSourceFolder(AspNetCoreServerOptionsProvider.SOURCE_FOLDER_VALUE);
             times = 1;
             serverCodegen.useDateTimeOffset(true);
             times = 1;

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java

@@ -5,14 +5,14 @@ import io.swagger.codegen.CodegenConstants;
 
 import java.util.Map;
 
-public class AspNet5ServerOptionsProvider implements OptionsProvider {
-    public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnet5";
+public class AspNetCoreServerOptionsProvider implements OptionsProvider {
+    public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnetcore";
     public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT";
-    public static final String SOURCE_FOLDER_VALUE = "src_aspnet5";
+    public static final String SOURCE_FOLDER_VALUE = "src_aspnetcore";
 	
     @Override
     public String getLanguage() {
-        return "aspnet5";
+        return "aspnetcore";
     }
 
     @Override