Rmq API v4 support

build/package.nuspec

@@ -15,7 +15,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>rabbitmq chinchilla</tags>
     <dependencies>
-      <dependency id="RabbitMQ.Client" version="3.6.0" />
+      <dependency id="RabbitMQ.Client" version="4.1.1" />
     </dependencies>
   </metadata>
 </package>

src/Chinchilla.Integration/Chinchilla.Integration.csproj

@@ -43,8 +43,8 @@
       <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Chinchilla.Integration/packages.config

@@ -5,5 +5,5 @@
   <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net45" />
   <package id="NUnit" version="3.5.0" targetFramework="net452" />
-  <package id="RabbitMQ.Client" version="3.6.0" targetFramework="net452" />
+  <package id="RabbitMQ.Client" version="4.1.1" targetFramework="net452" />
 </packages>

src/Chinchilla.Specifications/Chinchilla.Specifications.csproj

@@ -61,8 +61,8 @@
       <HintPath>..\packages\Moq.4.5.29\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Chinchilla.Specifications/packages.config

@@ -6,5 +6,5 @@
   <package id="Machine.Specifications" version="0.11.0" targetFramework="net452" />
   <package id="Machine.Specifications.Should" version="0.11.0" targetFramework="net452" />
   <package id="Moq" version="4.5.29" targetFramework="net452" />
-  <package id="RabbitMQ.Client" version="3.6.0" targetFramework="net452" />
+  <package id="RabbitMQ.Client" version="4.1.1" targetFramework="net452" />
 </packages>

src/Chinchilla/Chinchilla.csproj

@@ -35,8 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Chinchilla/Topologies/Model/TopologyBuilder.cs

@@ -31,38 +31,30 @@ public void Visit(IQueue queue)
         {
             VisitOnce(queue, () =>
             {
-                if (queue.HasName)
-                {
-                    var args = new Dictionary<string, object>();
-
-                    if (queue.QueueAutoExpire.HasValue)
-                    {
-                        args.Add("x-expires", queue.QueueAutoExpire.Value.TotalMilliseconds);
-                    }
+                var args = new Dictionary<string, object>();
 
-                    if (!string.IsNullOrEmpty(queue.DeadLetterExchange))
-                    {
-                        args.Add("x-dead-letter-exchange", queue.DeadLetterExchange);
-                    }
-
-                    if (queue.MessageTimeToLive.HasValue)
-                    {
-                        args.Add("x-message-ttl", (int)queue.MessageTimeToLive.Value.TotalMilliseconds);
-                    }
+                if (queue.QueueAutoExpire.HasValue)
+                {
+                    args.Add("x-expires", queue.QueueAutoExpire.Value.TotalMilliseconds);
+                }
 
-                    model.Execute(m =>
-                        m.QueueDeclare(
-                            queue.Name,
-                            queue.Durability == Durability.Durable,   // durable
-                            queue.IsExclusive,  // exclusive
-                            queue.IsAutoDelete,  // auto-delete
-                            args));
+                if (!string.IsNullOrEmpty(queue.DeadLetterExchange))
+                {
+                    args.Add("x-dead-letter-exchange", queue.DeadLetterExchange);
                 }
-                else
+
+                if (queue.MessageTimeToLive.HasValue)
                 {
-                    var declared = model.Execute(m => m.QueueDeclare());
-                    queue.Name = declared.QueueName;
+                    args.Add("x-message-ttl", (int)queue.MessageTimeToLive.Value.TotalMilliseconds);
                 }
+
+                model.Execute(m =>
+                    m.QueueDeclare(
+                        queue.HasName ? queue.Name : "",
+                        queue.Durability == Durability.Durable,   // durable
+                        queue.IsExclusive,  // exclusive
+                        queue.IsAutoDelete,  // auto-delete
+                        args));
             });
         }
 
@@ -94,7 +86,8 @@ public void Visit(IBinding binding)
             {
                 model.Execute(m =>
                 {
-                    Action<string, string, string> bindFunction;
+                    Action<string, string, string, IDictionary<string, object>> bindFunction;
+
                     if (binding.Bindable is IQueue)
                     {
                         bindFunction = m.QueueBind;
@@ -103,19 +96,19 @@ public void Visit(IBinding binding)
                     {
                         // Reverse from/to for binding exchanges, because the parameters of ExchangeBind
                         // don't match QueueBind
-                        bindFunction = (from, to, keys) => m.ExchangeBind(to, from, keys);
+                        bindFunction = (from, to, keys, args) => m.ExchangeBind(to, from, keys, args);
                     }
 
                     if (binding.RoutingKeys.Any())
                     {
                         foreach (var key in binding.RoutingKeys)
                         {
-                            bindFunction(binding.Bindable.Name, binding.Exchange.Name, key);
+                            bindFunction(binding.Bindable.Name, binding.Exchange.Name, key, null);
                         }
                     }
                     else
                     {
-                        bindFunction(binding.Bindable.Name, binding.Exchange.Name, "#");
+                        bindFunction(binding.Bindable.Name, binding.Exchange.Name, "#", null);
                     }
                 });
 

src/Chinchilla/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RabbitMQ.Client" version="3.6.0" targetFramework="net452" />
+  <package id="RabbitMQ.Client" version="4.1.1" targetFramework="net452" />
   <package id="SimpleJson" version="0.38.0" targetFramework="net45" />
 </packages>