remove obsolete stuff

RicoSuter · Sep 28, 2023 · a432103 · a432103
1 parent 06f635a
commit a432103
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 31 deletions.
diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpClientCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpClientCommand.cs
@@ -19,15 +19,9 @@
 namespace NSwag.Commands.CodeGeneration
 {
     [Command(Name = "openapi2csclient", Description = "Generates CSharp client code from a Swagger/OpenAPI specification.")]
-    public class OpenApiToCSharpClientCommand : SwaggerToCSharpClientCommand
+    public class OpenApiToCSharpClientCommand : OpenApiToCSharpCommandBase<CSharpClientGeneratorSettings>
     {
-    }
-
-    [Command(Name = "swagger2csclient", Description = "Generates CSharp client code from a Swagger/OpenAPI specification (obsolete: use openapi2csclient instead).")]
-    [Obsolete("Use openapi2csclient instead.")]
-    public class SwaggerToCSharpClientCommand : OpenApiToCSharpCommandBase<CSharpClientGeneratorSettings>
-    {
-        public SwaggerToCSharpClientCommand() : base(new CSharpClientGeneratorSettings())
+        public OpenApiToCSharpClientCommand() : base(new CSharpClientGeneratorSettings())
         {
         }
 

diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpControllerCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpControllerCommand.cs
@@ -17,15 +17,9 @@
 namespace NSwag.Commands.CodeGeneration
 {
     [Command(Name = "openapi2cscontroller", Description = "Generates CSharp Web API controller code from a Swagger/OpenAPI specification.")]
-    public class OpenApiToCSharpControllerCommand : SwaggerToCSharpControllerCommand
+    public class OpenApiToCSharpControllerCommand : OpenApiToCSharpCommandBase<CSharpControllerGeneratorSettings>
     {
-    }
-
-    [Command(Name = "swagger2cscontroller", Description = "Generates CSharp Web API controller code from a Swagger/OpenAPI specification (obsolete: use openapi2cscontroller instead).")]
-    [Obsolete("Use openapi2cscontroller instead.")]
-    public class SwaggerToCSharpControllerCommand : OpenApiToCSharpCommandBase<CSharpControllerGeneratorSettings>
-    {
-        public SwaggerToCSharpControllerCommand() : base(new CSharpControllerGeneratorSettings())
+        public OpenApiToCSharpControllerCommand() : base(new CSharpControllerGeneratorSettings())
         {
         }
 

diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs
@@ -18,15 +18,9 @@
 namespace NSwag.Commands.CodeGeneration
 {
     [Command(Name = "openapi2tsclient", Description = "Generates TypeScript client code from a Swagger/OpenAPI specification.")]
-    public class OpenApiToTypeScriptClientCommand : SwaggerToTypeScriptClientCommand
+    public class OpenApiToTypeScriptClientCommand : CodeGeneratorCommandBase<TypeScriptClientGeneratorSettings>
     {
-    }
-
-    [Command(Name = "swagger2tsclient", Description = "Generates TypeScript client code from a Swagger/OpenAPI specification (obsolete: use openapi2tsclient instead).")]
-    [Obsolete("Use openapi2tsclient instead.")]
-    public class SwaggerToTypeScriptClientCommand : CodeGeneratorCommandBase<TypeScriptClientGeneratorSettings>
-    {
-        public SwaggerToTypeScriptClientCommand()
+        public OpenApiToTypeScriptClientCommand()
             : base(new TypeScriptClientGeneratorSettings())
         {
         }

diff --git a/src/NSwag.Commands/NSwagCommandProcessor.cs b/src/NSwag.Commands/NSwagCommandProcessor.cs
@@ -54,7 +54,7 @@ public async Task<int> ProcessAsync(string[] args)
             {
                 var processor = new CommandLineProcessor(_host);
 
-                processor.RegisterCommandsFromAssembly(typeof(SwaggerToCSharpControllerCommand).GetTypeInfo().Assembly);
+                processor.RegisterCommandsFromAssembly(typeof(OpenApiToCSharpControllerCommand).GetTypeInfo().Assembly);
 
                 var stopwatch = new Stopwatch();
                 stopwatch.Start();

diff --git a/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToCSharpClientGeneratorViewModel.cs b/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToCSharpClientGeneratorViewModel.cs
@@ -17,10 +17,10 @@ namespace NSwagStudio.ViewModels.CodeGenerators
     public class SwaggerToCSharpClientGeneratorViewModel : ViewModelBase
     {
         private string _clientCode;
-        private SwaggerToCSharpClientCommand _command = new SwaggerToCSharpClientCommand();
+        private OpenApiToCSharpClientCommand _command = new OpenApiToCSharpClientCommand();
 
         /// <summary>Gets the settings.</summary>
-        public SwaggerToCSharpClientCommand Command
+        public OpenApiToCSharpClientCommand Command
         {
             get { return _command; }
             set

diff --git a/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToCSharpControllerGeneratorViewModel.cs b/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToCSharpControllerGeneratorViewModel.cs
@@ -18,10 +18,10 @@ namespace NSwagStudio.ViewModels.CodeGenerators
     public class SwaggerToCSharpControllerGeneratorViewModel : ViewModelBase
     {
         private string _clientCode;
-        private SwaggerToCSharpControllerCommand _command = new SwaggerToCSharpControllerCommand();
+        private OpenApiToCSharpControllerCommand _command = new OpenApiToCSharpControllerCommand();
 
         /// <summary>Gets the settings.</summary>
-        public SwaggerToCSharpControllerCommand Command
+        public OpenApiToCSharpControllerCommand Command
         {
             get { return _command; }
             set

diff --git a/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToTypeScriptClientGeneratorViewModel.cs b/src/NSwagStudio/ViewModels/CodeGenerators/SwaggerToTypeScriptClientGeneratorViewModel.cs
@@ -18,10 +18,10 @@ namespace NSwagStudio.ViewModels.CodeGenerators
     public class SwaggerToTypeScriptClientGeneratorViewModel : ViewModelBase
     {
         private string _clientCode;
-        private SwaggerToTypeScriptClientCommand _command = new SwaggerToTypeScriptClientCommand();
+        private OpenApiToTypeScriptClientCommand _command = new OpenApiToTypeScriptClientCommand();
 
         /// <summary>Gets the settings.</summary>
-        public SwaggerToTypeScriptClientCommand Command
+        public OpenApiToTypeScriptClientCommand Command
         {
             get { return _command; }
             set