Revert dictionary clone helper logic in the copy constructors to unblock kiota

MaggieKimani1 · MaggieKimani1 · commit d940bf627bf3 · 2023-04-17T11:34:23.000+03:00
diff --git a/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs b/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs
@@ -2,6 +2,9 @@
 // Licensed under the MIT license.
 
 using System.Reflection;
+using Microsoft.OpenApi.Helpers;
+using System.Text.Json.Serialization;
+using System.Text.Json;
 
 namespace Microsoft.OpenApi.Any
 {
@@ -27,7 +30,7 @@ public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)
                     {
                         return (IOpenApiAny)ci.Invoke(new object[] { obj });
                     }
-                }
+                }                
             }
 
             return obj;
diff --git a/src/Microsoft.OpenApi/Helpers/DictionaryCloneHelper.cs b/src/Microsoft.OpenApi/Helpers/DictionaryCloneHelper.cs
@@ -19,12 +19,12 @@ internal static class DictionaryCloneHelper
         /// <param name="dictionary">The target dictionary to clone.</param>
         /// <returns>The cloned dictionary.</returns>
         internal static Dictionary<T, U> Clone<T, U>(IDictionary<T, U> dictionary)
-        {            
+        {
             if (dictionary is null) return null;
-            
+
             var clonedDictionary = new Dictionary<T, U>(dictionary.Keys.Count);
             var clonedObjects = new Dictionary<object, object>();
-            
+
             foreach (var keyValuePair in dictionary)
             {
                 // If the object has already been cloned, use the cloned object instead of cloning it again
@@ -36,11 +36,11 @@ internal static Dictionary<T, U> Clone<T, U>(IDictionary<T, U> dictionary)
                 {
                     // Create instance of the specified type using the constructor matching the specified parameter types.
                     clonedDictionary[keyValuePair.Key] = (U)Activator.CreateInstance(keyValuePair.Value.GetType(), keyValuePair.Value);
-                    
+
                     // Add the cloned object to the dictionary of cloned objects
                     clonedObjects.Add(keyValuePair.Value, clonedDictionary[keyValuePair.Key]);
-                }                
-            }            
+                }
+            }
 
             return clonedDictionary;
         }
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -33,6 +33,9 @@
     <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Text.Json" Version="7.0.0" />
+    </ItemGroup>
 
     <ItemGroup>
         <Compile Update="Properties\SRResource.Designer.cs">
diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -77,15 +77,15 @@ public OpenApiComponents() { }
         /// </summary>
         public OpenApiComponents(OpenApiComponents components)
         {
-            Schemas = DictionaryCloneHelper.Clone(components?.Schemas);
-            Responses = DictionaryCloneHelper.Clone(components?.Responses);
-            Parameters = DictionaryCloneHelper.Clone(components?.Parameters);
-            Examples = DictionaryCloneHelper.Clone(components?.Examples);
-            RequestBodies = DictionaryCloneHelper.Clone(components?.RequestBodies);
-            Headers = DictionaryCloneHelper.Clone(components?.Headers);
-            SecuritySchemes = DictionaryCloneHelper.Clone(components?.SecuritySchemes);
-            Links = DictionaryCloneHelper.Clone(components?.Links);
-            Callbacks = DictionaryCloneHelper.Clone(components?.Callbacks);
+            Schemas = components?.Schemas != null ? new Dictionary<string, OpenApiSchema>(components.Schemas) : null;
+            Responses = components?.Responses != null ? new Dictionary<string, OpenApiResponse>(components.Responses) : null;
+            Parameters = components?.Parameters != null ? new Dictionary<string, OpenApiParameter>(components.Parameters) : null;
+            Examples = components?.Examples != null ? new Dictionary<string, OpenApiExample>(components.Examples) : null;
+            RequestBodies = components?.RequestBodies != null ? new Dictionary<string, OpenApiRequestBody>(components.RequestBodies) : null;
+            Headers = components?.Headers != null ? new Dictionary<string, OpenApiHeader>(components.Headers) : null;
+            SecuritySchemes = components?.SecuritySchemes != null ? new Dictionary<string, OpenApiSecurityScheme>(components.SecuritySchemes) : null;
+            Links = components?.Links != null ? new Dictionary<string, OpenApiLink>(components.Links) : null;
+            Callbacks = components?.Callbacks != null ? new Dictionary<string, OpenApiCallback>(components.Callbacks) : null;
             Extensions = components?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(components.Extensions) : null;
         }
 
diff --git a/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs b/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs
@@ -65,7 +65,7 @@ public OpenApiEncoding() {}
         public OpenApiEncoding(OpenApiEncoding encoding)
         {
             ContentType = encoding?.ContentType ?? ContentType;
-            Headers = DictionaryCloneHelper.Clone(encoding?.Headers);
+            Headers = encoding?.Headers != null ? new Dictionary<string, OpenApiHeader>(encoding.Headers) : null;
             Style = encoding?.Style ?? Style;
             Explode = encoding?.Explode ?? Explode;
             AllowReserved = encoding?.AllowReserved ?? AllowReserved;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
@@ -108,8 +108,8 @@ public OpenApiHeader(OpenApiHeader header)
             AllowReserved = header?.AllowReserved ?? AllowReserved;
             Schema = header?.Schema != null ? new(header?.Schema) : null;
             Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor(header?.Example);
-            Examples = DictionaryCloneHelper.Clone(header?.Examples);
-            Content = DictionaryCloneHelper.Clone(header?.Content);
+            Examples = header?.Examples != null ? new Dictionary<string, OpenApiExample>(header.Examples) : null;
+            Content = header?.Content != null ? new Dictionary<string, OpenApiMediaType>(header.Content) : null;
             Extensions = header?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(header.Extensions) : null;
         }
 
diff --git a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
@@ -56,8 +56,8 @@ public OpenApiMediaType(OpenApiMediaType mediaType)
         {
             Schema = mediaType?.Schema != null ? new(mediaType?.Schema) : null;
             Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor(mediaType?.Example);
-            Examples = DictionaryCloneHelper.Clone(mediaType?.Examples);
-            Encoding = DictionaryCloneHelper.Clone(mediaType?.Encoding);
+            Examples = mediaType?.Examples != null ? new Dictionary<string, OpenApiExample>(mediaType.Examples) : null;
+            Encoding = mediaType?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(mediaType.Encoding) : null;
             Extensions = mediaType?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(mediaType.Extensions) : null;
         }
 
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs
@@ -125,7 +125,7 @@ public OpenApiOperation(OpenApiOperation operation)
             Parameters = operation?.Parameters != null ? new List<OpenApiParameter>(operation.Parameters) : null;
             RequestBody = operation?.RequestBody != null ? new(operation?.RequestBody) : null;
             Responses = operation?.Responses != null ? new(operation?.Responses) : null;
-            Callbacks = DictionaryCloneHelper.Clone(operation?.Callbacks);
+            Callbacks = operation?.Callbacks != null ? new Dictionary<string, OpenApiCallback>(operation.Callbacks) : null;
             Deprecated = operation?.Deprecated ?? Deprecated;
             Security = operation?.Security != null ? new List<OpenApiSecurityRequirement>(operation.Security) : null;
             Servers = operation?.Servers != null ? new List<OpenApiServer>(operation.Servers) : null;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -163,9 +163,9 @@ public OpenApiParameter(OpenApiParameter parameter)
             Explode = parameter?.Explode ?? Explode;
             AllowReserved = parameter?.AllowReserved ?? AllowReserved;
             Schema = parameter?.Schema != null ? new(parameter?.Schema) : null;
-            Examples = DictionaryCloneHelper.Clone(parameter?.Examples);
+            Examples = parameter?.Examples != null ? new Dictionary<string, OpenApiExample>(parameter.Examples) : null;
             Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor(parameter?.Example);
-            Content = DictionaryCloneHelper.Clone(parameter?.Content);
+            Content = parameter?.Content != null ? new Dictionary<string, OpenApiMediaType>(parameter.Content) : null;
             Extensions = parameter?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(parameter.Extensions) : null;
             AllowEmptyValue = parameter?.AllowEmptyValue ?? AllowEmptyValue;
             Deprecated = parameter?.Deprecated ?? Deprecated;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
@@ -79,7 +79,7 @@ public OpenApiPathItem(OpenApiPathItem pathItem)
         {
             Summary = pathItem?.Summary ?? Summary;
             Description = pathItem?.Description ?? Description;
-            Operations = DictionaryCloneHelper.Clone(pathItem?.Operations);
+            Operations = pathItem?.Operations != null ? new Dictionary<OperationType, OpenApiOperation>(pathItem.Operations) : null;
             Servers = pathItem?.Servers != null ? new List<OpenApiServer>(pathItem.Servers) : null;
             Parameters = pathItem?.Parameters != null ? new List<OpenApiParameter>(pathItem.Parameters) : null;
             Extensions = pathItem?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
@@ -22,6 +22,6 @@ public OpenApiPaths() {}
         /// Initializes a copy of <see cref="OpenApiPaths"/> object
         /// </summary>
         /// <param name="paths">The <see cref="OpenApiPaths"/>.</param>
-        public OpenApiPaths(OpenApiPaths paths) : base(DictionaryCloneHelper.Clone(paths)) { }             
+        public OpenApiPaths(OpenApiPaths paths) : base(dictionary: paths) { }             
     }
 }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
@@ -62,7 +62,7 @@ public OpenApiRequestBody(OpenApiRequestBody requestBody)
             Reference = requestBody?.Reference != null ? new(requestBody?.Reference) : null;
             Description = requestBody?.Description ?? Description;
             Required = requestBody?.Required ?? Required;
-            Content = DictionaryCloneHelper.Clone(requestBody?.Content);
+            Content = requestBody?.Content != null ? new Dictionary<string, OpenApiMediaType>(requestBody.Content) : null;
             Extensions = requestBody?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(requestBody.Extensions) : null;
         }
 
diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs
@@ -63,9 +63,9 @@ public OpenApiResponse() {}
         public OpenApiResponse(OpenApiResponse response)
         {
             Description = response?.Description ?? Description;
-            Headers = DictionaryCloneHelper.Clone(response?.Headers);
-            Content = DictionaryCloneHelper.Clone(response?.Content);
-            Links = DictionaryCloneHelper.Clone(response?.Links);
+            Headers = response?.Headers != null ? new Dictionary<string, OpenApiHeader>(response.Headers) : null;
+            Content = response?.Content != null ? new Dictionary<string, OpenApiMediaType>(response.Content) : null;
+            Links = response?.Links != null ? new Dictionary<string, OpenApiLink>(response.Links) : null;
             Extensions = response?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(response.Extensions) : null;
             UnresolvedReference = response?.UnresolvedReference ?? UnresolvedReference;
             Reference = response?.Reference != null ? new(response?.Reference) : null;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponses.cs b/src/Microsoft.OpenApi/Models/OpenApiResponses.cs
@@ -19,6 +19,6 @@ public OpenApiResponses() { }
         /// Initializes a copy of <see cref="OpenApiResponses"/> object
         /// </summary>
         /// <param name="openApiResponses">The <see cref="OpenApiResponses"/></param>
-        public OpenApiResponses(OpenApiResponses openApiResponses) : base(DictionaryCloneHelper.Clone(openApiResponses)) {}
+        public OpenApiResponses(OpenApiResponses openApiResponses) : base(dictionary: openApiResponses) {}
     }
 }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -277,7 +277,7 @@ public OpenApiSchema(OpenApiSchema schema)
             MaxItems = schema?.MaxItems ?? MaxItems;
             MinItems = schema?.MinItems ?? MinItems;
             UniqueItems = schema?.UniqueItems ?? UniqueItems;
-            Properties = DictionaryCloneHelper.Clone(schema?.Properties);
+            Properties = schema?.Properties != null ? new Dictionary<string, OpenApiSchema>(schema.Properties) : null;
             MaxProperties = schema?.MaxProperties ?? MaxProperties;
             MinProperties = schema?.MinProperties ?? MinProperties;
             AdditionalPropertiesAllowed = schema?.AdditionalPropertiesAllowed ?? AdditionalPropertiesAllowed;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiServer.cs b/src/Microsoft.OpenApi/Models/OpenApiServer.cs
@@ -49,7 +49,7 @@ public OpenApiServer(OpenApiServer server)
         {
             Description = server?.Description ?? Description;
             Url = server?.Url ?? Url;
-            Variables = DictionaryCloneHelper.Clone(server?.Variables);
+            Variables = server?.Variables != null ? new Dictionary<string, OpenApiServerVariable>(server.Variables) : null;
             Extensions = server?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(server.Extensions) : null;
         }
 
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -1339,26 +1339,26 @@ private static OpenApiDocument ParseInputFile(string filePath)
             return openApiDoc;
         }
 
-        [Fact]
-        public void CopyConstructorForAdvancedDocumentWorks()
-        {
-            // Arrange & Act
-            var doc = new OpenApiDocument(AdvancedDocument);
-
-            var docOpId = doc.Paths["/pets"].Operations[OperationType.Get].OperationId = "findAllMyPets";
-            var advancedDocOpId = AdvancedDocument.Paths["/pets"].Operations[OperationType.Get].OperationId;
-            var responseSchemaTypeCopy = doc.Paths["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Type = "object";
-            var advancedDocResponseSchemaType = AdvancedDocument.Paths["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Type;
-
-            // Assert
-            Assert.NotNull(doc.Info);
-            Assert.NotNull(doc.Servers);
-            Assert.NotNull(doc.Paths);
-            Assert.Equal(2, doc.Paths.Count);
-            Assert.NotNull(doc.Components);
-            Assert.NotEqual(docOpId, advancedDocOpId);
-            Assert.NotEqual(responseSchemaTypeCopy, advancedDocResponseSchemaType);
-        }
+        //[Fact]
+        //public void CopyConstructorForAdvancedDocumentWorks()
+        //{
+        //    // Arrange & Act
+        //    var doc = new OpenApiDocument(AdvancedDocument);
+
+        //    var docOpId = doc.Paths["/pets"].Operations[OperationType.Get].OperationId = "findAllMyPets";
+        //    var advancedDocOpId = AdvancedDocument.Paths["/pets"].Operations[OperationType.Get].OperationId;
+        //    var responseSchemaTypeCopy = doc.Paths["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Type = "object";
+        //    var advancedDocResponseSchemaType = AdvancedDocument.Paths["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Type;
+
+        //    // Assert
+        //    Assert.NotNull(doc.Info);
+        //    Assert.NotNull(doc.Servers);
+        //    Assert.NotNull(doc.Paths);
+        //    Assert.Equal(2, doc.Paths.Count);
+        //    Assert.NotNull(doc.Components);
+        //    Assert.NotEqual(docOpId, advancedDocOpId);
+        //    Assert.NotEqual(responseSchemaTypeCopy, advancedDocResponseSchemaType);
+        //}
 
         [Fact]
         public void SerializeV2DocumentWithNonArraySchemaTypeDoesNotWriteOutCollectionFormat()

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Reflection;`
	`5`	`+using Microsoft.OpenApi.Helpers;`
	`6`	`+using System.Text.Json.Serialization;`
	`7`	`+using System.Text.Json;`
`5`	`8`
`6`	`9`	`namespace Microsoft.OpenApi.Any`
`7`	`10`	`{`
`@@ -27,7 +30,7 @@ public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)`
`27`	`30`	`{`
`28`	`31`	`return (IOpenApiAny)ci.Invoke(new object[] { obj });`
`29`	`32`	`}`
`30`		`- }`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`return obj;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public OpenApiEncoding() {}`
`65`	`65`	`public OpenApiEncoding(OpenApiEncoding encoding)`
`66`	`66`	`{`
`67`	`67`	`ContentType = encoding?.ContentType ?? ContentType;`
`68`		`- Headers = DictionaryCloneHelper.Clone(encoding?.Headers);`
	`68`	`+ Headers = encoding?.Headers != null ? new Dictionary<string, OpenApiHeader>(encoding.Headers) : null;`
`69`	`69`	`Style = encoding?.Style ?? Style;`
`70`	`70`	`Explode = encoding?.Explode ?? Explode;`
`71`	`71`	`AllowReserved = encoding?.AllowReserved ?? AllowReserved;`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ public OpenApiMediaType(OpenApiMediaType mediaType)`
`56`	`56`	`{`
`57`	`57`	`Schema = mediaType?.Schema != null ? new(mediaType?.Schema) : null;`
`58`	`58`	`Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor(mediaType?.Example);`
`59`		`- Examples = DictionaryCloneHelper.Clone(mediaType?.Examples);`
`60`		`- Encoding = DictionaryCloneHelper.Clone(mediaType?.Encoding);`
	`59`	`+ Examples = mediaType?.Examples != null ? new Dictionary<string, OpenApiExample>(mediaType.Examples) : null;`
	`60`	`+ Encoding = mediaType?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(mediaType.Encoding) : null;`
`61`	`61`	`Extensions = mediaType?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(mediaType.Extensions) : null;`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public OpenApiPathItem(OpenApiPathItem pathItem)`
`79`	`79`	`{`
`80`	`80`	`Summary = pathItem?.Summary ?? Summary;`
`81`	`81`	`Description = pathItem?.Description ?? Description;`
`82`		`- Operations = DictionaryCloneHelper.Clone(pathItem?.Operations);`
	`82`	`+ Operations = pathItem?.Operations != null ? new Dictionary<OperationType, OpenApiOperation>(pathItem.Operations) : null;`
`83`	`83`	`Servers = pathItem?.Servers != null ? new List<OpenApiServer>(pathItem.Servers) : null;`
`84`	`84`	`Parameters = pathItem?.Parameters != null ? new List<OpenApiParameter>(pathItem.Parameters) : null;`
`85`	`85`	`Extensions = pathItem?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;`