Add JsonSchema reference resolution to OpenApiDocument class

Author: irvinesunday

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -97,8 +97,6 @@ public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IBaseDo
         /// </summary>
         public OpenApiDocument() 
         {
-            // BaseUri = new Uri("http://openapi.net/document/" + Guid.NewGuid());
-            //_docId = Guid.NewGuid().ToString();
             Workspace = new OpenApiWorkspace();
             Workspace.AddDocument("/", this);
         }
@@ -485,6 +483,29 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
             return ResolveReference(reference, false);
         }
 
+        /// <summary>
+        /// Resolves JsonSchema refs
+        /// </summary>
+        /// <param name="referenceUri"></param>
+        /// <returns>A JsonSchema ref.</returns>
+        public JsonSchema ResolveJsonSchemaReference(Uri referenceUri)
+        {
+            if (referenceUri == null) return null;
+
+            OpenApiReference reference = new OpenApiReference() 
+            {
+                ExternalResource = referenceUri.OriginalString, 
+                Id = referenceUri.OriginalString.Split('/').Last(),
+                Type = ReferenceType.Schema
+            };
+
+            JsonSchema resolvedSchema = reference.ExternalResource.StartsWith("#")
+                ? (JsonSchema)Workspace.ResolveReference<IBaseDocument>(reference.Id, reference.Type, Components) // local ref
+                : Workspace.ResolveReference<JsonSchema>(reference); // external ref
+
+            return resolvedSchema ?? throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
+        }
+
         /// <summary>
         /// Takes in an OpenApi document instance and generates its hash value
         /// </summary>
@@ -536,7 +557,7 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool
                 {
                     throw new ArgumentException(Properties.SRResource.WorkspaceRequredForExternalReferenceResolution);
                 }
-                return this.Workspace.ResolveReference(reference);
+                return this.Workspace.ResolveReference<IOpenApiReferenceable>(reference);
             }
 
             if (!reference.Type.HasValue)
@@ -559,16 +580,8 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool
                 return null;
             }
 
-            IOpenApiReferenceable resolvedReference = Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components);
-
-            if (resolvedReference != null)
-            {
-                return resolvedReference;
-            }
-            else
-            {
-                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
-            }
+            return Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components)
+                ?? throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
         }
 
         /// <summary>

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs

@@ -18,7 +18,6 @@ namespace Microsoft.OpenApi.Services
     public class OpenApiReferenceResolver : OpenApiVisitorBase
     {
         private OpenApiDocument _currentDocument;
-        private readonly bool _resolveRemoteReferences;
         private List<OpenApiError> _errors = new();
 
         /// <summary>
@@ -251,9 +250,8 @@ private Dictionary<string, JsonSchema> ResolveJsonSchemas(IDictionary<string, Js
         /// <param name="summary">The schema's summary.</param>
         /// <returns></returns>
         public JsonSchema ResolveJsonSchemaReference(Uri reference, string description = null, string summary = null)
-        {
-            var refUri = $"https://registry{reference.OriginalString.Split('#').LastOrDefault()}";
-            var resolvedSchema = (JsonSchema)SchemaRegistry.Global.Get(new Uri(refUri));
+        {            
+            var resolvedSchema = _currentDocument.ResolveJsonSchemaReference(reference);
 
             if (resolvedSchema != null)
             {