merge bug26131 into bug26133

Author: michaelklishin

projects/client/ApigenBootstrap/RabbitMQ.Client.ApigenBootstrap.csproj

@@ -54,15 +54,9 @@
     <Compile Include="..\RabbitMQ.Client\src\client\api\IContentHeader.cs">
       <Link>src\client\api\IContentHeader.cs</Link>
     </Compile>
-    <Compile Include="..\RabbitMQ.Client\src\client\api\IFileProperties.cs">
-      <Link>src\client\api\IFileProperties.cs</Link>
-    </Compile>
     <Compile Include="..\RabbitMQ.Client\src\client\api\IModel.cs">
       <Link>src\client\api\IModel.cs</Link>
     </Compile>
-    <Compile Include="..\RabbitMQ.Client\src\client\api\IStreamProperties.cs">
-      <Link>src\client\api\IStreamProperties.cs</Link>
-    </Compile>
     <Compile Include="..\RabbitMQ.Client\src\client\api\PublicationAddress.cs">
       <Link>src\client\api\PublicationAddress.cs</Link>
     </Compile>

projects/client/RabbitMQ.Client/src/client/api/IFileProperties.cs

@@ -144,20 +144,6 @@ public interface IModel: IDisposable
         [AmqpContentHeaderFactory("basic")]
         IBasicProperties CreateBasicProperties();
 
-        ///<summary>Construct a completely empty content header for
-        ///use with the File content class.
-        /// (unsupported in AMQP 0-9-1)</summary>
-        [AmqpContentHeaderFactory("file")]
-        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
-        IFileProperties CreateFileProperties();
-
-        ///<summary>Construct a completely empty content header for
-        ///use with the Stream content class.
-        /// (unsupported in AMQP 0-9-1)</summary>
-        [AmqpContentHeaderFactory("stream")]
-        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
-        IStreamProperties CreateStreamProperties();
-
         ///<summary>(Spec method) Declare an exchange.</summary>
         ///<remarks>
         ///The exchange is declared non-passive and non-internal.

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -776,8 +776,6 @@ public void FinishClose()
         ///////////////////////////////////////////////////////////////////////////
 
         public abstract IBasicProperties CreateBasicProperties();
-        public abstract IFileProperties CreateFileProperties();
-        public abstract IStreamProperties CreateStreamProperties();
 
         public void ExchangeDeclare(string exchange, string type, bool durable, bool autoDelete, IDictionary<string, object> arguments)
         {

projects/client/RabbitMQ.Client/src/client/impl/FileProperties.cs

@@ -224,81 +224,4 @@ private void TestStreamPropertiesNoneClone(StreamProperties sp)
         Assert.AreEqual(false, spClone.IsPriorityPresent());
         Assert.AreEqual(false, spClone.IsTimestampPresent());
     }
-
-    private void TestFilePropertiesClone(FileProperties fp)
-    {
-        // Set members in source object
-        fp.ContentType = "foo_1";
-        fp.ContentEncoding = "foo_2";
-        fp.Headers = new Dictionary<string, object>();
-        fp.Headers.Add("foo_3", "foo_4");
-        fp.Headers.Add("foo_5", "foo_6");
-        fp.Priority = 12;
-        fp.ReplyTo = "foo_7";
-        fp.MessageId = "foo_8";
-        fp.Filename = "foo_9";
-        fp.Timestamp = new AmqpTimestamp(123);
-        fp.ClusterId = "foo_10";
-
-        // Clone
-        FileProperties fpClone = fp.Clone() as FileProperties;
-
-        // Change values in source object
-        fp.ContentType = "foo_11";
-        fp.ContentEncoding = "foo_12";
-        fp.Headers = new Dictionary<string, object>();
-        fp.Headers.Add("foo_13", "foo_14");
-        fp.Headers.Add("foo_15", "foo_16");
-        fp.Priority = 34;
-        fp.ReplyTo = "foo_17";
-        fp.MessageId = "foo_18";
-        fp.Filename = "foo_19";
-        fp.Timestamp = new AmqpTimestamp(234);
-        fp.ClusterId = "foo_20";
-
-        // Make sure values have not changed in clone
-        Assert.AreEqual("foo_1", fpClone.ContentType);
-        Assert.AreEqual("foo_2", fpClone.ContentEncoding);
-        Assert.AreEqual(2, fpClone.Headers.Count);
-        Assert.AreEqual(true, fpClone.Headers.ContainsKey("foo_3"));
-        Assert.AreEqual("foo_4", fpClone.Headers["foo_3"]);
-        Assert.AreEqual(true, fpClone.Headers.ContainsKey("foo_5"));
-        Assert.AreEqual("foo_6", fpClone.Headers["foo_5"]);
-        Assert.AreEqual(12, fpClone.Priority);
-        Assert.AreEqual("foo_7", fpClone.ReplyTo);
-        Assert.AreEqual("foo_8", fpClone.MessageId);
-        Assert.AreEqual("foo_9", fpClone.Filename);
-        Assert.AreEqual(new AmqpTimestamp(123), fpClone.Timestamp);
-        Assert.AreEqual("foo_10", fpClone.ClusterId);
-    }
-
-    private void TestFilePropertiesNoneClone(FileProperties fp)
-    {
-        // Do not set any members and clone
-        FileProperties fpClone = fp.Clone() as FileProperties;
-
-        // Set values in source object
-        fp.ContentType = "foo_11";
-        fp.ContentEncoding = "foo_12";
-        fp.Headers = new Dictionary<string, object>();
-        fp.Headers.Add("foo_13", "foo_14");
-        fp.Headers.Add("foo_15", "foo_16");
-        fp.Priority = 34;
-        fp.ReplyTo = "foo_17";
-        fp.MessageId = "foo_18";
-        fp.Filename = "foo_19";
-        fp.Timestamp = new AmqpTimestamp(234);
-        fp.ClusterId = "foo_20";
-
-        // Check that no member is present in clone
-        Assert.AreEqual(false, fpClone.IsContentTypePresent());
-        Assert.AreEqual(false, fpClone.IsContentEncodingPresent());
-        Assert.AreEqual(false, fpClone.IsHeadersPresent());
-        Assert.AreEqual(false, fpClone.IsPriorityPresent());
-        Assert.AreEqual(false, fpClone.IsReplyToPresent());
-        Assert.AreEqual(false, fpClone.IsMessageIdPresent());
-        Assert.AreEqual(false, fpClone.IsFilenamePresent());
-        Assert.AreEqual(false, fpClone.IsTimestampPresent());
-        Assert.AreEqual(false, fpClone.IsClusterIdPresent());
-    }
 }