CLI add ':' to prepend operation processors (RicoSuter#2627)

* Prepend operation processor if starting with ':'. * Update argument description. * Cleanup. * Update argument description.
FelixS90 · Jan 16, 2020 · 9ec7d10 · 9ec7d10
1 parent ba726d2
commit 9ec7d10
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs b/src/NSwag.Commands/Commands/Generation/OpenApiGeneratorCommandBase.cs
@@ -177,22 +177,22 @@ public string InfoVersion
         [Argument(Name = "DocumentTemplate", IsRequired = false, Description = "Specifies the Swagger document template (may be a path or JSON, default: none).")]
         public string DocumentTemplate { get; set; }
 
-        [Argument(Name = "DocumentProcessors", IsRequired = false, Description = "The document processor type names in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "DocumentProcessors", IsRequired = false, Description = "The document processor type names in the form 'assemblyName:fullTypeName' or 'fullTypeName'.")]
         public string[] DocumentProcessorTypes { get; set; } = new string[0];
 
-        [Argument(Name = "OperationProcessors", IsRequired = false, Description = "The operation processor type names in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "OperationProcessors", IsRequired = false, Description = "The operation processor type names in the form 'assemblyName:fullTypeName' or 'fullTypeName' or ':assemblyName:fullTypeName' or ':fullTypeName'. Begin name with ':' to prepend processors (required when used to filter out other operations).")]
         public string[] OperationProcessorTypes { get; set; } = new string[0];
 
-        [Argument(Name = "TypeNameGenerator", IsRequired = false, Description = "The custom ITypeNameGenerator implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "TypeNameGenerator", IsRequired = false, Description = "The custom ITypeNameGenerator implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName'.")]
         public string TypeNameGeneratorType { get; set; }
 
-        [Argument(Name = "SchemaNameGenerator", IsRequired = false, Description = "The custom ISchemaNameGenerator implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "SchemaNameGenerator", IsRequired = false, Description = "The custom ISchemaNameGenerator implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName'.")]
         public string SchemaNameGeneratorType { get; set; }
 
-        [Argument(Name = "ContractResolver", IsRequired = false, Description = "DEPRECATED: The custom IContractResolver implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "ContractResolver", IsRequired = false, Description = "DEPRECATED: The custom IContractResolver implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName'.")]
         public string ContractResolverType { get; set; }
 
-        [Argument(Name = "SerializerSettings", IsRequired = false, Description = "The custom JsonSerializerSettings implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName').")]
+        [Argument(Name = "SerializerSettings", IsRequired = false, Description = "The custom JsonSerializerSettings implementation type in the form 'assemblyName:fullTypeName' or 'fullTypeName'.")]
         public string SerializerSettingsType { get; set; }
 
         [Argument(Name = "UseDocumentProvider", IsRequired = false, Description = "Generate document using SwaggerDocumentProvider (configuration from AddOpenApiDocument()/AddSwaggerDocument(), most CLI settings will be ignored).")]
@@ -358,10 +358,18 @@ protected void InitializeCustomTypes(AssemblyLoader.AssemblyLoader assemblyLoade
 
             if (OperationProcessorTypes != null)
             {
+                var prependIndex = 0;
                 foreach (var p in OperationProcessorTypes)
                 {
-                    var processor = (IOperationProcessor)assemblyLoader.CreateInstance(p);
-                    Settings.OperationProcessors.Add(processor);
+                    var processor = (IOperationProcessor)assemblyLoader.CreateInstance(p[0] == ':' ? p.Substring(1) : p);
+                    if (p[0] == ':')
+                    {
+                        Settings.OperationProcessors.Insert(prependIndex++, processor);
+                    }
+                    else
+                    {
+                        Settings.OperationProcessors.Add(processor);
+                    }
                 }
             }
 
@@ -442,4 +450,4 @@ private async Task<string> GetDocumentTemplateAsync(string workingDirectory)
             }
         }
     }
-}
+}
diff --git a/src/NSwag.Commands/Commands/Generation/WebApi/WebApiToOpenApiCommand.cs b/src/NSwag.Commands/Commands/Generation/WebApi/WebApiToOpenApiCommand.cs
@@ -24,13 +24,13 @@
 namespace NSwag.Commands.Generation.WebApi
 {
     /// <summary>The generator.</summary>
-    [Command(Name = "webapi2openapi", Description = "Generates a Swagger/OpenAPI specification for a controller or controlles contained in a .NET Web API assembly.")]
+    [Command(Name = "webapi2openapi", Description = "Generates a Swagger/OpenAPI specification for a controller or controllers contained in a .NET Web API assembly.")]
     public class WebApiToOpenApiCommand : WebApiToSwaggerCommand
     {
     }
 
     /// <summary>The generator.</summary>
-    [Command(Name = "webapi2swagger", Description = "Generates a Swagger/OpenAPI specification for a controller or controlles contained in a .NET Web API assembly (obsolete: use webapi2openapi instead).")]
+    [Command(Name = "webapi2swagger", Description = "Generates a Swagger/OpenAPI specification for a controller or controllers contained in a .NET Web API assembly (obsolete: use webapi2openapi instead).")]
     public class WebApiToSwaggerCommand : OpenApiGeneratorCommandBase<WebApiOpenApiDocumentGeneratorSettings>
     {
         /// <summary>Initializes a new instance of the <see cref="WebApiToSwaggerCommand"/> class.</summary>