Split host document resolution from Json Schema ref resolution

Author: irvinesunday

src/Microsoft.OpenApi/Models/OpenApiDocument.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;
@@ -446,14 +446,12 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>
 
         /// <summary>
         /// Walks the OpenApiDocument and sets the host document for all IOpenApiReferenceable objects
-        /// and resolves JsonSchema references
         /// </summary>
-        public IEnumerable<OpenApiError> ResolveReferences()
+        public void ResolveHostDocument()
         {
-            var resolver = new ReferenceResolver(this);
+            var resolver = new HostDocumentResolver(this);
             var walker = new OpenApiWalker(resolver);
             walker.Walk(this);
-            return resolver.Errors;
         }
 
         /// <summary>

src/Microsoft.OpenApi/Services/HostDocumentResolver.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// This class is used to walk an OpenApiDocument and sets the host document of OpenApiReferences.
+    /// </summary>
+    internal class HostDocumentResolver : OpenApiVisitorBase
+    {
+        private readonly OpenApiDocument _currentDocument;
+
+        public HostDocumentResolver(OpenApiDocument currentDocument)
+        {
+            _currentDocument = currentDocument;
+        }
+
+        /// <summary>
+        /// Visits the referenceable element in the host document
+        /// </summary>
+        /// <param name="referenceable">The referenceable element in the doc.</param>
+        public override void Visit(IOpenApiReferenceable referenceable)
+        {
+            if (referenceable.Reference != null)
+            {
+                referenceable.Reference.HostDocument = _currentDocument;
+            }
+        }
+    }
+}

src/Microsoft.OpenApi/Services/ReferenceResolver.cs renamed to src/Microsoft.OpenApi/Services/JsonSchemaReferenceResolver.cs

@@ -6,22 +6,20 @@
 using Json.Schema;
 using Microsoft.OpenApi.Exceptions;
 using System.Linq;
-using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Extensions;
 
 namespace Microsoft.OpenApi.Services
 {
     /// <summary>
-    /// This class is used to wallk an OpenApiDocument and sets the host document of OpenApiReferences
-    /// and resolves JsonSchema references.
+    /// This class is used to walk an OpenApiDocument and resolves JsonSchema references.
     /// </summary>
-    internal class ReferenceResolver : OpenApiVisitorBase
+    internal class JsonSchemaReferenceResolver : OpenApiVisitorBase
     {
         private readonly OpenApiDocument _currentDocument;
         private readonly List<OpenApiError> _errors = new();
 
-        public ReferenceResolver(OpenApiDocument currentDocument)
+        public JsonSchemaReferenceResolver(OpenApiDocument currentDocument)
         {
             _currentDocument = currentDocument;
         }
@@ -31,18 +29,6 @@ public ReferenceResolver(OpenApiDocument currentDocument)
         /// </summary>
         public IEnumerable<OpenApiError> Errors => _errors;
 
-        /// <summary>
-        /// Visits the referenceable element in the host document
-        /// </summary>
-        /// <param name="referenceable">The referenceable element in the doc.</param>
-        public override void Visit(IOpenApiReferenceable referenceable)
-        {
-            if (referenceable.Reference != null)
-            {
-                referenceable.Reference.HostDocument = _currentDocument;
-            }
-        }
-
         /// <summary>
         /// Resolves schemas in components
         /// </summary>