Clean up dictionary cloning logic

MaggieKimani1 · MaggieKimani1 · commit 08acaaa79119 · 2023-04-04T10:25:18.000+03:00
diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
@@ -86,7 +86,7 @@ public OpenApiComponents(OpenApiComponents components)
             SecuritySchemes = components?.SecuritySchemes != null ? DictionaryCloneHelper.Clone(components.SecuritySchemes) : null;
             Links = components?.Links != null ? DictionaryCloneHelper.Clone(components.Links) : null;
             Callbacks = components?.Callbacks != null ? DictionaryCloneHelper.Clone(components.Callbacks) : null;
-            Extensions = components?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(components.Extensions) : null;
+            Extensions = components?.Extensions != null ? DictionaryCloneHelper.Clone(components.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiContact.cs b/src/Microsoft.OpenApi/Models/OpenApiContact.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -48,7 +49,7 @@ public OpenApiContact(OpenApiContact contact)
             Name = contact?.Name ?? Name;
             Url = contact?.Url != null ? new Uri(contact.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
             Email = contact?.Email ?? Email;
-            Extensions = contact?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(contact.Extensions) : null;
+            Extensions = contact?.Extensions != null ? DictionaryCloneHelper.Clone(contact.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -30,7 +31,7 @@ protected OpenApiExtensibleDictionary(
             Dictionary<string, T> dictionary = null,
             IDictionary<string, IOpenApiExtension> extensions = null) : base (dictionary)
         {
-            Extensions = extensions != null ? new Dictionary<string, IOpenApiExtension>(extensions) : null;
+            Extensions = extensions != null ? DictionaryCloneHelper.Clone(extensions) : null;
         }       
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -41,7 +42,7 @@ public OpenApiExternalDocs(OpenApiExternalDocs externalDocs)
         {
             Description = externalDocs?.Description ?? Description;
             Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
-            Extensions = externalDocs?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(externalDocs.Extensions) : null;
+            Extensions = externalDocs?.Extensions != null ? DictionaryCloneHelper.Clone(externalDocs.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiInfo.cs b/src/Microsoft.OpenApi/Models/OpenApiInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -65,7 +66,7 @@ public OpenApiInfo(OpenApiInfo info)
             TermsOfService = info?.TermsOfService ?? TermsOfService;
             Contact = info?.Contact != null ? new(info?.Contact) : null;
             License = info?.License != null ? new(info?.License) : null;
-            Extensions = info?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(info.Extensions) : null;
+            Extensions = info?.Extensions != null ? DictionaryCloneHelper.Clone(info.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -41,7 +42,7 @@ public OpenApiLicense(OpenApiLicense license)
         {
             Name = license?.Name ?? Name;
             Url = license?.Url != null ? new Uri(license.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
-            Extensions = license?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(license.Extensions) : null;
+            Extensions = license?.Extensions != null ? DictionaryCloneHelper.Clone(license.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiLink.cs b/src/Microsoft.OpenApi/Models/OpenApiLink.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -77,7 +78,7 @@ public OpenApiLink(OpenApiLink link)
             RequestBody = link?.RequestBody != null ? new(link?.RequestBody) : null;
             Description = link?.Description ?? Description;
             Server = link?.Server != null ? new(link?.Server) : null;
-            Extensions = link?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(link.Extensions) : null;
+            Extensions = link?.Extensions != null ? DictionaryCloneHelper.Clone(link.Extensions) : null;
             UnresolvedReference = link?.UnresolvedReference ?? UnresolvedReference;
             Reference = link?.Reference != null ? new(link?.Reference) : null;
         }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -54,8 +55,8 @@ public OpenApiOAuthFlow(OpenApiOAuthFlow oAuthFlow)
             AuthorizationUrl = oAuthFlow?.AuthorizationUrl != null ? new Uri(oAuthFlow.AuthorizationUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
             TokenUrl = oAuthFlow?.TokenUrl != null ? new Uri(oAuthFlow.TokenUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
             RefreshUrl = oAuthFlow?.RefreshUrl != null ? new Uri(oAuthFlow.RefreshUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
-            Scopes = oAuthFlow?.Scopes != null ? new Dictionary<string, string>(oAuthFlow.Scopes) : null;
-            Extensions = oAuthFlow?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlow.Extensions) : null;
+            Scopes = oAuthFlow?.Scopes != null ? DictionaryCloneHelper.Clone(oAuthFlow.Scopes) : null;
+            Extensions = oAuthFlow?.Extensions != null ? DictionaryCloneHelper.Clone(oAuthFlow.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -53,7 +54,7 @@ public OpenApiOAuthFlows(OpenApiOAuthFlows oAuthFlows)
             Password = oAuthFlows?.Password != null ? new(oAuthFlows?.Password) : null;
             ClientCredentials = oAuthFlows?.ClientCredentials != null ? new(oAuthFlows?.ClientCredentials) : null;
             AuthorizationCode = oAuthFlows?.AuthorizationCode != null ? new(oAuthFlows?.AuthorizationCode) : null;
-            Extensions = oAuthFlows?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlows.Extensions) : null;
+            Extensions = oAuthFlows?.Extensions != null ? DictionaryCloneHelper.Clone(oAuthFlows.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs
@@ -129,7 +129,7 @@ public OpenApiOperation(OpenApiOperation operation)
             Deprecated = operation?.Deprecated ?? Deprecated;
             Security = operation?.Security != null ? new List<OpenApiSecurityRequirement>(operation.Security) : null;
             Servers = operation?.Servers != null ? new List<OpenApiServer>(operation.Servers) : null;
-            Extensions = operation?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(operation.Extensions) : null;
+            Extensions = operation?.Extensions != null ? DictionaryCloneHelper.Clone(operation.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -166,7 +166,7 @@ public OpenApiParameter(OpenApiParameter parameter)
             Examples = parameter?.Examples != null ? DictionaryCloneHelper.Clone(parameter.Examples) : null;
             Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor(parameter?.Example);
             Content = parameter?.Content != null ? DictionaryCloneHelper.Clone(parameter.Content) : null;
-            Extensions = parameter?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(parameter.Extensions) : null;
+            Extensions = parameter?.Extensions != null ? DictionaryCloneHelper.Clone(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
@@ -82,7 +82,7 @@ public OpenApiPathItem(OpenApiPathItem pathItem)
             Operations = pathItem?.Operations != null ? DictionaryCloneHelper.Clone(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;
+            Extensions = pathItem?.Extensions != null ? DictionaryCloneHelper.Clone(pathItem.Extensions) : null;
             UnresolvedReference = pathItem?.UnresolvedReference ?? UnresolvedReference;
             Reference = pathItem?.Reference != null ? new(pathItem?.Reference) : null;
         }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -63,7 +63,7 @@ public OpenApiRequestBody(OpenApiRequestBody requestBody)
             Description = requestBody?.Description ?? Description;
             Required = requestBody?.Required ?? Required;
             Content = requestBody?.Content != null ? DictionaryCloneHelper.Clone(requestBody.Content) : null;
-            Extensions = requestBody?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(requestBody.Extensions) : null;
+            Extensions = requestBody?.Extensions != null ? DictionaryCloneHelper.Clone(requestBody.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -92,7 +93,7 @@ public OpenApiSecurityScheme(OpenApiSecurityScheme securityScheme)
             BearerFormat = securityScheme?.BearerFormat ?? BearerFormat;
             Flows = securityScheme?.Flows != null ? new(securityScheme?.Flows) : null;
             OpenIdConnectUrl = securityScheme?.OpenIdConnectUrl != null ? new Uri(securityScheme.OpenIdConnectUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
-            Extensions = securityScheme?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(securityScheme.Extensions) : null;
+            Extensions = securityScheme?.Extensions != null ? DictionaryCloneHelper.Clone(securityScheme.Extensions) : null;
             UnresolvedReference = securityScheme?.UnresolvedReference ?? UnresolvedReference;
             Reference = securityScheme?.Reference != null ? new(securityScheme?.Reference) : null;
         }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiServer.cs b/src/Microsoft.OpenApi/Models/OpenApiServer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
@@ -50,7 +50,7 @@ public OpenApiServer(OpenApiServer server)
             Description = server?.Description ?? Description;
             Url = server?.Url ?? Url;
             Variables = server?.Variables != null ? DictionaryCloneHelper.Clone(server.Variables) : null;
-            Extensions = server?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(server.Extensions) : null;
+            Extensions = server?.Extensions != null ? DictionaryCloneHelper.Clone(server.Extensions) : null;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs b/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -47,7 +48,7 @@ public OpenApiServerVariable(OpenApiServerVariable serverVariable)
             Description = serverVariable?.Description;
             Default = serverVariable?.Default;
             Enum = serverVariable?.Enum != null ? new List<string>(serverVariable?.Enum) : serverVariable?.Enum;
-            Extensions = serverVariable?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(serverVariable?.Extensions) : serverVariable?.Extensions;
+            Extensions = serverVariable?.Extensions != null ? DictionaryCloneHelper.Clone(serverVariable?.Extensions) : serverVariable?.Extensions;
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiTag.cs b/src/Microsoft.OpenApi/Models/OpenApiTag.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -56,7 +57,7 @@ public OpenApiTag(OpenApiTag tag)
             Name = tag?.Name ?? Name;
             Description = tag?.Description ?? Description;
             ExternalDocs = tag?.ExternalDocs != null ? new(tag?.ExternalDocs) : null;
-            Extensions = tag?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(tag.Extensions) : null;
+            Extensions = tag?.Extensions != null ? DictionaryCloneHelper.Clone(tag.Extensions) : null;
             UnresolvedReference = tag?.UnresolvedReference ?? UnresolvedReference;
             Reference = tag?.Reference != null ? new(tag?.Reference) : null;
         }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiXml.cs b/src/Microsoft.OpenApi/Models/OpenApiXml.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -61,7 +62,7 @@ public OpenApiXml(OpenApiXml xml)
             Prefix = xml?.Prefix ?? Prefix;
             Attribute = xml?.Attribute ?? Attribute;
             Wrapped = xml?.Wrapped ?? Wrapped;
-            Extensions = xml?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(xml.Extensions) : null;
+            Extensions = xml?.Extensions != null ? DictionaryCloneHelper.Clone(xml.Extensions) : null;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+using Microsoft.OpenApi.Helpers;`
`5`	`6`	`using Microsoft.OpenApi.Interfaces;`
`6`	`7`	`using Microsoft.OpenApi.Writers;`
`7`	`8`
`@@ -30,7 +31,7 @@ protected OpenApiExtensibleDictionary(`
`30`	`31`	`Dictionary<string, T> dictionary = null,`
`31`	`32`	`IDictionary<string, IOpenApiExtension> extensions = null) : base (dictionary)`
`32`	`33`	`{`
`33`		`- Extensions = extensions != null ? new Dictionary<string, IOpenApiExtension>(extensions) : null;`
	`34`	`+ Extensions = extensions != null ? DictionaryCloneHelper.Clone(extensions) : null;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using Microsoft.OpenApi.Any;`
	`7`	`+using Microsoft.OpenApi.Helpers;`
`7`	`8`	`using Microsoft.OpenApi.Interfaces;`
`8`	`9`	`using Microsoft.OpenApi.Writers;`
`9`	`10`
`@@ -41,7 +42,7 @@ public OpenApiExternalDocs(OpenApiExternalDocs externalDocs)`
`41`	`42`	`{`
`42`	`43`	`Description = externalDocs?.Description ?? Description;`
`43`	`44`	`Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;`
`44`		`- Extensions = externalDocs?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(externalDocs.Extensions) : null;`
	`45`	`+ Extensions = externalDocs?.Extensions != null ? DictionaryCloneHelper.Clone(externalDocs.Extensions) : null;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public OpenApiOperation(OpenApiOperation operation)`
`129`	`129`	`Deprecated = operation?.Deprecated ?? Deprecated;`
`130`	`130`	`Security = operation?.Security != null ? new List<OpenApiSecurityRequirement>(operation.Security) : null;`
`131`	`131`	`Servers = operation?.Servers != null ? new List<OpenApiServer>(operation.Servers) : null;`
`132`		`- Extensions = operation?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(operation.Extensions) : null;`
	`132`	`+ Extensions = operation?.Extensions != null ? DictionaryCloneHelper.Clone(operation.Extensions) : null;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/// <summary>`