Refactor V2 schema deserializer to update the referenceable schema's baseUri to match that of the document

MaggieKimani1 · MaggieKimani1 · commit d6593ab06af1 · 2024-04-29T15:50:36.000+03:00
diff --git a/src/Microsoft.OpenApi/Reader/V2/JsonSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/JsonSchemaDeserializer.cs
@@ -234,7 +234,13 @@ public static JsonSchema LoadSchema(ParseNode node, OpenApiDocument hostDocument
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                return schemaBuilder.Ref(pointer);
+                var jsonSchema = schemaBuilder.Ref(pointer).Build();
+                if (hostDocument != null)
+                {
+                    jsonSchema.BaseUri = hostDocument.BaseUri;
+                }
+
+                return jsonSchema;
             }
 
             foreach (var propertyNode in mapNode)

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,13 @@ public static JsonSchema LoadSchema(ParseNode node, OpenApiDocument hostDocument`
`234`	`234`	`var pointer = mapNode.GetReferencePointer();`
`235`	`235`	`if (pointer != null)`
`236`	`236`	`{`
`237`		`- return schemaBuilder.Ref(pointer);`
	`237`	`+ var jsonSchema = schemaBuilder.Ref(pointer).Build();`
	`238`	`+ if (hostDocument != null)`
	`239`	`+ {`
	`240`	`+ jsonSchema.BaseUri = hostDocument.BaseUri;`
	`241`	`+ }`
	`242`	`+`
	`243`	`+ return jsonSchema;`
`238`	`244`	`}`
`239`	`245`
`240`	`246`	`foreach (var propertyNode in mapNode)`