[abstract-csharp] Begin removing netcore references

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java → modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java

@@ -41,7 +41,7 @@
 
 import static java.util.UUID.randomUUID;
 
-public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
+public class AspNetServerCodegen extends AbstractCSharpCodegen {
 
     public static final String USE_SWASHBUCKLE = "useSwashbuckle";
     public static final String MODEL_POCOMODE = "pocoModels";
@@ -70,7 +70,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
 
-    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class);
 
     private boolean useSwashbuckle = true;
     private boolean pocoModels = false;
@@ -94,7 +94,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private boolean useDefaultRouting = true;
     private String newtonsoftVersion = "3.0.0";
 
-    public AspNetCoreServerCodegen() {
+    public AspNetServerCodegen() {
         super();
 
         // TODO: AspnetCore community review

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java → modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -47,7 +47,7 @@
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 @SuppressWarnings("Duplicates")
-public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
+public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected String apiName = "Api";
 
     // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
@@ -79,7 +79,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
     protected static final String NET_70_OR_LATER = "net70OrLater";
 
     @SuppressWarnings("hiding")
-    private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreClientCodegen.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
     private static final List<FrameworkStrategy> frameworkStrategies = Arrays.asList(
             FrameworkStrategy.NETSTANDARD_1_3,
             FrameworkStrategy.NETSTANDARD_1_4,
@@ -126,7 +126,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
     protected boolean needsCustomHttpMethod = false;
     protected boolean needsUriBuilder = false;
 
-    public CSharpNetCoreClientCodegen() {
+    public CSharpClientCodegen() {
         super();
 
         modifyFeatureSet(features -> features
@@ -1311,7 +1311,7 @@ private void syncStringProperty(final Map<String, Object> additionalProperties,
     @SuppressWarnings("Duplicates")
     private static abstract class FrameworkStrategy {
 
-        private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreClientCodegen.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
 
         static FrameworkStrategy NETSTANDARD_1_3 = new FrameworkStrategy("netstandard1.3", ".NET Standard 1.3", "net7.0") {
         };

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java → modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java

@@ -40,7 +40,7 @@
 
 import static java.util.UUID.randomUUID;
 
-public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
+public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
 
     public static final String NET_CORE_VERSION = "netCoreVersion";
     public static final String AZURE_FUNCTIONS_VERSION = "azureFunctionsVersion";
@@ -61,7 +61,7 @@ public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
 
-    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class);
 
     protected int serverPort = 8080;
     protected String serverHost = "0.0.0.0";
@@ -80,7 +80,7 @@ public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
     private boolean useNewtonsoft = true;
     private String newtonsoftVersion = "3.0.0";
 
-    public CsharpNetcoreFunctionsServerCodegen() {
+    public CSharpFunctionsServerCodegen() {
         super();
 
         // TODO: AspnetCore community review

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java → modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java

@@ -42,7 +42,7 @@
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 @SuppressWarnings("Duplicates")
-public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
+public class CSharpReducedClientCodegen 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";
@@ -60,7 +60,7 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
     protected static final String TARGET_FRAMEWORK_VERSION = "targetFrameworkVersion";
 
     @SuppressWarnings("hiding")
-    private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreReducedClientCodegen.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(CSharpReducedClientCodegen.class);
     private static final List<FrameworkStrategy> frameworkStrategies = Arrays.asList(
             FrameworkStrategy.NETSTANDARD_1_3,
             FrameworkStrategy.NETSTANDARD_1_4,
@@ -105,7 +105,7 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
     protected boolean needsCustomHttpMethod = false;
     protected boolean needsUriBuilder = false;
 
-    public CSharpNetCoreReducedClientCodegen() {
+    public CSharpReducedClientCodegen() {
         super();
 
         modifyFeatureSet(features -> features
@@ -971,7 +971,7 @@ private void syncStringProperty(final Map<String, Object> additionalProperties,
     @SuppressWarnings("Duplicates")
     private static abstract class FrameworkStrategy {
 
-        private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreReducedClientCodegen.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(CSharpReducedClientCodegen.class);
 
         static FrameworkStrategy NETSTANDARD_1_3 = new FrameworkStrategy("netstandard1.3", ".NET Standard 1.3 compatible", "netcoreapp2.0") {
         };

modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig

@@ -4,7 +4,7 @@ org.openapitools.codegen.languages.AndroidClientCodegen
 org.openapitools.codegen.languages.Apache2ConfigCodegen
 org.openapitools.codegen.languages.ApexClientCodegen
 org.openapitools.codegen.languages.AsciidocDocumentationCodegen
-org.openapitools.codegen.languages.AspNetCoreServerCodegen
+org.openapitools.codegen.languages.AspNetServerCodegen
 org.openapitools.codegen.languages.AvroSchemaCodegen
 org.openapitools.codegen.languages.BashClientCodegen
 org.openapitools.codegen.languages.CrystalClientCodegen
@@ -20,8 +20,8 @@ org.openapitools.codegen.languages.CppRestSdkClientCodegen
 org.openapitools.codegen.languages.CppTinyClientCodegen
 org.openapitools.codegen.languages.CppTizenClientCodegen
 org.openapitools.codegen.languages.CppUE4ClientCodegen
-org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
-org.openapitools.codegen.languages.CsharpNetcoreFunctionsServerCodegen
+org.openapitools.codegen.languages.CSharpClientCodegen
+org.openapitools.codegen.languages.CSharpFunctionsServerCodegen
 org.openapitools.codegen.languages.DartClientCodegen
 org.openapitools.codegen.languages.DartDioClientCodegen
 org.openapitools.codegen.languages.EiffelClientCodegen

modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java → modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java

@@ -21,16 +21,16 @@
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.openapitools.codegen.languages.JavaClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class CSharpNetCoreClientCodegenTest {
+public class CSharpClientCodegenTest {
 
     @Test
     public void testToEnumVarName() throws Exception {
-        final CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.processOpts();
 
         Assert.assertEquals(codegen.toEnumVarName("FooBar", "string"), "FooBar");
@@ -48,7 +48,7 @@ public void testToEnumVarName() throws Exception {
     public void testUnsigned() {
         // test unsigned integer/long
         final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/unsigned-test.yaml");
-        CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        CSharpClientCodegen codegen = new CSharpClientCodegen();
 
         Schema test1 = openAPI.getComponents().getSchemas().get("format_test");
         codegen.setOpenAPI(openAPI);

modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java → modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientDeepObjectTest.java

@@ -22,7 +22,7 @@
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -32,7 +32,7 @@
 
 import static org.openapitools.codegen.TestUtils.assertFileContains;
 
-public class CSharpNetCoreClientDeepObjectTest {
+public class CSharpClientDeepObjectTest {
 
     @Test
     public void deepObject() throws IOException {
@@ -43,7 +43,7 @@ public void deepObject() throws IOException {
         OpenAPI openAPI = new OpenAPIParser()
                 .readLocation("src/test/resources/3_0/deepobject.yaml", null, new ParseOptions()).getOpenAPI();
 
-        CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.setOutputDir(output.getAbsolutePath());
 
         ClientOptInput input = new ClientOptInput();

modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CsharpModelEnumTest.java → modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelEnumTest.java

@@ -24,16 +24,16 @@
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.AspNetCoreServerCodegen;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.AspNetServerCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-public class CsharpModelEnumTest {
+public class CSharpModelEnumTest {
     // TODO there's no parent/child method in ComposeSchema so we will need to revise the code
     // before we can re-enable the test case below
     @Test(description = "not override identical parent enums", enabled = false)
@@ -69,7 +69,7 @@ public void overrideEnumTest() {
                 .child(subModel)
                 .interfaces(new ArrayList<RefModel>());
                 */
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         final Map<String, Schema> allModels = new HashMap<>();
         allModels.put("ParentModel", parentModel);
         allModels.put("SubModel", subModel);
@@ -95,7 +95,7 @@ public void overrideEnumTest() {
 
     @Test(description = "use custom suffixes for enums")
     public void useCustomEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
         codegen.setEnumNameSuffix("EnumName");
         codegen.setEnumValueSuffix("EnumValue");
 
@@ -114,7 +114,7 @@ public void useCustomEnumSuffixes() {
 
     @Test(description = "use default suffixes for enums")
     public void useDefaultEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
 
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml");
         codegen.setOpenAPI(openAPI);
@@ -131,7 +131,7 @@ public void useDefaultEnumSuffixes() {
 
     @Test(description = "support empty suffixes for enums")
     public void useEmptyEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
         codegen.setEnumNameSuffix("");
         codegen.setEnumValueSuffix("");