Refactor code

Author: MaggieKimani1

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

@@ -50,8 +50,8 @@ public async Task<int> InvokeAsync(InvocationContext context)
             string filterbycollection = context.ParseResult.GetValueForOption(FilterByCollectionOption);
             CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetService(typeof(CancellationToken));
 
-            var logger = Logger.ConfigureLogger(logLevel);
-
+            using var loggerFactory = Logger.ConfigureLogger(logLevel);
+            var logger = loggerFactory.CreateLogger<OpenApiService>();
             try
             {
                 await OpenApiService.TransformOpenApiDocument(openapi, csdl, csdlFilter, output, cleanOutput, version, format, terseOutput, logLevel, inlineLocal, inlineExternal, filterbyoperationids, filterbytags, filterbycollection, cancellationToken);

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

@@ -26,8 +26,8 @@ public async Task<int> InvokeAsync(InvocationContext context)
             CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetService(typeof(CancellationToken));
 
 
-            var logger = Logger.ConfigureLogger(logLevel);
-
+            using var loggerFactory = Logger.ConfigureLogger(logLevel);
+            var logger = loggerFactory.CreateLogger<OpenApiService>();
             try
             {
                 await OpenApiService.ValidateOpenApiDocument(openapi, logLevel, cancellationToken);

src/Microsoft.OpenApi.Hidi/Logger.cs

@@ -7,14 +7,14 @@ namespace Microsoft.OpenApi.Hidi
 {
     public class Logger
     {
-        public static ILogger<OpenApiService> ConfigureLogger(LogLevel logLevel)
+        public static ILoggerFactory ConfigureLogger(LogLevel logLevel)
         {
             // Configure logger options
 #if DEBUG
             logLevel = logLevel > LogLevel.Debug ? LogLevel.Debug : logLevel;
 #endif
 
-            using var loggerFactory = LoggerFactory.Create((builder) =>
+            return LoggerFactory.Create((builder) =>
             {
                 builder
                     .AddSimpleConsole(c =>
@@ -26,10 +26,6 @@ public static ILogger<OpenApiService> ConfigureLogger(LogLevel logLevel)
 #endif
                     .SetMinimumLevel(logLevel);
             });
-
-            var logger = loggerFactory.CreateLogger<OpenApiService>();
-
-            return logger;
         }
     }
 }

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
@@ -44,7 +44,7 @@ public static async Task TransformOpenApiDocument(
             string? version,
             OpenApiFormat? format,
             bool terseOutput,
-            LogLevel loglevel,
+            LogLevel logLevel,
             bool inlineLocal,
             bool inlineExternal,
             string filterbyoperationids,
@@ -53,8 +53,8 @@ public static async Task TransformOpenApiDocument(
             CancellationToken cancellationToken
            )
         {
-            var logger = Logger.ConfigureLogger(loglevel);
-
+            using var loggerFactory = Logger.ConfigureLogger(logLevel);
+            var logger = loggerFactory.CreateLogger<OpenApiService>();
             try
             {
                 if (string.IsNullOrEmpty(openapi) && string.IsNullOrEmpty(csdl))
@@ -246,11 +246,11 @@ private static Stream ApplyFilter(string csdl, string entitySetOrSingleton, XslC
         /// </summary>
         public static async Task ValidateOpenApiDocument(
             string openapi, 
-            LogLevel loglevel, 
+            LogLevel logLevel, 
             CancellationToken cancellationToken)
         {
-            var logger = Logger.ConfigureLogger(loglevel);
-
+            using var loggerFactory = Logger.ConfigureLogger(logLevel);
+            var logger = loggerFactory.CreateLogger<OpenApiService>();
             try
             {
                 if (string.IsNullOrEmpty(openapi))
@@ -578,7 +578,7 @@ private static ILoggerFactory ConfigureLoggerInstance(LogLevel loglevel)
             loglevel = loglevel > LogLevel.Debug ? LogLevel.Debug : loglevel;
 #endif
 
-            return LoggerFactory.Create((builder) => {
+            return Microsoft.Extensions.Logging.LoggerFactory.Create((builder) => {
                 builder
                     .AddSimpleConsole(c => {
                         c.IncludeScopes = true;