Clean up logic Update tests

Author: MaggieKimani1

src/Microsoft.OpenApi/Models/OpenApiOperation.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Writers;
 
 namespace Microsoft.OpenApi.Models
@@ -256,18 +257,13 @@ public void SerializeAsV2(IOpenApiWriter writer)
                 }
                 else if (RequestBody.Reference != null)
                 {
+                    var hostDocument = RequestBody.Reference.HostDocument;
                     parameters.Add(
-                        new()
-                        {
-                            UnresolvedReference = true,
-                            Reference = RequestBody.Reference
-                        });
+                        new OpenApiParameterReference(RequestBody.Reference.Id, hostDocument));
 
-                    if (RequestBody.Reference.HostDocument != null)
-                    {
-                        var effectiveRequestBody = RequestBody.GetEffective(RequestBody.Reference.HostDocument);
-                        if (effectiveRequestBody != null)
-                            consumes = effectiveRequestBody.Content.Keys.Distinct().ToList();
+                    if (hostDocument != null)
+                    {                        
+                        consumes = RequestBody.Content.Keys.Distinct().ToList();
                     }
                 }
 
@@ -291,7 +287,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
                     .Concat(
                         Responses
                         .Where(static r => r.Value.Reference is {HostDocument: not null})
-                        .SelectMany(static r => r.Value.GetEffective(r.Value.Reference.HostDocument)?.Content?.Keys))
+                        .SelectMany(static r => r.Value.Content?.Keys))
                     .Distinct()
                     .ToList();
 

src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs

@@ -75,7 +75,7 @@ public override string Description
         }
 
         /// <inheritdoc/>
-        public override IDictionary<string, OpenApiMediaType> Content { get => Target.Content; set => Target.Content = value; }
+        public override IDictionary<string, OpenApiMediaType> Content { get => Target?.Content; set => Target.Content = value; }
 
         /// <inheritdoc/>
         public override IDictionary<string, OpenApiHeader> Headers { get => Target.Headers; set => Target.Headers = value; }

test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs

@@ -1,11 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System.Collections.Generic;
 using FluentAssertions;
 using Json.Schema;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.References;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -52,14 +53,7 @@ public class OpenApiOperationTests
             },
             Responses = new()
             {
-                ["200"] = new()
-                {
-                    Reference = new()
-                    {
-                        Id = "response1",
-                        Type = ReferenceType.Response
-                    }
-                },
+                ["200"] = new OpenApiResponseReference("response1", hostDocument: null),
                 ["400"] = new()
                 {
                     Content = new Dictionary<string, OpenApiMediaType>
@@ -90,14 +84,7 @@ public class OpenApiOperationTests
                     Name = "tagName1",
                     Description = "tagDescription1",
                 },
-                new()
-                {
-                    Reference = new()
-                    {
-                        Id = "tagId1",
-                        Type = ReferenceType.Tag
-                    }
-                }
+                new OpenApiTagReference("tagId1", null)
             },
             Summary = "summary1",
             Description = "operationDescription",
@@ -134,14 +121,7 @@ public class OpenApiOperationTests
             },
             Responses = new()
             {
-                ["200"] = new()
-                {
-                    Reference = new()
-                    {
-                        Id = "response1",
-                        Type = ReferenceType.Response
-                    }
-                },
+                ["200"] = new OpenApiResponseReference("response1", hostDocument: null),
                 ["400"] = new()
                 {
                     Content = new Dictionary<string, OpenApiMediaType>
@@ -157,22 +137,8 @@ public class OpenApiOperationTests
             {
                 new()
                 {
-                    [new()
-                    {
-                        Reference = new()
-                        {
-                            Id = "securitySchemeId1",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }] = new List<string>(),
-                    [new()
-                    {
-                        Reference = new()
-                        {
-                            Id = "securitySchemeId2",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }] = new List<string>
+                    [new OpenApiSecuritySchemeReference("securitySchemeId1", hostDocument: null)] = new List<string>(),
+                    [new OpenApiSecuritySchemeReference("securitySchemeId2", hostDocument: null)] = new List<string>
                     {
                         "scopeName1",
                         "scopeName2"

test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt

@@ -1,4 +1,4 @@
 {
-  "description": "Location of the locally created post",
+  "description": "The URL of the newly created post",
   "type": "string"
 }

test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt

@@ -1 +1 @@
-{"description":"Location of the locally created post","type":"string"}
+{"description":"The URL of the newly created post","type":"string"}

test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt

@@ -1,7 +1,7 @@
 {
   "in": "query",
   "name": "limit",
-  "description": "Results to return",
+  "description": "Number of results to return",
   "type": "integer",
   "maximum": 100,
   "minimum": 1

test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt

@@ -1 +1 @@
-{"in":"query","name":"limit","description":"Results to return","type":"integer","maximum":100,"minimum":1}
+{"in":"query","name":"limit","description":"Number of results to return","type":"integer","maximum":100,"minimum":1}