Add an internal constructor for testing purposes

MaggieKimani1 · MaggieKimani1 · commit d99ffd6d95b6 · 2024-04-02T20:16:18.000+03:00
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiCallbackReference : OpenApiCallback
     {
-        private OpenApiCallback _target;
+        internal OpenApiCallback _target;
         private readonly OpenApiReference _reference;
 
         private OpenApiCallback Target
@@ -54,6 +54,17 @@ public OpenApiCallbackReference(string referenceId, OpenApiDocument hostDocument
             Reference = _reference;
         }
 
+        internal OpenApiCallbackReference(OpenApiCallback target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Callback,
+            };
+        }
+
         /// <inheritdoc/>
         public override Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get => Target.PathItems; set => Target.PathItems = value; }
 
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiExampleReference : OpenApiExample
     {
-        private OpenApiExample _target;
+        internal OpenApiExample _target;
         private readonly OpenApiReference _reference;
         private string _summary;
         private string _description;
@@ -56,6 +56,17 @@ public OpenApiExampleReference(string referenceId, OpenApiDocument hostDocument,
             Reference = _reference;
         }
 
+        internal OpenApiExampleReference(OpenApiExample target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Example,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Description
         {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs
@@ -15,7 +15,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiHeaderReference : OpenApiHeader
     {
-        private OpenApiHeader _target;
+        internal OpenApiHeader _target;
         private readonly OpenApiReference _reference;
         private string _description;
 
@@ -56,6 +56,17 @@ public OpenApiHeaderReference(string referenceId, OpenApiDocument hostDocument,
             Reference = _reference;
         }
 
+        internal OpenApiHeaderReference(OpenApiHeader target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Header,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Description
         {
@@ -124,6 +135,20 @@ public override void SerializeAsV3(IOpenApiWriter writer)
             }
         }
 
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(_reference))
+            {
+                _reference.SerializeAsV2(writer);
+                return;
+            }
+            else
+            {
+                SerializeInternal(writer, (writer, element) => element.SerializeAsV2WithoutReference(writer));
+            }
+        }
+
         /// <inheritdoc/>
         private void SerializeInternal(IOpenApiWriter writer,
             Action<IOpenApiWriter, IOpenApiReferenceable> action)
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs
@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiLinkReference : OpenApiLink
     {
-        private OpenApiLink _target;
+        internal OpenApiLink _target;
         private readonly OpenApiReference _reference;
         private string _description;
 
@@ -54,6 +54,17 @@ public OpenApiLinkReference(string referenceId, OpenApiDocument hostDocument, st
             Reference = _reference;
         }
 
+        internal OpenApiLinkReference(OpenApiLink target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Link,
+            };
+        }
+
         /// <inheritdoc/>
         public override string OperationRef { get => Target.OperationRef; set => Target.OperationRef = value; }
 
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs
@@ -15,7 +15,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiParameterReference : OpenApiParameter
     {
-        private OpenApiParameter _target;
+        internal OpenApiParameter _target;
         private readonly OpenApiReference _reference;
         private string _description;
         private bool? _explode;
@@ -58,6 +58,17 @@ public OpenApiParameterReference(string referenceId, OpenApiDocument hostDocumen
             Reference = _reference;
         }
 
+        internal OpenApiParameterReference(OpenApiParameter target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Parameter,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Name { get => Target.Name; set => Target.Name = value; }
 
@@ -140,6 +151,20 @@ public override void SerializeAsV31(IOpenApiWriter writer)
             }
         }
 
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(_reference))
+            {
+                _reference.SerializeAsV2(writer);
+                return;
+            }
+            else
+            {
+                SerializeInternal(writer, (writer, element) => element.SerializeAsV2WithoutReference(writer));
+            }
+        }
+
         /// <inheritdoc/>
         private void SerializeInternal(IOpenApiWriter writer,
             Action<IOpenApiWriter, IOpenApiReferenceable> action)
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiPathItemReference : OpenApiPathItem
     {
-        private OpenApiPathItem _target;
+        internal OpenApiPathItem _target;
         private readonly OpenApiReference _reference;
         private string _description;
         private string _summary;
@@ -55,6 +55,17 @@ public OpenApiPathItemReference(string referenceId, OpenApiDocument hostDocument
             Reference = _reference;
         }
 
+        internal OpenApiPathItemReference(OpenApiPathItem target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.PathItem,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Summary
         {
@@ -107,7 +118,21 @@ public override void SerializeAsV31(IOpenApiWriter writer)
             {
                 SerializeInternal(writer, (writer, element) => element.SerializeAsV31WithoutReference(writer));
             }
-        }     
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(_reference))
+            {
+                _reference.SerializeAsV2(writer);
+                return;
+            }
+            else
+            {
+                SerializeInternal(writer, (writer, element) => element.SerializeAsV2WithoutReference(writer));
+            }
+        }
 
         /// <inheritdoc/>
         private void SerializeInternal(IOpenApiWriter writer,
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs
@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiRequestBodyReference : OpenApiRequestBody
     {
-        private OpenApiRequestBody _target;
+        internal OpenApiRequestBody _target;
         private readonly OpenApiReference _reference;
         private string _description;
 
@@ -54,6 +54,17 @@ public OpenApiRequestBodyReference(string referenceId, OpenApiDocument hostDocum
             Reference = _reference;
         }
 
+        internal OpenApiRequestBodyReference(OpenApiRequestBody target, string referenceId)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.RequestBody,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Description
         {
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs
@@ -13,15 +13,15 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiResponseReference : OpenApiResponse
     {
-        private OpenApiResponse _target;
+        internal OpenApiResponse _target;
         private readonly OpenApiReference _reference;
         private string _description;
 
         private OpenApiResponse Target
         {
             get
             {
-                _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiResponse>(_reference);
+                _target ??= Reference.HostDocument?.ResolveReferenceTo<OpenApiResponse>(_reference);
                 return _target;
             }
         }
@@ -54,6 +54,19 @@ public OpenApiResponseReference(string referenceId, OpenApiDocument hostDocument
             Reference = _reference;
         }
 
+        internal OpenApiResponseReference(string referenceId, OpenApiResponse target)
+        {
+            _target ??= target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.Response,
+            };
+
+            Reference = _reference;
+        }
+
         /// <inheritdoc/>
         public override string Description
         {
@@ -101,6 +114,20 @@ public override void SerializeAsV31(IOpenApiWriter writer)
             }
         }
 
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(_reference))
+            {
+                _reference.SerializeAsV2(writer);
+                return;
+            }
+            else
+            {
+                SerializeInternal(writer, (writer, element) => element.SerializeAsV2WithoutReference(writer));
+            }
+        }
+
         /// <inheritdoc/>
         private void SerializeInternal(IOpenApiWriter writer,
             Action<IOpenApiWriter, IOpenApiReferenceable> action)
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs
@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Models.References
     /// </summary>
     public class OpenApiSecuritySchemeReference : OpenApiSecurityScheme
     {
-        private OpenApiSecurityScheme _target;
+        internal OpenApiSecurityScheme _target;
         private readonly OpenApiReference _reference;
         private string _description;
 
@@ -50,6 +50,17 @@ public OpenApiSecuritySchemeReference(string referenceId, OpenApiDocument hostDo
             Reference = _reference;
         }
 
+        internal OpenApiSecuritySchemeReference(string referenceId, OpenApiSecurityScheme target)
+        {
+            _target = target;
+
+            _reference = new OpenApiReference()
+            {
+                Id = referenceId,
+                Type = ReferenceType.SecurityScheme,
+            };
+        }
+
         /// <inheritdoc/>
         public override string Description
         {
@@ -107,7 +118,21 @@ public override void SerializeAsV31(IOpenApiWriter writer)
             {
                 SerializeInternal(writer, SerializeAsV31WithoutReference);
             }
-        }   
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(_reference))
+            {
+                _reference.SerializeAsV2(writer);
+                return;
+            }
+            else
+            {
+                SerializeInternal(writer, SerializeAsV2WithoutReference);
+            }
+        }
 
         /// <inheritdoc/>
         private void SerializeInternal(IOpenApiWriter writer,
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiSecurityRequirementDeserializer.cs
