Merge pull request #148 from darrylsk/master

michaelklishin · web-flow · commit 7e457af04b70 · 2017-09-15T17:28:34.000-06:00
Replace deprecated QueueingBasicConsumer in csharp code for tutorial six
diff --git a/dotnet/RPCClient/RPCClient.cs b/dotnet/RPCClient/RPCClient.cs
@@ -1,46 +1,60 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Text;
-using System.Threading.Tasks;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
-class RPCClient
+public class RpcClient
 {
-    private IConnection connection;
-    private IModel channel;
-    private string replyQueueName;
-    private QueueingBasicConsumer consumer;
+    private readonly IConnection connection;
+    private readonly IModel channel;
+    private readonly string replyQueueName;
+    private readonly EventingBasicConsumer consumer;
+    private readonly BlockingCollection<string> respQueue = new BlockingCollection<string>();
+    private readonly IBasicProperties props;
 
-    public RPCClient()
+    public RpcClient()
     {
         var factory = new ConnectionFactory() { HostName = "localhost" };
+
         connection = factory.CreateConnection();
         channel = connection.CreateModel();
         replyQueueName = channel.QueueDeclare().QueueName;
-        consumer = new QueueingBasicConsumer(channel);
-        channel.BasicConsume(queue: replyQueueName, autoAck: true, consumer: consumer);
+        consumer = new EventingBasicConsumer(channel);
+
+        props = channel.CreateBasicProperties();
+        var correlationId = Guid.NewGuid().ToString();
+        props.CorrelationId = correlationId;
+        props.ReplyTo = replyQueueName;
+
+        consumer.Received += (model, ea) =>
+        {
+            var body = ea.Body;
+            var response = Encoding.UTF8.GetString(body);
+            if (ea.BasicProperties.CorrelationId == correlationId)
+            {
+                respQueue.Add(response);
+            }
+        };
     }
 
     public string Call(string message)
     {
-        var corrId = Guid.NewGuid().ToString();
-        var props = channel.CreateBasicProperties();
-        props.ReplyTo = replyQueueName;
-        props.CorrelationId = corrId;
 
         var messageBytes = Encoding.UTF8.GetBytes(message);
-        channel.BasicPublish(exchange: "", routingKey: "rpc_queue", basicProperties: props, body: messageBytes);
+        channel.BasicPublish(
+            exchange: "",
+            routingKey: "rpc_queue",
+            basicProperties: props,
+            body: messageBytes);
 
-        while(true)
-        {
-            var ea = (BasicDeliverEventArgs)consumer.Queue.Dequeue();
-            if(ea.BasicProperties.CorrelationId == corrId)
-            {
-                return Encoding.UTF8.GetString(ea.Body);
-            }
-        }
+
+        channel.BasicConsume(
+            consumer: consumer,
+            queue: replyQueueName,
+            autoAck: true);
+
+        return respQueue.Take(); ;
     }
 
     public void Close()
@@ -49,16 +63,17 @@ public void Close()
     }
 }
 
-class RPC
+public class Rpc
 {
     public static void Main()
     {
-        var rpcClient = new RPCClient();
+        var rpcClient = new RpcClient();
 
         Console.WriteLine(" [x] Requesting fib(30)");
         var response = rpcClient.Call("30");
-        Console.WriteLine(" [.] Got '{0}'", response);
 
+        Console.WriteLine(" [.] Got '{0}'", response);
         rpcClient.Close();
     }
 }
+
