Fixed issues identified by sonarCube

Author: darrelmiller

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -149,35 +149,29 @@ private static string RemoveKeyTypeSegment(string operationId, IList<OpenApiPara
             foreach (var parameter in parameters)
             {
                 var keyTypeExtension = parameter.Extensions.GetExtension("x-ms-docs-key-type");
-                if (keyTypeExtension != null)
+                if (keyTypeExtension != null && operationId.Contains(keyTypeExtension))
                 {
-                    if (operationId.Contains(keyTypeExtension))
-                    {
-                        segments.Remove(keyTypeExtension);
-                    }
+                    segments.Remove(keyTypeExtension);
                 }
             }
             return string.Join(".", segments);
         }
 
         private static IList<OpenApiParameter> ResolveFunctionParameters(IList<OpenApiParameter> parameters)
         {
-            foreach (var parameter in parameters)
+            foreach (var parameter in parameters.Where(p => p.Content?.Any() ?? false))
             {
-                if (parameter.Content?.Any() ?? false)
+                // Replace content with a schema object of type array
+                // for structured or collection-valued function parameters
+                parameter.Content = null;
+                parameter.Schema = new OpenApiSchema
                 {
-                    // Replace content with a schema object of type array
-                    // for structured or collection-valued function parameters
-                    parameter.Content = null;
-                    parameter.Schema = new OpenApiSchema
+                    Type = "array",
+                    Items = new OpenApiSchema
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
-                        {
-                            Type = "string"
-                        }
-                    };
-                }
+                        Type = "string"
+                    }
+                };
             }
             return parameters;
         }

src/Microsoft.OpenApi.Hidi/Options/CommandOptions.cs

@@ -8,24 +8,24 @@ namespace Microsoft.OpenApi.Hidi.Options
     internal class CommandOptions
     {
         // command option parameters and aliases
-        public Option<string> OpenApiDescriptionOption = new("--openapi", "Input OpenAPI description file path or URL");
-        public Option<string> CsdlOption = new("--csdl", "Input CSDL file path or URL");
-        public Option<string> CsdlFilterOption = new("--csdl-filter", "Comma delimited list of EntitySets or Singletons to filter CSDL on. e.g. tasks,accounts");
-        public Option<FileInfo> OutputOption = new("--output", "The output file path for the generated file.") { Arity = ArgumentArity.ZeroOrOne };
-        public Option<string> OutputFolderOption = new("--output-folder", "The output directory path for the generated files.") { Arity = ArgumentArity.ZeroOrOne };
-        public Option<bool> CleanOutputOption = new("--clean-output", "Overwrite an existing file");
-        public Option<string> VersionOption = new("--version", "OpenAPI specification version");
-        public Option<string> MetadataVersionOption = new("--metadata-version", "Graph metadata version to use.");
-        public Option<OpenApiFormat?> FormatOption = new("--format", "File format");
-        public Option<bool> TerseOutputOption = new("--terse-output", "Produce terse json output");
-        public Option<string> SettingsFileOption = new("--settings-path", "The configuration file with CSDL conversion settings.");
-        public Option<LogLevel> LogLevelOption = new("--log-level", () => LogLevel.Information, "The log level to use when logging messages to the main output.");
-        public Option<string> FilterByOperationIdsOption = new("--filter-by-operationids", "Filters OpenApiDocument by comma delimited list of OperationId(s) provided");
-        public Option<string> FilterByTagsOption = new("--filter-by-tags", "Filters OpenApiDocument by comma delimited list of Tag(s) provided. Also accepts a single regex.");
-        public Option<string> FilterByCollectionOption = new("--filter-by-collection", "Filters OpenApiDocument by Postman collection provided. Provide path to collection file.");
-        public Option<string> ManifestOption = new("--manifest", "Path to API manifest file to locate and filter an OpenApiDocument");
-        public Option<bool> InlineLocalOption = new("--inline-local", "Inline local $ref instances");
-        public Option<bool> InlineExternalOption = new("--inline-external", "Inline external $ref instances");
+        public readonly Option<string> OpenApiDescriptionOption = new("--openapi", "Input OpenAPI description file path or URL");
+        public readonly Option<string> CsdlOption = new("--csdl", "Input CSDL file path or URL");
+        public readonly Option<string> CsdlFilterOption = new("--csdl-filter", "Comma delimited list of EntitySets or Singletons to filter CSDL on. e.g. tasks,accounts");
+        public readonly Option<FileInfo> OutputOption = new("--output", "The output file path for the generated file.") { Arity = ArgumentArity.ZeroOrOne };
+        public readonly Option<string> OutputFolderOption = new("--output-folder", "The output directory path for the generated files.") { Arity = ArgumentArity.ZeroOrOne };
+        public readonly Option<bool> CleanOutputOption = new("--clean-output", "Overwrite an existing file");
+        public readonly Option<string> VersionOption = new("--version", "OpenAPI specification version");
+        public readonly Option<string> MetadataVersionOption = new("--metadata-version", "Graph metadata version to use.");
+        public readonly Option<OpenApiFormat?> FormatOption = new("--format", "File format");
+        public readonly Option<bool> TerseOutputOption = new("--terse-output", "Produce terse json output");
+        public readonly Option<string> SettingsFileOption = new("--settings-path", "The configuration file with CSDL conversion settings.");
+        public readonly Option<LogLevel> LogLevelOption = new("--log-level", () => LogLevel.Information, "The log level to use when logging messages to the main output.");
+        public readonly Option<string> FilterByOperationIdsOption = new("--filter-by-operationids", "Filters OpenApiDocument by comma delimited list of OperationId(s) provided");
+        public readonly Option<string> FilterByTagsOption = new("--filter-by-tags", "Filters OpenApiDocument by comma delimited list of Tag(s) provided. Also accepts a single regex.");
+        public readonly Option<string> FilterByCollectionOption = new("--filter-by-collection", "Filters OpenApiDocument by Postman collection provided. Provide path to collection file.");
+        public readonly Option<string> ManifestOption = new("--manifest", "Path to API manifest file to locate and filter an OpenApiDocument");
+        public readonly Option<bool> InlineLocalOption = new("--inline-local", "Inline local $ref instances");
+        public readonly Option<bool> InlineExternalOption = new("--inline-external", "Inline external $ref instances");
 
         public CommandOptions()
         {

src/Microsoft.OpenApi/Services/OpenApiFilterService.cs

@@ -334,13 +334,11 @@ private static bool AddReferences(OpenApiComponents newComponents, OpenApiCompon
                 }
             }
 
-            foreach (var item in newComponents.RequestBodies)
+            foreach (var item in newComponents.RequestBodies
+                                        .Where(item => !target.RequestBodies.ContainsKey(item.Key))) 
             {
-                if (!target.RequestBodies.ContainsKey(item.Key))
-                {
                     moreStuff = true;
                     target.RequestBodies.Add(item);
-                }
             }
             return moreStuff;
         }
@@ -350,13 +348,9 @@ 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();
 
-            if (baseUrl == null) {
-                // if no match, then extract path from either the absolute or relative url
-                return new Uri(new Uri("http://localhost/"), url).GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped);
-            } else {
-                // if match, then extract path from the url relative to the matched server
-                return url.Split(new[] { baseUrl }, StringSplitOptions.None)[1];
-            }
+            return baseUrl == null ? 
+                    new Uri(new Uri("http://localhost/"), url).GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped) 
+                    : url.Split(new[] { baseUrl }, StringSplitOptions.None)[1];
         }
     }
 }