Clean up code

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -83,21 +83,21 @@ string filterbycollection
             Stream stream;
             OpenApiDocument document;
             OpenApiFormat openApiFormat;
+            var stopwatch = new Stopwatch();
 
             if (!string.IsNullOrEmpty(csdl))
             {
                 // Default to yaml during csdl to OpenApi conversion
-                openApiFormat = format ?? GetOpenApiFormat(csdl);
+                openApiFormat = format ?? GetOpenApiFormat(csdl, logger);
 
-                stream = GetStream(csdl);
+                stream = await GetStream(csdl, logger);
                 document = ConvertCsdlToOpenApi(stream);
             }
             else
             {
-                stream = GetStream(openapi, logger);
+                stream = await GetStream(openapi, logger);
 
                 // Parsing OpenAPI file
-                var stopwatch = new Stopwatch();
                 stopwatch.Start();
                 logger.LogTrace("Parsing OpenApi file");
                 var result = new OpenApiStreamReader(new OpenApiReaderSettings
@@ -126,7 +126,7 @@ string filterbycollection
                     logger.LogTrace("{timestamp}ms: Parsed OpenApi successfully. {count} paths found.", stopwatch.ElapsedMilliseconds, document.Paths.Count);
                 }
 
-                openApiFormat = format ?? GetOpenApiFormat(openapi);
+                openApiFormat = format ?? GetOpenApiFormat(openapi, logger);
                 version ??= result.OpenApiDiagnostic.SpecificationVersion;
             }
 

src/Microsoft.OpenApi.Hidi/Program.cs

@@ -19,7 +19,7 @@ static async Task<int> Main(string[] args)
             var descriptionOption = new Option<string>("--openapi", "Input OpenAPI description file path or URL");
             descriptionOption.AddAlias("-d");
 
-            var csdlOption = new Option("--csdl", "Input CSDL file path or URL", typeof(string));
+            var csdlOption = new Option<string>("--csdl", "Input CSDL file path or URL");
             csdlOption.AddAlias("-cs");
 
             var outputOption = new Option<FileInfo>("--output", () => new FileInfo("./output"), "The output directory path for the generated file.") { Arity = ArgumentArity.ZeroOrOne };
@@ -72,8 +72,8 @@ static async Task<int> Main(string[] args)
                 resolveExternalOption,
             };
 
-            transformCommand.SetHandler<string, FileInfo, OpenApiSpecVersion?, OpenApiFormat?, LogLevel, bool, bool, string, string, string> (
-                OpenApiService.ProcessOpenApiDocument, descriptionOption, outputOption, versionOption, formatOption, logLevelOption, inlineOption, resolveExternalOption, filterByOperationIdsOption, filterByTagsOption, filterByCollectionOption);
+            transformCommand.SetHandler<string, string, FileInfo, OpenApiSpecVersion?, OpenApiFormat?, LogLevel, bool, bool, string, string, string> (
+                OpenApiService.ProcessOpenApiDocument, descriptionOption, csdlOption, outputOption, versionOption, formatOption, logLevelOption, inlineOption, resolveExternalOption, filterByOperationIdsOption, filterByTagsOption, filterByCollectionOption);
 
             rootCommand.Add(transformCommand);
             rootCommand.Add(validateCommand);