Code quality fixes.

Author: darrelmiller

src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs

@@ -27,7 +27,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
             CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetService(typeof(CancellationToken));
 
             using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
-            var logger = loggerFactory.CreateLogger<OpenApiService>();
+            var logger = loggerFactory.CreateLogger("Hidi.PluginCommandHandler");
             try
             {
                 await OpenApiService.PluginManifest(hidiOptions, logger, cancellationToken);

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -35,7 +35,7 @@
 
 namespace Microsoft.OpenApi.Hidi
 {
-    internal class OpenApiService
+    internal static class OpenApiService
     {
         /// <summary>
         /// Implementation of the transform command
@@ -134,7 +134,7 @@ private static async Task<ApiDependency> FindApiDependency(string apiManifestPat
                 {
                     apiManifest = ApiManifestDocument.Load(JsonDocument.Parse(fileStream).RootElement);
                 }
-                
+
                 apiDependency = apiDependencyName != null ? apiManifest.ApiDependencies[apiDependencyName] : apiManifest.ApiDependencies.First().Value;
             }
 
@@ -146,7 +146,7 @@ private static OpenApiDocument ApplyFilters(HidiOptions options, ILogger logger,
             Dictionary<string, List<string>> requestUrls = null;
             if (apiDependency != null)
             {
-                requestUrls = GetRequestUrlsFromManifest(apiDependency, document);
+                requestUrls = GetRequestUrlsFromManifest(apiDependency);
             }
             else if (postmanCollection != null)
             {
@@ -159,7 +159,7 @@ private static OpenApiDocument ApplyFilters(HidiOptions options, ILogger logger,
                                                     options.FilterOptions.FilterByTags,
                                                     requestUrls,
                                                     document,
-                                                     logger, cancellationToken);
+                                                     logger);
             if (predicate != null)
             {
                 var stopwatch = new Stopwatch();
@@ -242,7 +242,7 @@ private static async Task<OpenApiDocument> GetOpenApi(string openapi, string csd
             return document;
         }
 
-        private static Func<string, OperationType?, OpenApiOperation, bool> FilterOpenApiDocument(string filterbyoperationids, string filterbytags, Dictionary<string, List<string>> requestUrls, OpenApiDocument document, ILogger logger, CancellationToken cancellationToken)
+        private static Func<string, OperationType?, OpenApiOperation, bool> FilterOpenApiDocument(string filterbyoperationids, string filterbytags, Dictionary<string, List<string>> requestUrls, OpenApiDocument document, ILogger logger)
         {
             Func<string, OperationType?, OpenApiOperation, bool> predicate = null;
 
@@ -275,9 +275,9 @@ private static async Task<OpenApiDocument> GetOpenApi(string openapi, string csd
             return predicate;
         }
 
-        private static Dictionary<string, List<string>> GetRequestUrlsFromManifest(ApiDependency apiDependency, OpenApiDocument document)
+        private static Dictionary<string, List<string>> GetRequestUrlsFromManifest(ApiDependency apiDependency)
         {
-            // Get the request URLs from the API Dependencies in the API manifest that have a baseURL that matches the server URL in the OpenAPI document
+            // Get the request URLs from the API Dependencies in the API manifest 
             var requests = apiDependency
                     .Requests.Where(r => !r.Exclude)
                                 .Select(r=> new { UriTemplate= r.UriTemplate, Method=r.Method } )
@@ -696,18 +696,19 @@ internal static void WriteTreeDocumentAsHtml(string sourceUrl, OpenApiDocument d
             writer.WriteLine("</html");
         }
 
-        internal async static Task PluginManifest(HidiOptions options, ILogger<OpenApiService> logger, CancellationToken cancellationToken)
+        internal async static Task PluginManifest(HidiOptions options, ILogger logger, CancellationToken cancellationToken)
         {
                 // If ApiManifest is provided, set the referenced OpenAPI document
                 var apiDependency = await FindApiDependency(options.FilterOptions?.FilterByApiManifest, logger, cancellationToken);
                 if (apiDependency != null) {
                     options.OpenApi = apiDependency.ApiDescripionUrl;
                 }   
 
-                
                 // Load OpenAPI document
                 OpenApiDocument document = await GetOpenApi(options.OpenApi, options.Csdl, options.CsdlFilter, options.SettingsConfig, options.InlineExternal, logger, cancellationToken, options.MetadataVersion);
 
+                cancellationToken.ThrowIfCancellationRequested();
+
                 if (options.FilterOptions != null)
                 {
                     document = ApplyFilters(options, logger, apiDependency, null, document, cancellationToken);

src/Microsoft.OpenApi/Services/OpenApiFilterService.cs

@@ -346,7 +346,8 @@ private static bool AddReferences(OpenApiComponents newComponents, OpenApiCompon
         private static string ExtractPath(string url, IList<OpenApiServer> serverList)
         {
             // if OpenAPI has servers, then see if the url matches one of them
-            var baseUrl = serverList.Select(s => s.Url.TrimEnd('/')).Where(c => url.Contains(c)).FirstOrDefault();
+            var baseUrl = serverList.Select(s => s.Url.TrimEnd('/'))
+                                    .FirstOrDefault(c => url.Contains(c));
 
             return baseUrl == null ? 
                     new Uri(new Uri("http://localhost/"), url).GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped)