Fix IDE hints.

CXuesong · Mar 21, 2020 · 82fbf7e · 82fbf7e
1 parent 278b5e6
commit 82fbf7e
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 36 deletions.
diff --git a/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs b/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs
@@ -13,9 +13,8 @@ internal class AspNetCoreFeatureCollection : IFeatureCollection
 
         public AspNetCoreFeatureCollection(IFeatureCollection baseCollection, HttpContext context)
         {
-            if (context == null) throw new ArgumentNullException(nameof(context));
             BaseCollection = baseCollection;
-            Context = context;
+            Context = context ?? throw new ArgumentNullException(nameof(context));
         }
 
         public IFeatureCollection BaseCollection { get; }

diff --git a/JsonRpc.AspNetCore/JsonRpcBuilder.cs b/JsonRpc.AspNetCore/JsonRpcBuilder.cs
@@ -46,8 +46,7 @@ internal class JsonRpcBuilder : IJsonRpcBuilder
         public JsonRpcBuilder(JsonRpcOptions options, IServiceCollection serviceCollection)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
-            if (serviceCollection == null) throw new ArgumentNullException(nameof(serviceCollection));
-            this.serviceCollection = serviceCollection;
+            this.serviceCollection = serviceCollection ?? throw new ArgumentNullException(nameof(serviceCollection));
             injectServices = options.InjectServiceTypes;
             serviceHostBuilder = new JsonRpcServiceHostBuilder
             {

diff --git a/JsonRpc.Commons/Client/Exceptions.cs b/JsonRpc.Commons/Client/Exceptions.cs
@@ -17,6 +17,11 @@ namespace JsonRpc.Client
 #endif
     public class JsonRpcClientException : Exception
     {
+        public JsonRpcClientException()
+            : this(null, null)
+        {
+        }
+
         public JsonRpcClientException(string message)
             : this(message, null)
         {
@@ -43,6 +48,16 @@ protected JsonRpcClientException(SerializationInfo info, StreamingContext contex
 #endif
     public class JsonRpcContractException : JsonRpcClientException
     {
+        public JsonRpcContractException()
+            : this(null, null, null)
+        {
+        }
+
+        public JsonRpcContractException(string message)
+            : this(message, null, null)
+        {
+        }
+
         public JsonRpcContractException(string message, Exception innerException)
             : this(message, null, innerException)
         {
@@ -91,6 +106,16 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 #endif
     public class JsonRpcRemoteException : JsonRpcClientException
     {
+        public JsonRpcRemoteException()
+            : this(null, null, null)
+        {
+        }
+
+        public JsonRpcRemoteException(string message)
+            : this(message, null, null)
+        {
+        }
+
         public JsonRpcRemoteException(string message, Exception innerException)
             : this(message, null, innerException)
         {

diff --git a/JsonRpc.Commons/Client/JsonRpcClient.cs b/JsonRpc.Commons/Client/JsonRpcClient.cs
@@ -28,8 +28,7 @@ public class JsonRpcClient
         /// <param name="handler">Handler used to transmit the messages.</param>
         public JsonRpcClient(IJsonRpcClientHandler handler)
         {
-            if (handler == null) throw new ArgumentNullException(nameof(handler));
-            Handler = handler;
+            Handler = handler ?? throw new ArgumentNullException(nameof(handler));
             requestIdPrefix = RuntimeHelpers.GetHashCode(this) + "#";
         }
 

diff --git a/JsonRpc.Commons/Contracts/IJsonValueConverter.cs b/JsonRpc.Commons/Contracts/IJsonValueConverter.cs
@@ -37,8 +37,7 @@ public JsonValueConverter() : this(defaultSerializer)
 
         public JsonValueConverter(JsonSerializer serializer)
         {
-            if (serializer == null) throw new ArgumentNullException(nameof(serializer));
-            this.serializer = serializer;
+            this.serializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
         }
 
         /// <inheritdoc />

diff --git a/JsonRpc.Commons/Messages/MessageEventArgs.cs b/JsonRpc.Commons/Messages/MessageEventArgs.cs
@@ -14,8 +14,7 @@ public class MessageEventArgs : EventArgs
 
         public MessageEventArgs(Message message)
         {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-            Message = message;
+            Message = message ?? throw new ArgumentNullException(nameof(message));
         }
     }
 }
diff --git a/JsonRpc.Commons/Server/JsonRpcServerHandler.cs b/JsonRpc.Commons/Server/JsonRpcServerHandler.cs
@@ -12,8 +12,7 @@ public abstract class JsonRpcServerHandler
 
         public JsonRpcServerHandler(IJsonRpcServiceHost serviceHost)
         {
-            if (serviceHost == null) throw new ArgumentNullException(nameof(serviceHost));
-            ServiceHost = serviceHost;
+            ServiceHost = serviceHost ?? throw new ArgumentNullException(nameof(serviceHost));
         }
 
         /// <summary>

diff --git a/JsonRpc.Commons/Server/JsonRpcServiceHost.cs b/JsonRpc.Commons/Server/JsonRpcServiceHost.cs
@@ -17,8 +17,7 @@ internal class JsonRpcServiceHost : IJsonRpcServiceHost
 
         internal JsonRpcServiceHost(JsonRpcServerContract contract)
         {
-            if (contract == null) throw new ArgumentNullException(nameof(contract));
-            Contract = contract;
+            Contract = contract ?? throw new ArgumentNullException(nameof(contract));
         }
 
         internal JsonRpcServerContract Contract { get; }

diff --git a/JsonRpc.Commons/Server/RequestContext.cs b/JsonRpc.Commons/Server/RequestContext.cs
@@ -12,11 +12,9 @@ public class RequestContext
         public RequestContext(IJsonRpcServiceHost serviceHost, IServiceFactory serviceFactory,
             IFeatureCollection features, RequestMessage request, CancellationToken cancellationToken)
         {
-            if (serviceHost == null) throw new ArgumentNullException(nameof(serviceHost));
-            if (request == null) throw new ArgumentNullException(nameof(request));
-            ServiceHost = serviceHost;
+            ServiceHost = serviceHost ?? throw new ArgumentNullException(nameof(serviceHost));
             ServiceFactory = serviceFactory;
-            Request = request;
+            Request = request ?? throw new ArgumentNullException(nameof(request));
             Features = features;
             if (!request.IsNotification)
                 Response = new ResponseMessage(request.Id);

diff --git a/JsonRpc.Streams/ByLineTextMessageReader.cs b/JsonRpc.Streams/ByLineTextMessageReader.cs
@@ -35,9 +35,8 @@ public ByLineTextMessageReader(TextReader reader) : this(reader, "\n")
         /// <remarks>Empty messages separated by <paramref name="delimiter"/> will be ignored.</remarks>
         public ByLineTextMessageReader(TextReader reader, string delimiter)
         {
-            if (reader == null) throw new ArgumentNullException(nameof(reader));
             if (string.IsNullOrEmpty(delimiter)) throw new ArgumentException("delimiter cannot be null or empty.", nameof(delimiter));
-            Reader = reader;
+            Reader = reader ?? throw new ArgumentNullException(nameof(reader));
             Delimiter = delimiter;
             delimiterArray = delimiter.ToCharArray();
         }
@@ -58,9 +57,8 @@ public ByLineTextMessageReader(Stream stream) : this(stream, "\n")
         /// <remarks>Empty messages separated by <paramref name="delimiter"/> will be ignored.</remarks>
         public ByLineTextMessageReader(Stream stream, string delimiter)
         {
-            if (stream == null) throw new ArgumentNullException(nameof(stream));
             if (string.IsNullOrEmpty(delimiter)) throw new ArgumentException("delimiter cannot be null or empty.", nameof(delimiter));
-            underlyingStream = stream;
+            underlyingStream = stream ?? throw new ArgumentNullException(nameof(stream));
             Reader = new StreamReader(stream, Utility.UTF8NoBom, false, 1024, true);
             Delimiter = delimiter;
             delimiterArray = delimiter.ToCharArray();

diff --git a/JsonRpc.Streams/ByLineTextMessageWriter.cs b/JsonRpc.Streams/ByLineTextMessageWriter.cs
@@ -39,9 +39,8 @@ public ByLineTextMessageWriter(TextWriter writer) : this(writer, "\n")
         /// </param>
         public ByLineTextMessageWriter(TextWriter writer, string delimiter)
         {
-            if (writer == null) throw new ArgumentNullException(nameof(writer));
             if (string.IsNullOrEmpty(delimiter)) throw new ArgumentException("delimiter cannot be null or empty.", nameof(delimiter));
-            Writer = writer;
+            Writer = writer ?? throw new ArgumentNullException(nameof(writer));
             Delimiter = delimiter;
         }
 
@@ -60,8 +59,7 @@ public ByLineTextMessageWriter(Stream stream) : this(stream, "\n")
         /// <param name="delimiter">The delimiter between the messages.</param>
         public ByLineTextMessageWriter(Stream stream, string delimiter)
         {
-            if (stream == null) throw new ArgumentNullException(nameof(stream));
-            underlyingStream = stream;
+            underlyingStream = stream ?? throw new ArgumentNullException(nameof(stream));
             Writer = new StreamWriter(stream);
             Delimiter = delimiter;
         }

diff --git a/JsonRpc.Streams/PartwiseStreamMessageReader.cs b/JsonRpc.Streams/PartwiseStreamMessageReader.cs
@@ -30,8 +30,7 @@ public class PartwiseStreamMessageReader : QueuedMessageReader
         /// <param name="stream">The stream to read messages from.</param>
         public PartwiseStreamMessageReader(Stream stream)
         {
-            if (stream == null) throw new ArgumentNullException(nameof(stream));
-            Stream = stream;
+            Stream = stream ?? throw new ArgumentNullException(nameof(stream));
         }
 
         /// <summary>

diff --git a/JsonRpc.Streams/PartwiseStreamMessageWriter.cs b/JsonRpc.Streams/PartwiseStreamMessageWriter.cs
@@ -24,8 +24,7 @@ public class PartwiseStreamMessageWriter : MessageWriter
         /// <param name="stream">The stream to write messages to.</param>
         public PartwiseStreamMessageWriter(Stream stream)
         {
-            if (stream == null) throw new ArgumentNullException(nameof(stream));
-            Stream = stream;
+            Stream = stream ?? throw new ArgumentNullException(nameof(stream));
         }
 
         /// <summary>

diff --git a/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs b/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs
@@ -15,8 +15,7 @@ public class JsonRpcHttpMessageDirectHandler : HttpMessageHandler
 
         public JsonRpcHttpMessageDirectHandler(IJsonRpcServiceHost serviceHost)
         {
-            if (serviceHost == null) throw new ArgumentNullException(nameof(serviceHost));
-            ServiceHost = serviceHost;
+            ServiceHost = serviceHost ?? throw new ArgumentNullException(nameof(serviceHost));
         }
 
         public IJsonRpcServiceHost ServiceHost { get; }

diff --git a/UnitTestProject1/Helpers/TestLogger.cs b/UnitTestProject1/Helpers/TestLogger.cs
@@ -9,8 +9,7 @@ public class TestLoggerProvider : ILoggerProvider
 
         public TestLoggerProvider(ITestOutputHelper outputHelper)
         {
-            if (outputHelper == null) throw new ArgumentNullException(nameof(outputHelper));
-            OutputHelper = outputHelper;
+            OutputHelper = outputHelper ?? throw new ArgumentNullException(nameof(outputHelper));
         }
 
         public ITestOutputHelper OutputHelper { get; }
@@ -33,8 +32,7 @@ public class TestLogger : ILogger
 
         public TestLogger(ITestOutputHelper outputHelper, string name)
         {
-            if (outputHelper == null) throw new ArgumentNullException(nameof(outputHelper));
-            OutputHelper = outputHelper;
+            OutputHelper = outputHelper ?? throw new ArgumentNullException(nameof(outputHelper));
             Name = name;
         }