Code clean up

Author: MaggieKimani1

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using System;
 using System.IO;
 using System.Text.Json.Nodes;
 using System.Text.Json;
@@ -12,7 +11,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Validations;
 using System.Linq;
-using System.Collections.Generic;
 using Microsoft.OpenApi.Services;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Reader.Services;
@@ -95,7 +93,7 @@ public async Task<ReadResult> ReadAsync(JsonNode jsonNode,
                     }
                 }
 
-                ResolveReferences(diagnostic, document, settings);
+                SetHostDocument(document);
             }
             catch (OpenApiException ex)
             {
@@ -189,28 +187,6 @@ private JsonNode LoadJsonNodes(TextReader input)
             return nodes;
         }
 
-        private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document, OpenApiReaderSettings settings)
-        {
-            List<OpenApiError> errors = new();
-
-            // Resolve References if requested
-            switch (settings.ReferenceResolution)
-            {
-                case ReferenceResolutionSetting.ResolveAllReferences:
-                    throw new ArgumentException("Resolving external references is not supported");
-                case ReferenceResolutionSetting.ResolveLocalReferences:
-                    errors.AddRange(document.ResolveReferences());
-                    break;
-                case ReferenceResolutionSetting.DoNotResolveReferences:
-                    break;
-            }
-
-            foreach (var item in errors)
-            {
-                diagnostic.Errors.Add(item);
-            }
-        }
-
         private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken, OpenApiReaderSettings settings, string format = null)
         {
             // Create workspace for all documents to live in.
@@ -221,5 +197,10 @@ private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document,
             var workspaceLoader = new OpenApiWorkspaceLoader(openApiWorkSpace, settings.CustomExternalLoader ?? streamLoader, settings);
             return await workspaceLoader.LoadAsync(new OpenApiReference() { ExternalResource = "/" }, document, format ?? OpenApiConstants.Json, null, cancellationToken);
         }
+
+        private void SetHostDocument(OpenApiDocument document)
+        {
+            document.SetHostDocument();
+        }
     }
 }

test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using FluentAssertions;
@@ -17,6 +17,11 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V31Tests/Samples/OpenApiDocument/";
 
+        public OpenApiDocumentTests()
+        {
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+        }
+
         public static T Clone<T>(T element) where T : IOpenApiSerializable
         {
             using var stream = new MemoryStream();
@@ -177,7 +182,7 @@ public void ParseDocumentWithWebhooksShouldSucceed()
             };
 
             // Assert
-            var schema = actual.OpenApiDocument.Webhooks["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema;
+            var schema = actual.OpenApiDocument.Webhooks["pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema;
             actual.OpenApiDiagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
             actual.OpenApiDocument.Should().BeEquivalentTo(expected);
         }
@@ -301,7 +306,7 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
                     Reference = new OpenApiReference
                     {
                         Type = ReferenceType.PathItem,
-                        Id = "/pets",
+                        Id = "pets",
                         HostDocument = actual.OpenApiDocument
                     }
                 }
@@ -323,24 +328,11 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
             };
 
             // Assert
-            actual.OpenApiDocument.Should().BeEquivalentTo(expected);
+            actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Components.PathItems["pets"].Reference.HostDocument));
             actual.OpenApiDiagnostic.Should().BeEquivalentTo(
     new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
         }
 
-        [Fact]
-        public void ParseDocumentWithDescriptionInDollarRefsShouldSucceed()
-        {
-            // Arrange
-            var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "documentWithSummaryAndDescriptionInReference.yaml"));
-
-            // Act
-            var header = actual.OpenApiDocument.Components.Responses["Test"].Headers["X-Test"];
-
-            // Assert
-            Assert.True(header.Description == "A referenced X-Test header"); /*response header #ref's description overrides the header's description*/
-        }
-
         [Fact]
         public void ParseDocumentWithExampleInSchemaShouldSucceed()
         {