Revert ICloneable changes and use reflection for deep copying

MaggieKimani1 · MaggieKimani1 · commit 7cd6abc1d5fd · 2022-07-06T19:42:19.000+03:00
diff --git a/src/Microsoft.OpenApi/Any/CloneHelper.cs b/src/Microsoft.OpenApi/Any/CloneHelper.cs
@@ -0,0 +1,36 @@
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Reflection;
+
+namespace Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Contains logic for cloning objects through copy constructors.
+    /// </summary>
+    public class CloneHelper
+    {
+        /// <summary>
+        /// Clones an instance of <see cref="IOpenApiAny"/> object from the copy constructor
+        /// </summary>
+        /// <param name="obj">The object instance.</param>
+        /// <returns>A clone copy or the object itself.</returns>
+        public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)
+        {
+            if (obj != null)
+            {
+                var t = obj.GetType();
+                foreach (ConstructorInfo ci in t.GetConstructors())
+                {
+                    ParameterInfo[] pi = ci.GetParameters();
+                    if (pi.Length == 1 && pi[0].ParameterType == t)
+                    {
+                        return (IOpenApiAny)ci.Invoke(new object[] { obj });
+                    }
+                }
+            }
+
+            return obj;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Any/IOpenApiAny.cs b/src/Microsoft.OpenApi/Any/IOpenApiAny.cs
@@ -9,7 +9,7 @@ namespace Microsoft.OpenApi.Any
     /// <summary>
     /// Base interface for all the types that represent Open API Any.
     /// </summary>
-    public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension, ICloneable
+    public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension
     {
         /// <summary>
         /// Type of an <see cref="IOpenApiAny"/>.
diff --git a/src/Microsoft.OpenApi/Any/OpenApiArray.cs b/src/Microsoft.OpenApi/Any/OpenApiArray.cs
@@ -10,22 +10,13 @@ namespace Microsoft.OpenApi.Any
     /// <summary>
     /// Open API array.
     /// </summary>
-    public class OpenApiArray : List<IOpenApiAny>, IOpenApiAny, ICloneable
+    public class OpenApiArray : List<IOpenApiAny>, IOpenApiAny
     {
         /// <summary>
         /// The type of <see cref="IOpenApiAny"/>
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Array;
 
-        /// <summary>
-        /// Implement ICloneable interface to allow for deep copying
-        /// </summary>
-        /// <returns>A new copy of <see cref="OpenApiArray"/></returns>
-        public object Clone()
-        {
-            return new OpenApiArray();
-        }
-
         /// <summary>
         /// Write out contents of OpenApiArray to passed writer
         /// </summary>
diff --git a/src/Microsoft.OpenApi/Any/OpenApiNull.cs b/src/Microsoft.OpenApi/Any/OpenApiNull.cs
@@ -15,16 +15,6 @@ public class OpenApiNull : IOpenApiAny
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Null;
 
-
-        /// <summary>
-        /// Implement ICloneable interface to allow for deep copying
-        /// </summary>
-        /// <returns>A new copy of <see cref="OpenApiNull"/></returns>
-        public object Clone()
-        {
-            return new OpenApiNull();
-        }
-
         /// <summary>
         /// Write out null representation
         /// </summary>
diff --git a/src/Microsoft.OpenApi/Any/OpenApiObject.cs b/src/Microsoft.OpenApi/Any/OpenApiObject.cs
@@ -16,15 +16,6 @@ public class OpenApiObject : Dictionary<string, IOpenApiAny>, IOpenApiAny
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Object;
 
-        /// <summary>
-        /// Implement ICloneable interface to allow for deep copying
-        /// </summary>
-        /// <returns>A new copy of <see cref="OpenApiObject"/></returns>
-        public object Clone()
-        {
-            return new OpenApiObject();
-        }
-
         /// <summary>
         /// Serialize OpenApiObject to writer
         /// </summary>
diff --git a/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs b/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
@@ -39,7 +39,6 @@ public OpenApiPrimitive(OpenApiPrimitive<T> openApiPrimitive)
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Primitive;
 
-
         /// <summary>
         /// The primitive class this object represents.
         /// </summary>
@@ -50,40 +49,6 @@ public OpenApiPrimitive(OpenApiPrimitive<T> openApiPrimitive)
         /// </summary>
         public T Value { get; }
 
-        /// <summary>
-        /// Implement ICloneable interface to allow for deep copying
-        /// </summary>
-        /// <returns>A new copy of <see cref="IOpenApiPrimitive"/></returns>
-        public object Clone()
-        {
-            var clone = CloneFromCopyConstructor(this);
-            if (clone == null) throw new ApplicationException("There's no copy constructor defined");
-            return clone;
-        }
-
-        /// <summary>
-        /// Clones an instance of <see cref="IOpenApiPrimitive"/> object from the copy constructor
-        /// </summary>
-        /// <param name="obj">The object instance.</param>
-        /// <returns>A clone copy.</returns>
-        public static object CloneFromCopyConstructor(Object obj)
-        {
-            if (obj != null)
-            {
-                Type t = obj.GetType();
-                foreach (ConstructorInfo ci in t.GetConstructors())
-                {
-                    ParameterInfo[] pi = ci.GetParameters();
-                    if (pi.Length == 1 && pi[0].ParameterType == t)
-                    {
-                        return ci.Invoke(new object[] { obj });
-                    }
-                }
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Write out content of primitive element
         /// </summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExample.cs b/src/Microsoft.OpenApi/Models/OpenApiExample.cs
@@ -66,7 +66,7 @@ public OpenApiExample(OpenApiExample example)
         {
             Summary = example.Summary;
             Description = example.Description;
-            Value = (IOpenApiAny)example.Value.Clone();
+            Value = CloneHelper.CloneFromCopyConstructor(example.Value);
             ExternalValue = example.ExternalValue;
             Extensions = new Dictionary<string, IOpenApiExtension>(example.Extensions);
             Reference = new(example.Reference);
diff --git a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
@@ -106,7 +106,7 @@ public OpenApiHeader(OpenApiHeader header)
             Explode = header.Explode;
             AllowReserved = header.AllowReserved;
             Schema = new(header.Schema);
-            Example = (IOpenApiAny)header.Example.Clone();
+            Example = CloneHelper.CloneFromCopyConstructor(header.Example);
             Examples = new Dictionary<string, OpenApiExample>(header.Examples);
             Content = new Dictionary<string, OpenApiMediaType>(header.Content);
             Extensions = new Dictionary<string, IOpenApiExtension>(header.Extensions);
diff --git a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
@@ -54,7 +54,7 @@ public OpenApiMediaType() {}
         public OpenApiMediaType(OpenApiMediaType mediaType)
         {
             Schema = new(mediaType.Schema);
-            Example = (IOpenApiAny)mediaType.Example.Clone();
+            Example = CloneHelper.CloneFromCopyConstructor(mediaType.Example);
             Examples = new Dictionary<string, OpenApiExample>(mediaType.Examples);
             Encoding = new Dictionary<string, OpenApiEncoding>(mediaType.Encoding);
             Extensions = new Dictionary<string, IOpenApiExtension>(mediaType.Extensions);
diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -157,7 +157,7 @@ public OpenApiParameter(OpenApiParameter parameter)
             AllowReserved = parameter.AllowReserved;
             Schema = new(parameter.Schema);
             Examples = new Dictionary<string, OpenApiExample>(parameter.Examples);
-            Example = (IOpenApiAny)parameter.Example.Clone();
+            Example = CloneHelper.CloneFromCopyConstructor(parameter.Example);
             Content = new Dictionary<string, OpenApiMediaType>(parameter.Content);
             Extensions = new Dictionary<string, IOpenApiExtension>(parameter.Extensions);
             AllowEmptyValue = parameter.AllowEmptyValue;
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -264,7 +264,7 @@ public OpenApiSchema(OpenApiSchema schema)
             MinLength = schema.MinLength;
             Pattern = schema.Pattern;
             MultipleOf = schema.MultipleOf;
-            Default = (IOpenApiAny)schema.Default.Clone();
+            Default = CloneHelper.CloneFromCopyConstructor(schema.Default);
             ReadOnly = schema.ReadOnly;
             WriteOnly = schema.WriteOnly;
             AllOf = new List<OpenApiSchema>(schema.AllOf);
@@ -282,7 +282,7 @@ public OpenApiSchema(OpenApiSchema schema)
             AdditionalPropertiesAllowed = schema.AdditionalPropertiesAllowed;
             AdditionalProperties = new(schema.AdditionalProperties);
             Discriminator = new(schema.Discriminator);
-            Example = (IOpenApiAny)schema.Example.Clone();
+            Example = CloneHelper.CloneFromCopyConstructor(schema.Example);
             Enum = new List<IOpenApiAny>(schema.Enum);
             Nullable = schema.Nullable;
             ExternalDocs = new(schema.ExternalDocs);
diff --git a/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs b/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
@@ -26,7 +26,7 @@ public RuntimeExpressionAnyWrapper() {}
         /// </summary>
         public RuntimeExpressionAnyWrapper(RuntimeExpressionAnyWrapper runtimeExpressionAnyWrapper)
         {
-            Any = (IOpenApiAny)runtimeExpressionAnyWrapper.Any.Clone();
+            Any = CloneHelper.CloneFromCopyConstructor(runtimeExpressionAnyWrapper.Any);
             Expression = runtimeExpressionAnyWrapper.Expression;
         }
 
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
@@ -11,19 +11,23 @@ namespace Microsoft.OpenApi.Any
         Array = 2,
         Object = 3,
     }
-    public interface IOpenApiAny : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public class CloneHelper
+    {
+        public CloneHelper() { }
+        public static Microsoft.OpenApi.Any.IOpenApiAny CloneFromCopyConstructor(Microsoft.OpenApi.Any.IOpenApiAny obj) { }
+    }
+    public interface IOpenApiAny : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         Microsoft.OpenApi.Any.AnyType AnyType { get; }
     }
-    public interface IOpenApiPrimitive : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public interface IOpenApiPrimitive : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         Microsoft.OpenApi.Any.PrimitiveType PrimitiveType { get; }
     }
-    public class OpenApiArray : System.Collections.Generic.List<Microsoft.OpenApi.Any.IOpenApiAny>, Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public class OpenApiArray : System.Collections.Generic.List<Microsoft.OpenApi.Any.IOpenApiAny>, Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         public OpenApiArray() { }
         public Microsoft.OpenApi.Any.AnyType AnyType { get; }
-        public object Clone() { }
         public void Write(Microsoft.OpenApi.Writers.IOpenApiWriter writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) { }
     }
     public class OpenApiBinary : Microsoft.OpenApi.Any.OpenApiPrimitive<byte[]>
@@ -72,35 +76,31 @@ namespace Microsoft.OpenApi.Any
         public OpenApiLong(long value) { }
         public override Microsoft.OpenApi.Any.PrimitiveType PrimitiveType { get; }
     }
-    public class OpenApiNull : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public class OpenApiNull : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         public OpenApiNull() { }
         public Microsoft.OpenApi.Any.AnyType AnyType { get; }
-        public object Clone() { }
         public void Write(Microsoft.OpenApi.Writers.IOpenApiWriter writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) { }
     }
-    public class OpenApiObject : System.Collections.Generic.Dictionary<string, Microsoft.OpenApi.Any.IOpenApiAny>, Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public class OpenApiObject : System.Collections.Generic.Dictionary<string, Microsoft.OpenApi.Any.IOpenApiAny>, Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         public OpenApiObject() { }
         public Microsoft.OpenApi.Any.AnyType AnyType { get; }
-        public object Clone() { }
         public void Write(Microsoft.OpenApi.Writers.IOpenApiWriter writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) { }
     }
     public class OpenApiPassword : Microsoft.OpenApi.Any.OpenApiPrimitive<string>
     {
         public OpenApiPassword(string value) { }
         public override Microsoft.OpenApi.Any.PrimitiveType PrimitiveType { get; }
     }
-    public abstract class OpenApiPrimitive<T> : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Any.IOpenApiPrimitive, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension, System.ICloneable
+    public abstract class OpenApiPrimitive<T> : Microsoft.OpenApi.Any.IOpenApiAny, Microsoft.OpenApi.Any.IOpenApiPrimitive, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtension
     {
         public OpenApiPrimitive(Microsoft.OpenApi.Any.OpenApiPrimitive<T> openApiPrimitive) { }
         public OpenApiPrimitive(T value) { }
         public Microsoft.OpenApi.Any.AnyType AnyType { get; }
         public abstract Microsoft.OpenApi.Any.PrimitiveType PrimitiveType { get; }
         public T Value { get; }
-        public object Clone() { }
         public void Write(Microsoft.OpenApi.Writers.IOpenApiWriter writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) { }
-        public static object CloneFromCopyConstructor(object obj) { }
     }
     public class OpenApiString : Microsoft.OpenApi.Any.OpenApiPrimitive<string>
     {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.OpenApi.Any`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Base interface for all the types that represent Open API Any.`
`11`	`11`	`/// </summary>`
`12`		`- public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension, ICloneable`
	`12`	`+ public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Type of an <see cref="IOpenApiAny"/>.`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public OpenApiExample(OpenApiExample example)`
`66`	`66`	`{`
`67`	`67`	`Summary = example.Summary;`
`68`	`68`	`Description = example.Description;`
`69`		`- Value = (IOpenApiAny)example.Value.Clone();`
	`69`	`+ Value = CloneHelper.CloneFromCopyConstructor(example.Value);`
`70`	`70`	`ExternalValue = example.ExternalValue;`
`71`	`71`	`Extensions = new Dictionary<string, IOpenApiExtension>(example.Extensions);`
`72`	`72`	`Reference = new(example.Reference);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public OpenApiMediaType() {}`
`54`	`54`	`public OpenApiMediaType(OpenApiMediaType mediaType)`
`55`	`55`	`{`
`56`	`56`	`Schema = new(mediaType.Schema);`
`57`		`- Example = (IOpenApiAny)mediaType.Example.Clone();`
	`57`	`+ Example = CloneHelper.CloneFromCopyConstructor(mediaType.Example);`
`58`	`58`	`Examples = new Dictionary<string, OpenApiExample>(mediaType.Examples);`
`59`	`59`	`Encoding = new Dictionary<string, OpenApiEncoding>(mediaType.Encoding);`
`60`	`60`	`Extensions = new Dictionary<string, IOpenApiExtension>(mediaType.Extensions);`