making IContentHeader and all classes that derive from it ICloneable; adding tests for cloning BasicProperties, StreamProperties and FileProperties for all implementations

Author: Vlad Ionescu

src/apigen/Apigen.cs

@@ -481,11 +481,26 @@ public void EmitClassProperties(AmqpClass c) {
 		if (!IsBoolean(f)) {
 		    EmitLine("    public "+maybeOverride+"void Clear"+MangleClass(f.Name)+"() { m_"+MangleMethod(f.Name)+"_present = false; }");
 		}
+            }
+
+            EmitLine("");
+            foreach (AmqpField f in c.m_Fields)
+            {
+                if (!IsBoolean(f))
+                    EmitLine("    public " + maybeOverride + "bool Is" + MangleClass(f.Name) + "Present() { return m_" + MangleMethod(f.Name) + "_present; }");
             }
+
             EmitLine("");
             EmitLine("    public "+MangleClass(c.Name)+"Properties() {}");
             EmitLine("    public override int ProtocolClassId { get { return "+c.Index+"; } }");
-            EmitLine("    public override string ProtocolClassName { get { return \""+c.Name+"\"; } }");
+            EmitLine("    public override string ProtocolClassName { get { return \""+c.Name+"\"; } }");
+            EmitLine("");
+            EmitLine("    public override object Clone()");
+            EmitLine("    {");
+            EmitLine("        " + MangleClass(c.Name) + "Properties copy = new " + MangleClass(c.Name) + "Properties();");
+            EmitLine("        copy.setCloneableMembersFrom(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/api/IContentHeader.cs

@@ -53,11 +53,13 @@
 //
 //   Contributor(s): ______________________________________.
 //
-//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+using System;
+
 namespace RabbitMQ.Client
 {
     ///<summary>A decoded AMQP content header frame.</summary>
-    public interface IContentHeader
+    public interface IContentHeader : ICloneable
     {
         ///<summary>Retrieve the AMQP class ID of this content header.</summary>
         int ProtocolClassId { get; }

src/client/impl/BasicProperties.cs

@@ -87,7 +87,22 @@ public abstract class BasicProperties: ContentHeaderBase, IBasicProperties {
 	public abstract void ClearType();
 	public abstract void ClearUserId();
 	public abstract void ClearAppId();
-	public abstract void ClearClusterId();
+	public abstract void ClearClusterId();
+
+    public abstract bool IsContentTypePresent();
+    public abstract bool IsContentEncodingPresent();
+    public abstract bool IsHeadersPresent();
+    public abstract bool IsDeliveryModePresent();
+    public abstract bool IsPriorityPresent();
+    public abstract bool IsCorrelationIdPresent();
+    public abstract bool IsReplyToPresent();
+    public abstract bool IsExpirationPresent();
+    public abstract bool IsMessageIdPresent();
+    public abstract bool IsTimestampPresent();
+    public abstract bool IsTypePresent();
+    public abstract bool IsUserIdPresent();
+    public abstract bool IsAppIdPresent();
+    public abstract bool IsClusterIdPresent();
 
         public PublicationAddress ReplyToAddress {
             get {
@@ -105,5 +120,45 @@ public void SetPersistent(bool persistent) {
 		DeliveryMode = 1;
 	    }
 	}
+
+    protected override void setCloneableMembersFrom(Object src)
+    {
+        base.setCloneableMembersFrom(src);
+        BasicProperties bpSrc = src as BasicProperties;
+
+        if(bpSrc.IsContentTypePresent())
+            ContentType = bpSrc.ContentType;
+        if(bpSrc.IsContentEncodingPresent())
+            ContentEncoding = bpSrc.ContentEncoding;
+        if(bpSrc.IsHeadersPresent())
+        {
+            Headers = new Hashtable();
+            IDictionaryEnumerator enumHeaders = bpSrc.Headers.GetEnumerator();
+            while (enumHeaders.MoveNext())
+                Headers.Add(enumHeaders.Entry.Key, enumHeaders.Entry.Value);
+        }
+        if(bpSrc.IsDeliveryModePresent())
+            DeliveryMode = bpSrc.DeliveryMode;
+        if(bpSrc.IsPriorityPresent())
+            Priority = bpSrc.Priority;
+        if(bpSrc.IsCorrelationIdPresent())
+            CorrelationId = bpSrc.CorrelationId;
+        if(bpSrc.IsReplyToPresent())
+            ReplyTo = bpSrc.ReplyTo;
+        if(bpSrc.IsExpirationPresent())
+            Expiration = bpSrc.Expiration;
+        if(bpSrc.IsMessageIdPresent())
+            MessageId = bpSrc.MessageId;
+        if(bpSrc.IsTimestampPresent())
+            Timestamp = bpSrc.Timestamp;
+        if(bpSrc.IsTypePresent())
+            Type = bpSrc.Type;
+        if(bpSrc.IsUserIdPresent())
+            UserId = bpSrc.UserId;
+        if(bpSrc.IsAppIdPresent())
+            AppId = bpSrc.AppId;
+        if(bpSrc.IsClusterIdPresent())
+            ClusterId = bpSrc.ClusterId;
+    }
     }
 }

src/client/impl/ContentHeaderBase.cs

@@ -68,7 +68,8 @@ public abstract class ContentHeaderBase : IContentHeader
         public abstract string ProtocolClassName { get; }
         public abstract void ReadPropertiesFrom(ContentHeaderPropertyReader reader);
         public abstract void WritePropertiesTo(ContentHeaderPropertyWriter writer);
-        public abstract void AppendPropertyDebugStringTo(System.Text.StringBuilder sb);
+        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
@@ -98,6 +99,12 @@ public void WriteTo(NetworkBinaryWriter writer, ulong bodySize)
             writer.Write((ushort)0); // weight - not currently used
             writer.Write((ulong)bodySize);
             WritePropertiesTo(new ContentHeaderPropertyWriter(writer));
+        }
+
+        protected virtual void setCloneableMembersFrom(Object src)
+        {
+            if (!this.GetType().Equals(src.GetType()))
+                throw new InvalidCastException("Trying to clone from object of different type");
         }
     }
 }

src/client/impl/FileProperties.cs

@@ -79,6 +79,46 @@ public abstract class FileProperties : ContentHeaderBase, IFileProperties
         public abstract void ClearMessageId();
         public abstract void ClearFilename();
         public abstract void ClearTimestamp();
-        public abstract void ClearClusterId();
+        public abstract void ClearClusterId();
+
+        public abstract bool IsContentTypePresent();
+        public abstract bool IsContentEncodingPresent();
+        public abstract bool IsHeadersPresent();
+        public abstract bool IsPriorityPresent();
+        public abstract bool IsReplyToPresent();
+        public abstract bool IsMessageIdPresent();
+        public abstract bool IsFilenamePresent();
+        public abstract bool IsTimestampPresent();
+        public abstract bool IsClusterIdPresent();
+
+        protected override void setCloneableMembersFrom(object src)
+        {
+            base.setCloneableMembersFrom(src);
+            FileProperties fpSrc = src as FileProperties;
+
+            if (fpSrc.IsContentTypePresent())
+                ContentType = fpSrc.ContentType;
+            if (fpSrc.IsContentEncodingPresent())
+                ContentEncoding = fpSrc.ContentEncoding;
+            if (fpSrc.IsHeadersPresent())
+            {
+                Headers = new Hashtable();
+                IDictionaryEnumerator enumHeaders = fpSrc.Headers.GetEnumerator();
+                while (enumHeaders.MoveNext())
+                    Headers.Add(enumHeaders.Entry.Key, enumHeaders.Entry.Value);
+            }
+            if (fpSrc.IsPriorityPresent())
+                Priority = fpSrc.Priority;
+            if (fpSrc.IsReplyToPresent())
+                ReplyTo = fpSrc.ReplyTo;
+            if (fpSrc.IsMessageIdPresent())
+                MessageId = fpSrc.MessageId;
+            if (fpSrc.IsFilenamePresent())
+                Filename = fpSrc.Filename;
+            if (fpSrc.IsTimestampPresent())
+                Timestamp = fpSrc.Timestamp;
+            if (fpSrc.IsClusterIdPresent())
+                ClusterId = fpSrc.ClusterId;
+        }
     }
 }

src/client/impl/StreamProperties.cs

@@ -71,6 +71,34 @@ public abstract class StreamProperties : ContentHeaderBase, IStreamProperties
         public abstract void ClearContentEncoding();
         public abstract void ClearHeaders();
         public abstract void ClearPriority();
-        public abstract void ClearTimestamp();
+        public abstract void ClearTimestamp();
+
+        public abstract bool IsContentTypePresent();
+        public abstract bool IsContentEncodingPresent();
+        public abstract bool IsHeadersPresent();
+        public abstract bool IsPriorityPresent();
+        public abstract bool IsTimestampPresent();
+
+        protected override void setCloneableMembersFrom(object src)
+        {
+            base.setCloneableMembersFrom(src);
+            StreamProperties spSrc = src as StreamProperties;
+
+            if (spSrc.IsContentTypePresent())
+                ContentType = spSrc.ContentType;
+            if (spSrc.IsContentEncodingPresent())
+                ContentEncoding = spSrc.ContentEncoding;
+            if (spSrc.IsHeadersPresent())
+            {
+                Headers = new Hashtable();
+                IDictionaryEnumerator enumHeaders = spSrc.Headers.GetEnumerator();
+                while (enumHeaders.MoveNext())
+                    Headers.Add(enumHeaders.Entry.Key, enumHeaders.Entry.Value);
+            }
+            if (spSrc.IsPriorityPresent())
+                Priority = spSrc.Priority;
+            if (spSrc.IsTimestampPresent())
+                Timestamp = spSrc.Timestamp;
+        }
     }
 }