C# 7-ify messaging classes

ServiceStack · Jan 21, 2018 · 8cc9043 · 8cc9043
1 parent 4b785a4
commit 8cc9043
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 30 deletions.
diff --git a/src/ServiceStack.Client/Messaging/InMemoryMessageQueueClient.cs b/src/ServiceStack.Client/Messaging/InMemoryMessageQueueClient.cs
@@ -18,8 +18,7 @@ public InMemoryMessageQueueClient(MessageQueueClientFactory factory)
 
         public void Publish<T>(T messageBody)
         {
-            var message = messageBody as IMessage;
-            if (message != null)
+            if (messageBody is IMessage message)
             {
                 Publish(message.ToInQueueName(), message);
             }

diff --git a/src/ServiceStack.Client/Messaging/MessageQueueClientFactory.cs b/src/ServiceStack.Client/Messaging/MessageQueueClientFactory.cs
@@ -36,8 +36,7 @@ public void PublishMessage(string queueName, byte[] messageBytes)
         {
             lock (syncLock)
             {
-                Queue<byte[]> bytesQueue;
-                if (!queueMessageBytesMap.TryGetValue(queueName, out bytesQueue))
+                if (!queueMessageBytesMap.TryGetValue(queueName, out var bytesQueue))
                 {
                     bytesQueue = new Queue<byte[]>();
                     queueMessageBytesMap[queueName] = bytesQueue;
@@ -58,16 +57,11 @@ public byte[] GetMessageAsync(string queueName)
         {
             lock (syncLock)
             {
-                Queue<byte[]> bytesQueue;
-                if (!queueMessageBytesMap.TryGetValue(queueName, out bytesQueue))
-                {
+                if (!queueMessageBytesMap.TryGetValue(queueName, out var bytesQueue))
                     return null;
-                }
 
                 if (bytesQueue.Count == 0)
-                {
                     return null;
-                }
 
                 var messageBytes = bytesQueue.Dequeue();
                 return messageBytes;

diff --git a/src/ServiceStack.Client/ServerEventsClient.cs b/src/ServiceStack.Client/ServerEventsClient.cs
@@ -111,22 +111,18 @@ public string BaseUri
                 this.eventStreamPath = value.CombineWith("event-stream");
                 BuildEventStreamUri();
 
-                var meta = this.ServiceClient as IServiceClientMeta;
-                if (meta != null)
+                if (this.ServiceClient is IServiceClientMeta meta)
                     meta.BaseUri = value;
             }
         }
 
         private string[] channels;
         public string[] Channels
         {
-            get { return channels; }
+            get => channels;
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException("channels");
-
-                this.channels = value;
+                this.channels = value ?? throw new ArgumentNullException(nameof(channels));
                 BuildEventStreamUri();
             }
         }
@@ -641,8 +637,7 @@ void ProcessEventMessage(ServerEventMessage e)
                             ProcessOnHeartbeatMessage(e);
                             return;
                         default:
-                            ServerEventCallback cb;
-                            if (Handlers.TryGetValue(e.Target, out cb))
+                            if (Handlers.TryGetValue(e.Target, out var cb))
                             {
                                 cb(this, e);
                             }
@@ -654,8 +649,7 @@ void ProcessEventMessage(ServerEventMessage e)
                     RaiseEvent(e.Target, e);
                 }
 
-                ServerEventCallback receiver;
-                NamedReceivers.TryGetValue(e.Op, out receiver);
+                NamedReceivers.TryGetValue(e.Op, out var receiver);
                 receiver?.Invoke(this, e);
             }
 
@@ -778,8 +772,7 @@ public ServerEventsClient AddListener(string eventName, Action<ServerEventMessag
         {
             lock (listeners)
             {
-                List<Action<ServerEventMessage>> handlers;
-                if (!listeners.TryGetValue(eventName, out handlers))
+                if (!listeners.TryGetValue(eventName, out var handlers))
                 {
                     listeners[eventName] = handlers = new List<Action<ServerEventMessage>>();
                 }
@@ -794,8 +787,7 @@ public ServerEventsClient RemoveListener(string eventName, Action<ServerEventMes
         {
             lock (listeners)
             {
-                List<Action<ServerEventMessage>> handlers;
-                if (listeners.TryGetValue(eventName, out handlers))
+                if (listeners.TryGetValue(eventName, out var handlers))
                 {
                     handlers.Remove(handler);
                 }
@@ -808,8 +800,7 @@ public void RaiseEvent(string eventName, ServerEventMessage message)
         {
             lock (listeners)
             {
-                List<Action<ServerEventMessage>> handlers;
-                if (listeners.TryGetValue(eventName, out handlers))
+                if (listeners.TryGetValue(eventName, out var handlers))
                 {
                     foreach (var handler in handlers)
                     {
@@ -1008,7 +999,7 @@ public static ServerEventsClient RegisterHandlers(this ServerEventsClient client
         internal static Task ObserveTaskExceptions(this Task t)
         {
             if (t.IsFaulted)
-                t.Exception.Handle(x => true);
+                t.Exception?.Handle(x => true);
             return t;
         }
     }

diff --git a/src/ServiceStack/Messaging/InMemoryTransientMessageFactory.cs b/src/ServiceStack/Messaging/InMemoryTransientMessageFactory.cs
@@ -54,8 +54,7 @@ public InMemoryMessageProducer(InMemoryTransientMessageFactory parent)
 
             public void Publish<T>(T messageBody)
             {
-                var message = messageBody as IMessage;
-                if (message != null)
+                if (messageBody is IMessage message)
                 {
                     Publish(message.ToInQueueName(), message);
                 }