getting rid of SetDeepCloneableMembersFrom

Author: Vlad Ionescu

src/apigen/Apigen.cs

@@ -495,13 +495,6 @@ public void EmitClassProperties(AmqpClass c) {
             EmitLine("    public override int ProtocolClassId { get { return "+c.Index+"; } }");
             EmitLine("    public override string ProtocolClassName { get { return \""+c.Name+"\"; } }");
             EmitLine("");
-            EmitLine("    public override object Clone()");
-            EmitLine("    {");
-            EmitLine("        "+MangleClass(c.Name)+"Properties copy = MemberwiseClone() as "+MangleClass(c.Name)+"Properties;");
-            EmitLine("        copy.SetDeepCloneableMembersFrom(this);");
-            EmitLine("        return copy;");
-            EmitLine("    }");
-            EmitLine("");
             EmitLine("    public override void ReadPropertiesFrom(RabbitMQ.Client.Impl.ContentHeaderPropertyReader reader) {");
             foreach (AmqpField f in c.m_Fields)
             {

src/client/impl/BasicProperties.cs

@@ -121,17 +121,17 @@ public void SetPersistent(bool persistent) {
 	    }
 	}
 
-    protected override void SetDeepCloneableMembersFrom(Object src)
+    public override object Clone()
     {
-        base.SetDeepCloneableMembersFrom(src);
-        BasicProperties bpSrc = src as BasicProperties;
-
-        if (bpSrc.IsHeadersPresent())
+        BasicProperties clone = MemberwiseClone() as BasicProperties;
+        if (IsHeadersPresent())
         {
-            Headers = new Hashtable();
-            foreach (DictionaryEntry entry in bpSrc.Headers)
-                Headers[entry.Key] = entry.Value;
+            clone.Headers = new Hashtable();
+            foreach (DictionaryEntry entry in Headers)
+                clone.Headers[entry.Key] = entry.Value;
         }
+
+        return clone;
     }
     }
 }

src/client/impl/ContentHeaderBase.cs

@@ -69,7 +69,6 @@ public abstract class ContentHeaderBase : IContentHeader
         public abstract void ReadPropertiesFrom(ContentHeaderPropertyReader reader);
         public abstract void WritePropertiesTo(ContentHeaderPropertyWriter writer);
         public abstract void AppendPropertyDebugStringTo(System.Text.StringBuilder sb);
-        public abstract Object Clone();
 
         ///<summary>Fill this instance from the given byte buffer
         ///stream. Throws BodyTooLongException, which is the reason
@@ -101,10 +100,9 @@ public void WriteTo(NetworkBinaryWriter writer, ulong bodySize)
             WritePropertiesTo(new ContentHeaderPropertyWriter(writer));
         }
 
-        protected virtual void SetDeepCloneableMembersFrom(Object src)
+        public virtual object Clone()
         {
-            if (!this.GetType().Equals(src.GetType()))
-                throw new InvalidCastException("Trying to clone from object of different type");
+            throw new NotImplementedException();
         }
     }
 }

src/client/impl/FileProperties.cs

@@ -91,17 +91,17 @@ public abstract class FileProperties : ContentHeaderBase, IFileProperties
         public abstract bool IsTimestampPresent();
         public abstract bool IsClusterIdPresent();
 
-        protected override void SetDeepCloneableMembersFrom(object src)
+        public override object Clone()
         {
-            base.SetDeepCloneableMembersFrom(src);
-            FileProperties fpSrc = src as FileProperties;
-
-            if (fpSrc.IsHeadersPresent())
+            FileProperties clone = MemberwiseClone() as FileProperties;
+            if (IsHeadersPresent())
             {
-                Headers = new Hashtable();
-                foreach (DictionaryEntry entry in fpSrc.Headers)
-                    Headers[entry.Key] = entry.Value;
+                clone.Headers = new Hashtable();
+                foreach (DictionaryEntry entry in Headers)
+                    clone.Headers[entry.Key] = entry.Value;
             }
+
+            return clone;
         }
     }
 }

src/client/impl/StreamProperties.cs

@@ -79,17 +79,17 @@ public abstract class StreamProperties : ContentHeaderBase, IStreamProperties
         public abstract bool IsPriorityPresent();
         public abstract bool IsTimestampPresent();
 
-        protected override void SetDeepCloneableMembersFrom(object src)
+        public override object Clone()
         {
-            base.SetDeepCloneableMembersFrom(src);
-            StreamProperties spSrc = src as StreamProperties;
-
-            if (spSrc.IsHeadersPresent())
+            StreamProperties clone = MemberwiseClone() as StreamProperties;
+            if (IsHeadersPresent())
             {
-                Headers = new Hashtable();
-                foreach (DictionaryEntry entry in spSrc.Headers)
-                    Headers[entry.Key] = entry.Value;
+                clone.Headers = new Hashtable();
+                foreach (DictionaryEntry entry in Headers)
+                    clone.Headers[entry.Key] = entry.Value;
             }
+
+            return clone;
         }
     }
 }