Update models

irvinesunday · irvinesunday · commit 1b286e5e1ef3 · 2024-04-02T12:52:24.000+03:00
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -11,7 +11,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Json.Schema;
-using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Reader;
 using Microsoft.OpenApi.Services;
@@ -503,7 +502,7 @@ public JsonSchema ResolveJsonSchemaReference(Uri referenceUri)
                 ? (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));
+            return resolvedSchema;
         }
 
         /// <summary>
@@ -553,11 +552,11 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool
             // Todo: Verify if we need to check to see if this external reference is actually targeted at this document.
             if (useExternal)
             {
-                if (this.Workspace == null)
+                if (Workspace == null)
                 {
                     throw new ArgumentException(Properties.SRResource.WorkspaceRequredForExternalReferenceResolution);
                 }
-                return this.Workspace.ResolveReference<IOpenApiReferenceable>(reference);
+                return Workspace.ResolveReference<IOpenApiReferenceable>(reference);
             }
 
             if (!reference.Type.HasValue)
@@ -580,8 +579,7 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool
                 return null;
             }
 
-            return Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components)
-                ?? throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
+            return Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components);
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs b/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using Json.Schema;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Extensions;
@@ -18,10 +17,10 @@ namespace Microsoft.OpenApi.Services
     /// </summary>
     public class OpenApiWorkspace
     {
-        private readonly Dictionary<Uri, OpenApiDocument> _documents = new();
-        private readonly Dictionary<Uri, IOpenApiReferenceable> _fragments = new();
-        private readonly Dictionary<Uri, JsonSchema> _schemaFragments = new();
-        private readonly Dictionary<Uri, Stream> _artifacts = new();
+        private readonly Dictionary<Uri, OpenApiDocument> _documentsRegistry = new();
+        private readonly Dictionary<Uri, IOpenApiReferenceable> _fragmentsRegistry = new();
+        private readonly Dictionary<Uri, JsonSchema> _schemaFragmentsRegistry = new();
+        private readonly Dictionary<Uri, Stream> _artifactsRegistry = new();
 
         /// <summary>
         /// A list of OpenApiDocuments contained in the workspace
@@ -30,7 +29,7 @@ public IEnumerable<OpenApiDocument> Documents
         {
             get
             {
-                return _documents.Values;
+                return _documentsRegistry.Values;
             }
         }
 
@@ -71,11 +70,6 @@ public OpenApiWorkspace()
         /// </summary>
         public OpenApiWorkspace(OpenApiWorkspace workspace) { }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public IDictionary<Uri, OpenApiComponents> ComponentsRegistry { get; } = new Dictionary<Uri, OpenApiComponents>();
-                        
         /// <summary>
         /// Verify if workspace contains a document based on its URL.
         /// </summary>
@@ -84,7 +78,7 @@ public OpenApiWorkspace(OpenApiWorkspace workspace) { }
         public bool Contains(string location)
         {
             var key = ToLocationUrl(location);
-            return _documents.ContainsKey(key) || _fragments.ContainsKey(key) || _artifacts.ContainsKey(key) || _schemaFragments.ContainsKey(key);
+            return _documentsRegistry.ContainsKey(key) || _fragmentsRegistry.ContainsKey(key) || _artifactsRegistry.ContainsKey(key) || _schemaFragmentsRegistry.ContainsKey(key);
         }
 
         /// <summary>
@@ -97,9 +91,9 @@ public void AddDocument(string location, OpenApiDocument document)
             document.Workspace = this;
             var locationUrl = ToLocationUrl(location);
 
-            if (!_documents.ContainsKey(locationUrl))
+            if (!_documentsRegistry.ContainsKey(locationUrl))
             {
-                _documents.Add(locationUrl, document);
+                _documentsRegistry.Add(locationUrl, document);
             }
         }
 
@@ -113,7 +107,7 @@ public void AddDocument(string location, OpenApiDocument document)
         /// </remarks>
         public void AddFragment(string location, IOpenApiReferenceable fragment)
         {
-            _fragments.Add(ToLocationUrl(location), fragment);
+            _fragmentsRegistry.Add(ToLocationUrl(location), fragment);
         }
 
         /// <summary>
@@ -124,20 +118,20 @@ public void AddFragment(string location, IOpenApiReferenceable fragment)
         public void AddSchemaFragment(string location, JsonSchema fragment)
         {
             var locationUri = ToLocationUrl(location);
-            if (!_schemaFragments.ContainsKey(locationUri))
+            if (!_schemaFragmentsRegistry.ContainsKey(locationUri))
             {
-                _schemaFragments.Add(locationUri, fragment);
+                _schemaFragmentsRegistry.Add(locationUri, fragment);
             }           
         }
 
         /// <summary>
-        /// Add a stream based artificat to the workspace.  Useful for images, examples, alternative schemas.
+        /// Add a stream based artifact to the workspace. Useful for images, examples, alternative schemas.
         /// </summary>
         /// <param name="location"></param>
         /// <param name="artifact"></param>
         public void AddArtifact(string location, Stream artifact)
         {
-            _artifacts.Add(ToLocationUrl(location), artifact);
+            _artifactsRegistry.Add(ToLocationUrl(location), artifact);
         }
 
         /// <summary>
@@ -149,21 +143,20 @@ public void AddArtifact(string location, Stream artifact)
         public T ResolveReference<T>(OpenApiReference reference)
         {
             var uri = new Uri(BaseUrl, reference.ExternalResource);
-            if (_documents.TryGetValue(uri, out var doc))
+            if (_documentsRegistry.TryGetValue(uri, out var doc))
             {
                 return ResolveReference<T>(reference.Id, reference.Type, doc.Components);
             }
-            else if (_fragments.TryGetValue(uri, out var fragment))
+            else if (_fragmentsRegistry.TryGetValue(uri, out var fragment))
             {
                 var jsonPointer = new JsonPointer($"/{reference.Id ?? string.Empty}");
                 return (T)fragment.ResolveReference(jsonPointer);
             }
-            else if (_schemaFragments.TryGetValue(uri, out var schemaFragment))
+            else if (_schemaFragmentsRegistry.TryGetValue(uri, out var schemaFragment))
             {
                 return (T)(schemaFragment as IBaseDocument);
             }
             return default;
-
         }
         
         /// <summary>
@@ -180,20 +173,27 @@ public T ResolveReference<T>(string referenceId, ReferenceType? referenceType, O
             if (string.IsNullOrEmpty(referenceId)) return default;
             if (components == null) return default;
 
-            return referenceType switch
+            try
             {
-                ReferenceType.PathItem => (T)(IOpenApiReferenceable)components.PathItems[referenceId],
-                ReferenceType.Response => (T)(IOpenApiReferenceable)components.Responses[referenceId],
-                ReferenceType.Parameter => (T)(IOpenApiReferenceable)components.Parameters[referenceId],
-                ReferenceType.Example => (T)(IOpenApiReferenceable)components.Examples[referenceId],
-                ReferenceType.RequestBody => (T)(IOpenApiReferenceable)components.RequestBodies[referenceId],
-                ReferenceType.Header => (T)(IOpenApiReferenceable)components.Headers[referenceId],
-                ReferenceType.SecurityScheme => (T)(IOpenApiReferenceable)components.SecuritySchemes[referenceId],
-                ReferenceType.Link => (T)(IOpenApiReferenceable)components.Links[referenceId],
-                ReferenceType.Callback => (T)(IOpenApiReferenceable)components.Callbacks[referenceId],
-                ReferenceType.Schema => (T)(IBaseDocument)components.Schemas[referenceId],
-                _ => throw new OpenApiException(Properties.SRResource.InvalidReferenceType),
-            };
+                return referenceType switch
+                {
+                    ReferenceType.PathItem => (T)(IOpenApiReferenceable)components.PathItems[referenceId],
+                    ReferenceType.Response => (T)(IOpenApiReferenceable)components.Responses[referenceId],
+                    ReferenceType.Parameter => (T)(IOpenApiReferenceable)components.Parameters[referenceId],
+                    ReferenceType.Example => (T)(IOpenApiReferenceable)components.Examples[referenceId],
+                    ReferenceType.RequestBody => (T)(IOpenApiReferenceable)components.RequestBodies[referenceId],
+                    ReferenceType.Header => (T)(IOpenApiReferenceable)components.Headers[referenceId],
+                    ReferenceType.SecurityScheme => (T)(IOpenApiReferenceable)components.SecuritySchemes[referenceId],
+                    ReferenceType.Link => (T)(IOpenApiReferenceable)components.Links[referenceId],
+                    ReferenceType.Callback => (T)(IOpenApiReferenceable)components.Callbacks[referenceId],
+                    ReferenceType.Schema => (T)(IBaseDocument)components.Schemas[referenceId],
+                    _ => throw new OpenApiException(Properties.SRResource.InvalidReferenceType)
+                };
+            }
+            catch (KeyNotFoundException)
+            {
+                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, referenceId));
+            }            
         }
 
         /// <summary>
@@ -203,18 +203,12 @@ public T ResolveReference<T>(string referenceId, ReferenceType? referenceType, O
         /// <returns></returns>
         public Stream GetArtifact(string location)
         {
-            return _artifacts[ToLocationUrl(location)];
+            return _artifactsRegistry[ToLocationUrl(location)];
         }
 
         private Uri ToLocationUrl(string location)
         {
             return new(BaseUrl, location);
         }
-
-        private static JsonSchema FetchSchemaFromRegistry(Uri reference)
-        {
-            var resolvedSchema = (JsonSchema)SchemaRegistry.Global.Get(reference);
-            return resolvedSchema;
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`using System.Threading;`
`12`	`12`	`using System.Threading.Tasks;`
`13`	`13`	`using Json.Schema;`
`14`		`-using Microsoft.OpenApi.Exceptions;`
`15`	`14`	`using Microsoft.OpenApi.Interfaces;`
`16`	`15`	`using Microsoft.OpenApi.Reader;`
`17`	`16`	`using Microsoft.OpenApi.Services;`
`@@ -503,7 +502,7 @@ public JsonSchema ResolveJsonSchemaReference(Uri referenceUri)`
`503`	`502`	`? (JsonSchema)Workspace.ResolveReference<IBaseDocument>(reference.Id, reference.Type, Components) // local ref`
`504`	`503`	`: Workspace.ResolveReference<JsonSchema>(reference); // external ref`
`505`	`504`
`506`		`- return resolvedSchema ?? throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));`
	`505`	`+ return resolvedSchema;`
`507`	`506`	`}`
`508`	`507`
`509`	`508`	`/// <summary>`
`@@ -553,11 +552,11 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool`
`553`	`552`	`// Todo: Verify if we need to check to see if this external reference is actually targeted at this document.`
`554`	`553`	`if (useExternal)`
`555`	`554`	`{`
`556`		`- if (this.Workspace == null)`
	`555`	`+ if (Workspace == null)`
`557`	`556`	`{`
`558`	`557`	`throw new ArgumentException(Properties.SRResource.WorkspaceRequredForExternalReferenceResolution);`
`559`	`558`	`}`
`560`		`- return this.Workspace.ResolveReference<IOpenApiReferenceable>(reference);`
	`559`	`+ return Workspace.ResolveReference<IOpenApiReferenceable>(reference);`
`561`	`560`	`}`
`562`	`561`
`563`	`562`	`if (!reference.Type.HasValue)`
`@@ -580,8 +579,7 @@ internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool`
`580`	`579`	`return null;`
`581`	`580`	`}`
`582`	`581`
`583`		`- return Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components)`
`584`		`- ?? throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));`
	`582`	`+ return Workspace.ResolveReference<IOpenApiReferenceable>(reference.Id, reference.Type, Components);`
`585`	`583`	`}`
`586`	`584`
`587`	`585`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.IO;`
`7`		`-using System.Linq;`
`8`	`7`	`using Json.Schema;`
`9`	`8`	`using Microsoft.OpenApi.Exceptions;`
`10`	`9`	`using Microsoft.OpenApi.Extensions;`
`@@ -18,10 +17,10 @@ namespace Microsoft.OpenApi.Services`
`18`	`17`	`/// </summary>`
`19`	`18`	`public class OpenApiWorkspace`
`20`	`19`	`{`
`21`		`- private readonly Dictionary<Uri, OpenApiDocument> _documents = new();`
`22`		`- private readonly Dictionary<Uri, IOpenApiReferenceable> _fragments = new();`
`23`		`- private readonly Dictionary<Uri, JsonSchema> _schemaFragments = new();`
`24`		`- private readonly Dictionary<Uri, Stream> _artifacts = new();`
	`20`	`+ private readonly Dictionary<Uri, OpenApiDocument> _documentsRegistry = new();`
	`21`	`+ private readonly Dictionary<Uri, IOpenApiReferenceable> _fragmentsRegistry = new();`
	`22`	`+ private readonly Dictionary<Uri, JsonSchema> _schemaFragmentsRegistry = new();`
	`23`	`+ private readonly Dictionary<Uri, Stream> _artifactsRegistry = new();`
`25`	`24`
`26`	`25`	`/// <summary>`
`27`	`26`	`/// A list of OpenApiDocuments contained in the workspace`
`@@ -30,7 +29,7 @@ public IEnumerable<OpenApiDocument> Documents`
`30`	`29`	`{`
`31`	`30`	`get`
`32`	`31`	`{`
`33`		`- return _documents.Values;`
	`32`	`+ return _documentsRegistry.Values;`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`
`@@ -71,11 +70,6 @@ public OpenApiWorkspace()`
`71`	`70`	`/// </summary>`
`72`	`71`	`public OpenApiWorkspace(OpenApiWorkspace workspace) { }`
`73`	`72`
`74`		`- /// <summary>`
`75`		`- ///`
`76`		`- /// </summary>`
`77`		`- public IDictionary<Uri, OpenApiComponents> ComponentsRegistry { get; } = new Dictionary<Uri, OpenApiComponents>();`
`78`		`-`
`79`	`73`	`/// <summary>`
`80`	`74`	`/// Verify if workspace contains a document based on its URL.`
`81`	`75`	`/// </summary>`
`@@ -84,7 +78,7 @@ public OpenApiWorkspace(OpenApiWorkspace workspace) { }`
`84`	`78`	`public bool Contains(string location)`
`85`	`79`	`{`
`86`	`80`	`var key = ToLocationUrl(location);`
`87`		`- return _documents.ContainsKey(key) \|\| _fragments.ContainsKey(key) \|\| _artifacts.ContainsKey(key) \|\| _schemaFragments.ContainsKey(key);`
	`81`	`+ return _documentsRegistry.ContainsKey(key) \|\| _fragmentsRegistry.ContainsKey(key) \|\| _artifactsRegistry.ContainsKey(key) \|\| _schemaFragmentsRegistry.ContainsKey(key);`
`88`	`82`	`}`
`89`	`83`
`90`	`84`	`/// <summary>`
`@@ -97,9 +91,9 @@ public void AddDocument(string location, OpenApiDocument document)`
`97`	`91`	`document.Workspace = this;`
`98`	`92`	`var locationUrl = ToLocationUrl(location);`
`99`	`93`
`100`		`- if (!_documents.ContainsKey(locationUrl))`
	`94`	`+ if (!_documentsRegistry.ContainsKey(locationUrl))`
`101`	`95`	`{`
`102`		`- _documents.Add(locationUrl, document);`
	`96`	`+ _documentsRegistry.Add(locationUrl, document);`
`103`	`97`	`}`
`104`	`98`	`}`
`105`	`99`
`@@ -113,7 +107,7 @@ public void AddDocument(string location, OpenApiDocument document)`
`113`	`107`	`/// </remarks>`
`114`	`108`	`public void AddFragment(string location, IOpenApiReferenceable fragment)`
`115`	`109`	`{`
`116`		`- _fragments.Add(ToLocationUrl(location), fragment);`
	`110`	`+ _fragmentsRegistry.Add(ToLocationUrl(location), fragment);`
`117`	`111`	`}`
`118`	`112`
`119`	`113`	`/// <summary>`
`@@ -124,20 +118,20 @@ public void AddFragment(string location, IOpenApiReferenceable fragment)`
`124`	`118`	`public void AddSchemaFragment(string location, JsonSchema fragment)`
`125`	`119`	`{`
`126`	`120`	`var locationUri = ToLocationUrl(location);`
`127`		`- if (!_schemaFragments.ContainsKey(locationUri))`
	`121`	`+ if (!_schemaFragmentsRegistry.ContainsKey(locationUri))`
`128`	`122`	`{`
`129`		`- _schemaFragments.Add(locationUri, fragment);`
	`123`	`+ _schemaFragmentsRegistry.Add(locationUri, fragment);`
`130`	`124`	`}`
`131`	`125`	`}`
`132`	`126`
`133`	`127`	`/// <summary>`
`134`		`- /// Add a stream based artificat to the workspace. Useful for images, examples, alternative schemas.`
	`128`	`+ /// Add a stream based artifact to the workspace. Useful for images, examples, alternative schemas.`
`135`	`129`	`/// </summary>`
`136`	`130`	`/// <param name="location"></param>`
`137`	`131`	`/// <param name="artifact"></param>`
`138`	`132`	`public void AddArtifact(string location, Stream artifact)`
`139`	`133`	`{`
`140`		`- _artifacts.Add(ToLocationUrl(location), artifact);`
	`134`	`+ _artifactsRegistry.Add(ToLocationUrl(location), artifact);`
`141`	`135`	`}`
`142`	`136`
`143`	`137`	`/// <summary>`
`@@ -149,21 +143,20 @@ public void AddArtifact(string location, Stream artifact)`
`149`	`143`	`public T ResolveReference<T>(OpenApiReference reference)`
`150`	`144`	`{`
`151`	`145`	`var uri = new Uri(BaseUrl, reference.ExternalResource);`
`152`		`- if (_documents.TryGetValue(uri, out var doc))`
	`146`	`+ if (_documentsRegistry.TryGetValue(uri, out var doc))`
`153`	`147`	`{`
`154`	`148`	`return ResolveReference<T>(reference.Id, reference.Type, doc.Components);`
`155`	`149`	`}`
`156`		`- else if (_fragments.TryGetValue(uri, out var fragment))`
	`150`	`+ else if (_fragmentsRegistry.TryGetValue(uri, out var fragment))`
`157`	`151`	`{`
`158`	`152`	`var jsonPointer = new JsonPointer($"/{reference.Id ?? string.Empty}");`
`159`	`153`	`return (T)fragment.ResolveReference(jsonPointer);`
`160`	`154`	`}`
`161`		`- else if (_schemaFragments.TryGetValue(uri, out var schemaFragment))`
	`155`	`+ else if (_schemaFragmentsRegistry.TryGetValue(uri, out var schemaFragment))`
`162`	`156`	`{`
`163`	`157`	`return (T)(schemaFragment as IBaseDocument);`
`164`	`158`	`}`
`165`	`159`	`return default;`
`166`		`-`
`167`	`160`	`}`
`168`	`161`
`169`	`162`	`/// <summary>`
`@@ -180,20 +173,27 @@ public T ResolveReference<T>(string referenceId, ReferenceType? referenceType, O`
`180`	`173`	`if (string.IsNullOrEmpty(referenceId)) return default;`
`181`	`174`	`if (components == null) return default;`
`182`	`175`
`183`		`- return referenceType switch`
	`176`	`+ try`
`184`	`177`	`{`
`185`		`- ReferenceType.PathItem => (T)(IOpenApiReferenceable)components.PathItems[referenceId],`
`186`		`- ReferenceType.Response => (T)(IOpenApiReferenceable)components.Responses[referenceId],`
`187`		`- ReferenceType.Parameter => (T)(IOpenApiReferenceable)components.Parameters[referenceId],`
`188`		`- ReferenceType.Example => (T)(IOpenApiReferenceable)components.Examples[referenceId],`
`189`		`- ReferenceType.RequestBody => (T)(IOpenApiReferenceable)components.RequestBodies[referenceId],`
`190`		`- ReferenceType.Header => (T)(IOpenApiReferenceable)components.Headers[referenceId],`
`191`		`- ReferenceType.SecurityScheme => (T)(IOpenApiReferenceable)components.SecuritySchemes[referenceId],`
`192`		`- ReferenceType.Link => (T)(IOpenApiReferenceable)components.Links[referenceId],`
`193`		`- ReferenceType.Callback => (T)(IOpenApiReferenceable)components.Callbacks[referenceId],`
`194`		`- ReferenceType.Schema => (T)(IBaseDocument)components.Schemas[referenceId],`
`195`		`- _ => throw new OpenApiException(Properties.SRResource.InvalidReferenceType),`
`196`		`- };`
	`178`	`+ return referenceType switch`
	`179`	`+ {`
	`180`	`+ ReferenceType.PathItem => (T)(IOpenApiReferenceable)components.PathItems[referenceId],`
	`181`	`+ ReferenceType.Response => (T)(IOpenApiReferenceable)components.Responses[referenceId],`
	`182`	`+ ReferenceType.Parameter => (T)(IOpenApiReferenceable)components.Parameters[referenceId],`
	`183`	`+ ReferenceType.Example => (T)(IOpenApiReferenceable)components.Examples[referenceId],`
	`184`	`+ ReferenceType.RequestBody => (T)(IOpenApiReferenceable)components.RequestBodies[referenceId],`
	`185`	`+ ReferenceType.Header => (T)(IOpenApiReferenceable)components.Headers[referenceId],`
	`186`	`+ ReferenceType.SecurityScheme => (T)(IOpenApiReferenceable)components.SecuritySchemes[referenceId],`
	`187`	`+ ReferenceType.Link => (T)(IOpenApiReferenceable)components.Links[referenceId],`
	`188`	`+ ReferenceType.Callback => (T)(IOpenApiReferenceable)components.Callbacks[referenceId],`
	`189`	`+ ReferenceType.Schema => (T)(IBaseDocument)components.Schemas[referenceId],`
	`190`	`+ _ => throw new OpenApiException(Properties.SRResource.InvalidReferenceType)`
	`191`	`+ };`
	`192`	`+ }`
	`193`	`+ catch (KeyNotFoundException)`
	`194`	`+ {`
	`195`	`+ throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, referenceId));`
	`196`	`+ }`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`/// <summary>`
`@@ -203,18 +203,12 @@ public T ResolveReference<T>(string referenceId, ReferenceType? referenceType, O`
`203`	`203`	`/// <returns></returns>`
`204`	`204`	`public Stream GetArtifact(string location)`
`205`	`205`	`{`
`206`		`- return _artifacts[ToLocationUrl(location)];`
	`206`	`+ return _artifactsRegistry[ToLocationUrl(location)];`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`private Uri ToLocationUrl(string location)`
`210`	`210`	`{`
`211`	`211`	`return new(BaseUrl, location);`
`212`	`212`	`}`
`213`		`-`
`214`		`- private static JsonSchema FetchSchemaFromRegistry(Uri reference)`
`215`		`- {`
`216`		`- var resolvedSchema = (JsonSchema)SchemaRegistry.Global.Get(reference);`
`217`		`- return resolvedSchema;`
`218`		`- }`
`219`	`213`	`}`
`220`	`214`	`}`