Code cleanup

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -356,57 +356,7 @@ public static OpenApiDocument FixReferences(OpenApiDocument document)
 
             return doc;
         }
-
-        private static async Task<Stream> GetStream(string input, ILogger logger)
-        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-
-            Stream stream;
-            if (input.StartsWith("http"))
-            {
-                try
-                {
-                    var httpClientHandler = new HttpClientHandler()
-                    {
-                        SslProtocols = System.Security.Authentication.SslProtocols.Tls12,
-                    };
-                    using var httpClient = new HttpClient(httpClientHandler)
-                    {
-                      DefaultRequestVersion = HttpVersion.Version20
-                    };
-                    stream = await httpClient.GetStreamAsync(input);
-                }
-                catch (HttpRequestException ex)
-                {
-                    logger.LogError($"Could not download the file at {input}, reason{ex}");
-                    return null;
-                }
-            }
-            else 
-            {
-                try
-                {
-                    var fileInput = new FileInfo(input);
-                    stream = fileInput.OpenRead();
-                }
-                catch (Exception ex) when (ex is FileNotFoundException ||
-                    ex is PathTooLongException ||
-                    ex is DirectoryNotFoundException ||
-                    ex is IOException ||
-                    ex is UnauthorizedAccessException ||
-                    ex is SecurityException ||
-                    ex is NotSupportedException)
-                {
-                    logger.LogError($"Could not open the file at {input}, reason: {ex.Message}");
-                    return null;
-                }
-            }
-            stopwatch.Stop();
-            logger.LogTrace("{timestamp}ms: Read file {input}", stopwatch.ElapsedMilliseconds, input);
-            return stream;
-        }
-
+        
         /// <summary>
         /// Takes in a file stream, parses the stream into a JsonDocument and gets a list of paths and Http methods
         /// </summary>
@@ -462,34 +412,6 @@ private static Dictionary<string, List<string>> EnumerateJsonDocument(JsonElemen
             return paths;
         }
 
-        /// <summary>
-        /// Fixes the references in the resulting OpenApiDocument.
-        /// </summary>
-        /// <param name="document"> The converted OpenApiDocument.</param>
-        /// <returns> A valid OpenApiDocument instance.</returns>
-        // private static OpenApiDocument FixReferences2(OpenApiDocument document)
-        // {
-        //     // This method is only needed because the output of ConvertToOpenApi isn't quite a valid OpenApiDocument instance.
-        //     // So we write it out, and read it back in again to fix it up.
-
-        //     OpenApiDocument document;
-        //     logger.LogTrace("Parsing the OpenApi file");
-        //     var result = await new OpenApiStreamReader(new OpenApiReaderSettings
-        //     {
-        //         RuleSet = ValidationRuleSet.GetDefaultRuleSet(),
-        //         BaseUrl = new Uri(openapi)
-        //     }
-        //     ).ReadAsync(stream);
-
-        //     document = result.OpenApiDocument;
-        //     var context = result.OpenApiDiagnostic;
-        //     var sb = new StringBuilder();
-        //     document.SerializeAsV3(new OpenApiYamlWriter(new StringWriter(sb)));
-        //     var doc = new OpenApiStringReader().Read(sb.ToString(), out _);
-
-        //     return doc;
-        // }
-
         /// <summary>
         /// Reads stream from file system or makes HTTP request depending on the input string
         /// </summary>

src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

@@ -45,16 +45,6 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
             var reader = new StreamReader(input);
             var result = new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
 
-            //HashAlgorithm sha = SHA512.Create();
-            //byte[] data = sha.ComputeHash(input);
-            //StringBuilder sb = new StringBuilder();
-            //for (int i = 0; i < data.Length; i++)
-            //{
-            //    sb.Append(data[i].ToString("X2"));
-            //}
-            
-
-            //diagnostic.HashCode = sb.ToString();
             diagnostic.HashCode = OpenApiDocument.GenerateHashValue(input);
 
             if (!_settings.LeaveStreamOpen)

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.OpenApi.Exceptions;
@@ -66,8 +65,6 @@ public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible
         /// </summary>
         public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
 
-        private static readonly object locker = new();
-
         /// <summary>
         /// Parameter-less constructor
         /// </summary>
@@ -381,27 +378,11 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
             return ResolveReference(reference, false);
         }
 
-        ///// <summary>
-        ///// Computes the hash code for an OpenApiDocument and its property values.
-        ///// </summary>
-        ///// <returns> The hash code.</returns>
-        //public override int GetHashCode()
-        //{
-        //    // select two random prime numbers e.g 1 and 3 and use them to compute hash codes
-        //    int hash = 1;
-        //    hash = hash * 3 + (Workspace == null ? 0 : Workspace.GetHashCode());
-        //    hash = hash * 3 + (Info == null ? 0 : Info.GetHashCode());
-        //    hash = hash * 3 + (Servers == null ? 0 : Servers.GetHashCode());
-        //    hash = hash * 3 + (Paths == null ? 0 : Paths.GetHashCode());
-        //    hash = hash * 3 + (Components == null ? 0 : Components.GetHashCode());
-        //    hash = hash * 3 + (SecurityRequirements == null ? 0 : SecurityRequirements.GetHashCode());
-        //    hash = hash * 3 + (Tags == null ? 0 : Tags.GetHashCode());
-        //    hash = hash * 3 + (ExternalDocs == null ? 0 : ExternalDocs.GetHashCode());
-        //    hash = hash * 3 + (Extensions == null ? 0 : Extensions.GetHashCode());
-
-        //    return hash;
-        //}
-
+        /// <summary>
+        /// Uses the stream input to generate the hash value of an OpenApi document 
+        /// </summary>
+        /// <param name="input">Stream containing OpenAPI description to hash.</param>
+        /// <returns>The hash value.</returns>
         public static string GenerateHashValue(Stream input)
         {
             HashAlgorithm sha = SHA512.Create();