Using pattern matching

darkl · darkl · commit 1752f23403e0 · 2018-05-29T13:24:25.000-04:00
diff --git a/src/net45/Default/WampSharp.WebSocket4Net/WAMP2/V2/Fluent/WebSocket4NetActivator.cs b/src/net45/Default/WampSharp.WebSocket4Net/WAMP2/V2/Fluent/WebSocket4NetActivator.cs
@@ -42,16 +42,14 @@ public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMess
 
         private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWampBinding<TMessage> binding)
         {
-            IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;
 
-            if (textBinding != null)
+            if (binding is IWampTextBinding<TMessage> textBinding)
             {
                 return CreateTextConnection(textBinding);
             }
 
-            IWampBinaryBinding<TMessage> binaryBinding = binding as IWampBinaryBinding<TMessage>;
 
-            if (binaryBinding != null)
+            if (binding is IWampBinaryBinding<TMessage> binaryBinding)
             {
                 return CreateBinaryConnection(binaryBinding);
             }
diff --git a/src/net45/Extensions/WampSharp.SignalR/Server/SignalRTransport.cs b/src/net45/Extensions/WampSharp.SignalR/Server/SignalRTransport.cs
@@ -55,9 +55,8 @@ public void Open()
 
         public IWampConnectionListener<TMessage> GetListener<TMessage>(IWampBinding<TMessage> binding)
         {
-            IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;
 
-            if (textBinding == null)
+            if (!(binding is IWampTextBinding<TMessage> textBinding))
             {
                 throw new ArgumentException("This transport supports only text binding.", nameof(binding));
             }
diff --git a/src/net45/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketActivator.cs b/src/net45/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketActivator.cs
@@ -33,16 +33,14 @@ public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMess
 
         private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWampBinding<TMessage> binding)
         {
-            IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;
 
-            if (textBinding != null)
+            if (binding is IWampTextBinding<TMessage> textBinding)
             {
                 return CreateTextConnection(textBinding);
             }
 
-            IWampBinaryBinding<TMessage> binaryBinding = binding as IWampBinaryBinding<TMessage>;
 
-            if (binaryBinding != null)
+            if (binding is IWampBinaryBinding<TMessage> binaryBinding)
             {
                 return CreateBinaryConnection(binaryBinding);
             }
diff --git a/src/net45/Tests/WampSharp.Tests.TestHelpers/MockRaw.cs b/src/net45/Tests/WampSharp.Tests.TestHelpers/MockRaw.cs
@@ -9,10 +9,9 @@ public class MockRaw
     {
         public MockRaw(object value)
         {
-            MockRaw raw = value as MockRaw;
             object[] rawArray = value as object[];
 
-            if (raw != null)
+            if (value is MockRaw raw)
             {
                 Value = Clone(raw.Value);
             }
@@ -66,9 +65,8 @@ private static object Clone(object value)
         private static bool TryClone(object value, out object result)
         {
             result = null;
-            ICloneable cloneable = value as ICloneable;
 
-            if (cloneable != null)
+            if (value is ICloneable cloneable)
             {
                 result = cloneable.Clone();
                 return true;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Client/RawTest.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Client/RawTest.cs
@@ -45,13 +45,12 @@ private object SerializeArgument(object x)
             }
 
             IWampFormatter<TMessage> formatter = mBinding.Formatter;
-            object[] array = x as object[];
-            
-            if (array != null)
+
+            if (x is object[] array)
             {
-                TMessage[] arguments = 
+                TMessage[] arguments =
                     array.Select(y => formatter.Serialize(y)).ToArray();
-                
+
                 return arguments;
             }
 
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/RecordedTests/MockBuilder/MessageMapper.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/RecordedTests/MockBuilder/MessageMapper.cs
@@ -79,9 +79,8 @@ private JArray Format(WampMessage<MockRaw> message, int[] indexes)
 
         private static JToken Convert(MockRaw raw)
         {
-            MockRaw[] array = raw.Value as MockRaw[];
 
-            if (array != null)
+            if (raw.Value is MockRaw[] array)
             {
                 return new JArray(array.Select(x => Convert(x)));
             }
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/WampMessagePrinter.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/WampMessagePrinter.cs
@@ -32,9 +32,8 @@ public static string ToString(WampMessage<MockRaw> message)
 
         private static JToken Convert(MockRaw raw)
         {
-            MockRaw[] array = raw.Value as MockRaw[];
 
-            if (array != null)
+            if (raw.Value is MockRaw[] array)
             {
                 return new JArray(array.Select(x => Convert(x)));
             }
diff --git a/src/net45/Tests/WampSharp.Tests/MockListener.cs b/src/net45/Tests/WampSharp.Tests/MockListener.cs
@@ -18,11 +18,10 @@ public void OnNext(IWampConnection<TMessage> value)
             mSubject.OnNext(value);
 
             // Yuck
-            IControlledWampConnection<TMessage> casted = value as IControlledWampConnection<TMessage>;
-            
-            if (casted != null)
+
+            if (value is IControlledWampConnection<TMessage> casted)
             {
-                casted.Connect();                
+                casted.Connect();
             }
         }
 
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Cra/WampCraServer.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Cra/WampCraServer.cs
@@ -146,17 +146,16 @@ public void Publish(IWampClient client, string topicUri, TMessage @event, string
 
         private WampCraAuthenticator<TMessage> GetOrCreateWampAuthenticatorForClient(IWampClient client)
         {
-            WampCraAuthenticator<TMessage> authenticator = client.CraAuthenticator as WampCraAuthenticator<TMessage>;
-            
-            if (authenticator == null)
+
+            if (!(client.CraAuthenticator is WampCraAuthenticator<TMessage> authenticator))
             {
                 if (!mAuthFactory.IsValid)
                 {
                     throw new InvalidOperationException("WampCraAuthenticaticatorBuilder is not valid.");
                 }
-                
+
                 authenticator = mAuthFactory.BuildAuthenticator(client.SessionId);
-                
+
                 // Very important to give the client permissions to the auth APIs...
                 foreach (IWampRpcMethod method in mWampCraProceduredMetadata.GetServiceMethods())
                 {
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/PubSub/Server/WampTopic.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/PubSub/Server/WampTopic.cs
@@ -87,15 +87,14 @@ public void Unsubscribe(string sessionId)
 
         public IDisposable Subscribe(IObserver<object> observer)
         {
-            WampObserver casted = observer as WampObserver;
 
             IDisposable result;
 
-            if (casted == null)
+            if (!(observer is WampObserver casted))
             {
                 IObservable<object> events = mSubject.Select(x => x.Event);
 
-                result = 
+                result =
                     events.Subscribe(observer);
 
                 result = GetSubscriptionDisposable(result);
@@ -118,11 +117,11 @@ public IDisposable Subscribe(IObserver<object> observer)
                         (Disposable.Create(() => OnWampObserverLeaving(sessionId)),
                         observerDisposable,
                         Disposable.Create(() => OnWampObserverLeft(sessionId)));
-                
+
                 result =
                     GetSubscriptionDisposable(result);
 
-                mSessionIdToSubscription[sessionId] = 
+                mSessionIdToSubscription[sessionId] =
                     new Subscription(this, casted, result);
 
                 RaiseSubscriptionAdded(casted);
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Client/Dynamic/DynamicWampRpcClient.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Client/Dynamic/DynamicWampRpcClient.cs
@@ -62,9 +62,8 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
             {
                 CallRpcMethod(typeof(ExpandoObject));
 
-                ExpandoObject expando = mTask.Result as ExpandoObject;
 
-                if (expando != null)
+                if (mTask.Result is ExpandoObject expando)
                 {
                     IDictionary<string, object> dictionary = expando;
                     return dictionary.TryGetValue(binder.Name, out result);
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Server/WampRpcServer.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Server/WampRpcServer.cs
@@ -73,9 +73,8 @@ public async void Call(IWampClient client, string callId, string procUri, params
 
         private static void HandleException(IWampClient client, string callId, Exception innerException)
         {
-            WampRpcCallException callException = innerException as WampRpcCallException;
 
-            if (callException != null)
+            if (innerException is WampRpcCallException callException)
             {
                 HandleWampException(client, callId, callException);
             }
diff --git a/src/net45/WampSharp/Core/Listener/WampListener.cs b/src/net45/WampSharp/Core/Listener/WampListener.cs
@@ -75,10 +75,9 @@ protected virtual void OnCloseConnection(IWampConnection<TMessage> connection)
         {
             ClientContainer.RemoveClient(connection);
 
-            IAsyncDisposable asyncDisposable = connection as IAsyncDisposable;
 
             // Prefer the non-blocking version
-            if (asyncDisposable != null)
+            if (connection is IAsyncDisposable asyncDisposable)
             {
                 asyncDisposable.DisposeAsync();
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Binding/WampRouterBindingExtensions.cs b/src/net45/WampSharp/WAMP2/V2/Binding/WampRouterBindingExtensions.cs
@@ -12,9 +12,8 @@ public static IWampBindingHost CreateHost<TMessage>
              IWampConnectionListener<TMessage> connectionListener,
              IWampUriValidator uriValidator)
         {
-            IWampRouterBinding<TMessage> routerBinding = binding as IWampRouterBinding<TMessage>;
 
-            if (routerBinding != null)
+            if (binding is IWampRouterBinding<TMessage> routerBinding)
             {
                 return routerBinding.CreateHost(realmContainer, connectionListener);
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Listener/ClientBuilder/WampClientBuilder.cs b/src/net45/WampSharp/WAMP2/V2/Core/Listener/ClientBuilder/WampClientBuilder.cs
@@ -81,10 +81,8 @@ public IWampClientProxy<TMessage> Create(IWampConnection<TMessage> connection)
 
             WampTransportDetails transportDetails = null;
 
-            IDetailedWampConnection<TMessage> detailedConnection = 
-                connection as IDetailedWampConnection<TMessage>;
-            
-            if (detailedConnection != null)
+
+            if (connection is IDetailedWampConnection<TMessage> detailedConnection)
             {
                 transportDetails = detailedConnection.TransportDetails;
             }
@@ -94,10 +92,8 @@ public IWampClientProxy<TMessage> Create(IWampConnection<TMessage> connection)
             
             proxyGenerationOptions.AddMixinInstance(propertyBag);
 
-            IWampAuthenticatedConnection<TMessage> authenticatedConnection = 
-                connection as IWampAuthenticatedConnection<TMessage>;
-            
-            if (authenticatedConnection != null)
+
+            if (connection is IWampAuthenticatedConnection<TMessage> authenticatedConnection)
             {
                 propertyBag.Authenticator = authenticatedConnection.Authenticator;
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/MetaApi/Rpc/RegistrationDescriptorService.cs b/src/net45/WampSharp/WAMP2/V2/MetaApi/Rpc/RegistrationDescriptorService.cs
@@ -143,11 +143,8 @@ public AvailableGroups GetAllRegistrations()
 
         public long? GetBestMatchingRegistrationId(string procedureUri)
         {
-            IWampProcedureRegistration registration =
-                mOperationCatalog.GetMatchingOperation(procedureUri)
-                    as IWampProcedureRegistration;
 
-            if (registration == null)
+            if (!(mOperationCatalog.GetMatchingOperation(procedureUri) is IWampProcedureRegistration registration))
             {
                 return null;
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/PubSub/PublishOptionsExtensions.cs b/src/net45/WampSharp/WAMP2/V2/PubSub/PublishOptionsExtensions.cs
@@ -9,12 +9,10 @@ public static EventDetails GetEventDetails(this PublishOptions options, string m
         {
             EventDetails result = new EventDetails();
 
-            PublishOptionsExtended extendedOptions =
-                options as PublishOptionsExtended;
 
             bool disclosePublisher = options.DiscloseMe ?? false;
 
-            if (extendedOptions != null)
+            if (options is PublishOptionsExtended extendedOptions)
             {
                 if (disclosePublisher)
                 {
diff --git a/src/net45/WampSharp/WAMP2/V2/PubSub/WampRawTopicContainer.cs b/src/net45/WampSharp/WAMP2/V2/PubSub/WampRawTopicContainer.cs
@@ -92,9 +92,8 @@ public long Publish(PublishOptions options, string topicUri, TMessage[] argument
 
         private void OnTopicEmpty(object sender, EventArgs e)
         {
-            WampRawTopic<TMessage> rawTopic = sender as WampRawTopic<TMessage>;
 
-            if (rawTopic != null)
+            if (sender is WampRawTopic<TMessage> rawTopic)
             {
                 lock (mLock)
                 {
diff --git a/src/net45/WampSharp/WAMP2/V2/PubSub/WampTopic.cs b/src/net45/WampSharp/WAMP2/V2/PubSub/WampTopic.cs
@@ -111,9 +111,8 @@ public void Dispose()
 
         private void RegisterSubscriberEventsIfNeeded(IWampRawTopicRouterSubscriber subscriber)
         {
-            ISubscriptionNotifier notifier = subscriber as ISubscriptionNotifier;
 
-            if (notifier != null)
+            if (subscriber is ISubscriptionNotifier notifier)
             {
                 RegisterSubscriberEvents(notifier);
             }
@@ -129,9 +128,8 @@ private void RegisterSubscriberEvents(ISubscriptionNotifier notifier)
 
         private void UnregisterSubscriberEventsIfNeeded(IWampRawTopicRouterSubscriber subscriber)
         {
-            ISubscriptionNotifier subscriptionNotifier = subscriber as ISubscriptionNotifier;
 
-            if (subscriptionNotifier != null)
+            if (subscriber is ISubscriptionNotifier subscriptionNotifier)
             {
                 UnregisterSubscriberEvents(subscriptionNotifier);
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/AsyncLocalRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/AsyncLocalRpcOperation.cs
@@ -68,9 +68,8 @@ private async Task InnerInvokeAsync<TMessage>(IWampRawRpcOperationRouterCallback
             {
                 mLogger.ErrorFormat(ex, "An error occured while calling {ProcedureUri}", this.Procedure);
 
-                WampException wampException = ex as WampException;
 
-                if (wampException == null)
+                if (!(ex is WampException wampException))
                 {
                     wampException = ConvertExceptionToRuntimeException(ex);
                 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/LocalRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/LocalRpcOperation.cs
@@ -140,9 +140,8 @@ public void Error(object details, string error, object[] arguments, object argum
 
         protected static WampException ConvertExceptionToRuntimeException(Exception exception)
         {
-            OperationCanceledException canceledException = exception as OperationCanceledException;
 
-            if (canceledException != null)
+            if (exception is OperationCanceledException canceledException)
             {
                 return new WampRpcCanceledException(canceledException.Message);
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampCalleeInvocationHandler.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampCalleeInvocationHandler.cs
@@ -73,9 +73,8 @@ public long RegisterInvocation(RemoteWampCalleeDetails operation, IWampRawRpcOpe
         private static IWampCaller GetCaller(IWampRawRpcOperationRouterCallback callback)
         {
             IWampCaller caller = null;
-            WampRpcOperationCallback operationCallback = callback as WampRpcOperationCallback;
 
-            if (operationCallback != null)
+            if (callback is WampRpcOperationCallback operationCallback)
             {
                 caller = operationCallback.Caller;
             }
@@ -100,9 +99,8 @@ public void Cancel(IWampCaller caller, long requestId, CancelOptions options)
 
         private void RegisterDisconnectionNotifier(IWampRawRpcOperationRouterCallback callback)
         {
-            ICallbackDisconnectionNotifier notifier = callback as ICallbackDisconnectionNotifier;
 
-            if (notifier != null)
+            if (callback is ICallbackDisconnectionNotifier notifier)
             {
                 notifier.Disconnected += OnCallbackDisconnected;
             }
@@ -130,9 +128,8 @@ private void OnCallbackDisconnected(object sender, EventArgs e)
 
         private void UnregisterDisconnectionNotifier(object sender)
         {
-            ICallbackDisconnectionNotifier notifier = sender as ICallbackDisconnectionNotifier;
-            
-            if (notifier != null)
+
+            if (sender is ICallbackDisconnectionNotifier notifier)
             {
                 notifier.Disconnected -= OnCallbackDisconnected;
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampCalleeRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampCalleeRpcOperation.cs
@@ -130,9 +130,8 @@ private IWampCancellableInvocation InvokePattern(IWampRawRpcOperationRouterCallb
 
         private InvocationDetails GetInvocationDetails(InvocationDetails details)
         {
-            InvocationDetailsExtended casted = details as InvocationDetailsExtended;
 
-            if (casted == null)
+            if (!(details is InvocationDetailsExtended casted))
             {
                 return details;
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Transports/InMemory/WampFormatterExtensions.cs b/src/net45/WampSharp/WAMP2/V2/Transports/InMemory/WampFormatterExtensions.cs
@@ -8,9 +8,8 @@ internal static class WampFormatterExtensions
     {
         public static WampMessage<TMessage> SerializeMessage<TMessage>(this IWampFormatter<TMessage> formatter, WampMessage<object> message)
         {
-            WampMessage<TMessage> casted = message as WampMessage<TMessage>;
 
-            if (casted != null)
+            if (message is WampMessage<TMessage> casted)
             {
                 return casted;
             }
@@ -24,7 +23,7 @@ public static WampMessage<TMessage> SerializeMessage<TMessage>(this IWampFormatt
                     message.Arguments.Select(x => formatter.Serialize(x))
                         .ToArray();
 
-                return result;                
+                return result;
             }
         }
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Transports/TextBinaryTransport.cs b/src/net45/WampSharp/WAMP2/V2/Transports/TextBinaryTransport.cs

Original file line number	Diff line number	Diff line change
`@@ -42,16 +42,14 @@ public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMess`
`42`	`42`
`43`	`43`	`private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWampBinding<TMessage> binding)`
`44`	`44`	`{`
`45`		`- IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;`
`46`	`45`
`47`		`- if (textBinding != null)`
	`46`	`+ if (binding is IWampTextBinding<TMessage> textBinding)`
`48`	`47`	`{`
`49`	`48`	`return CreateTextConnection(textBinding);`
`50`	`49`	`}`
`51`	`50`
`52`		`- IWampBinaryBinding<TMessage> binaryBinding = binding as IWampBinaryBinding<TMessage>;`
`53`	`51`
`54`		`- if (binaryBinding != null)`
	`52`	`+ if (binding is IWampBinaryBinding<TMessage> binaryBinding)`
`55`	`53`	`{`
`56`	`54`	`return CreateBinaryConnection(binaryBinding);`
`57`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,8 @@ public void Open()`
`55`	`55`
`56`	`56`	`public IWampConnectionListener<TMessage> GetListener<TMessage>(IWampBinding<TMessage> binding)`
`57`	`57`	`{`
`58`		`- IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;`
`59`	`58`
`60`		`- if (textBinding == null)`
	`59`	`+ if (!(binding is IWampTextBinding<TMessage> textBinding))`
`61`	`60`	`{`
`62`	`61`	`throw new ArgumentException("This transport supports only text binding.", nameof(binding));`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,14 @@ public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMess`
`33`	`33`
`34`	`34`	`private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWampBinding<TMessage> binding)`
`35`	`35`	`{`
`36`		`- IWampTextBinding<TMessage> textBinding = binding as IWampTextBinding<TMessage>;`
`37`	`36`
`38`		`- if (textBinding != null)`
	`37`	`+ if (binding is IWampTextBinding<TMessage> textBinding)`
`39`	`38`	`{`
`40`	`39`	`return CreateTextConnection(textBinding);`
`41`	`40`	`}`
`42`	`41`
`43`		`- IWampBinaryBinding<TMessage> binaryBinding = binding as IWampBinaryBinding<TMessage>;`
`44`	`42`
`45`		`- if (binaryBinding != null)`
	`43`	`+ if (binding is IWampBinaryBinding<TMessage> binaryBinding)`
`46`	`44`	`{`
`47`	`45`	`return CreateBinaryConnection(binaryBinding);`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,9 @@ public class MockRaw`
`9`	`9`	`{`
`10`	`10`	`public MockRaw(object value)`
`11`	`11`	`{`
`12`		`- MockRaw raw = value as MockRaw;`
`13`	`12`	`object[] rawArray = value as object[];`
`14`	`13`
`15`		`- if (raw != null)`
	`14`	`+ if (value is MockRaw raw)`
`16`	`15`	`{`
`17`	`16`	`Value = Clone(raw.Value);`
`18`	`17`	`}`
`@@ -66,9 +65,8 @@ private static object Clone(object value)`
`66`	`65`	`private static bool TryClone(object value, out object result)`
`67`	`66`	`{`
`68`	`67`	`result = null;`
`69`		`- ICloneable cloneable = value as ICloneable;`
`70`	`68`
`71`		`- if (cloneable != null)`
	`69`	`+ if (value is ICloneable cloneable)`
`72`	`70`	`{`
`73`	`71`	`result = cloneable.Clone();`
`74`	`72`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,12 @@ private object SerializeArgument(object x)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`IWampFormatter<TMessage> formatter = mBinding.Formatter;`
`48`		`- object[] array = x as object[];`
`49`		`-`
`50`		`- if (array != null)`
	`48`	`+`
	`49`	`+ if (x is object[] array)`
`51`	`50`	`{`
`52`		`- TMessage[] arguments =`
	`51`	`+ TMessage[] arguments =`
`53`	`52`	`array.Select(y => formatter.Serialize(y)).ToArray();`
`54`		`-`
	`53`	`+`
`55`	`54`	`return arguments;`
`56`	`55`	`}`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,8 @@ private JArray Format(WampMessage<MockRaw> message, int[] indexes)`
`79`	`79`
`80`	`80`	`private static JToken Convert(MockRaw raw)`
`81`	`81`	`{`
`82`		`- MockRaw[] array = raw.Value as MockRaw[];`
`83`	`82`
`84`		`- if (array != null)`
	`83`	`+ if (raw.Value is MockRaw[] array)`
`85`	`84`	`{`
`86`	`85`	`return new JArray(array.Select(x => Convert(x)));`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ public static string ToString(WampMessage<MockRaw> message)`
`32`	`32`
`33`	`33`	`private static JToken Convert(MockRaw raw)`
`34`	`34`	`{`
`35`		`- MockRaw[] array = raw.Value as MockRaw[];`
`36`	`35`
`37`		`- if (array != null)`
	`36`	`+ if (raw.Value is MockRaw[] array)`
`38`	`37`	`{`
`39`	`38`	`return new JArray(array.Select(x => Convert(x)));`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,10 @@ public void OnNext(IWampConnection<TMessage> value)`
`18`	`18`	`mSubject.OnNext(value);`
`19`	`19`
`20`	`20`	`// Yuck`
`21`		`- IControlledWampConnection<TMessage> casted = value as IControlledWampConnection<TMessage>;`
`22`		`-`
`23`		`- if (casted != null)`
	`21`	`+`
	`22`	`+ if (value is IControlledWampConnection<TMessage> casted)`
`24`	`23`	`{`
`25`		`- casted.Connect();`
	`24`	`+ casted.Connect();`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`
Original file line number	Diff line number	Diff line change
`@@ -146,17 +146,16 @@ public void Publish(IWampClient client, string topicUri, TMessage @event, string`
`146`	`146`
`147`	`147`	`private WampCraAuthenticator<TMessage> GetOrCreateWampAuthenticatorForClient(IWampClient client)`
`148`	`148`	`{`
`149`		`- WampCraAuthenticator<TMessage> authenticator = client.CraAuthenticator as WampCraAuthenticator<TMessage>;`
`150`		`-`
`151`		`- if (authenticator == null)`
	`149`	`+`
	`150`	`+ if (!(client.CraAuthenticator is WampCraAuthenticator<TMessage> authenticator))`
`152`	`151`	`{`
`153`	`152`	`if (!mAuthFactory.IsValid)`
`154`	`153`	`{`
`155`	`154`	`throw new InvalidOperationException("WampCraAuthenticaticatorBuilder is not valid.");`
`156`	`155`	`}`
`157`		`-`
	`156`	`+`
`158`	`157`	`authenticator = mAuthFactory.BuildAuthenticator(client.SessionId);`
`159`		`-`
	`158`	`+`
`160`	`159`	`// Very important to give the client permissions to the auth APIs...`
`161`	`160`	`foreach (IWampRpcMethod method in mWampCraProceduredMetadata.GetServiceMethods())`
`162`	`161`	`{`