Use throw expressions.

Author: bgrainger

src/MySqlConnector/ByteArrayReader.cs

@@ -6,16 +6,9 @@ internal sealed class ByteArrayReader
 	{
 		public ByteArrayReader(byte[] buffer, int offset, int length)
 		{
-			if (buffer == null)
-				throw new ArgumentNullException(nameof(buffer));
-			if (offset < 0)
-				throw new ArgumentOutOfRangeException(nameof(offset));
-			if (offset + length > buffer.Length)
-				throw new ArgumentOutOfRangeException(nameof(length));
-
-			m_buffer = buffer;
-			m_maxOffset = offset + length;
-			m_offset = offset;
+			m_buffer = buffer ?? throw new ArgumentNullException(nameof(buffer));
+			m_offset = offset >= 0 ? offset : throw new ArgumentOutOfRangeException(nameof(offset));
+			m_maxOffset = offset + length <= m_buffer.Length ? offset + length : throw new ArgumentOutOfRangeException(nameof(length));
 		}
 
 		public ByteArrayReader(ArraySegment<byte> arraySegment)
@@ -26,12 +19,7 @@ public ByteArrayReader(ArraySegment<byte> arraySegment)
 		public int Offset
 		{
 			get { return m_offset; }
-			set
-			{
-				if (value < 0 || value > m_maxOffset)
-					throw new ArgumentOutOfRangeException(nameof(value), "value must be between 0 and {0}".FormatInvariant(m_maxOffset));
-				m_offset = value;
-			}
+			set { m_offset = value >= 0 && value <= m_maxOffset ? value : throw new ArgumentOutOfRangeException(nameof(value), "value must be between 0 and {0}".FormatInvariant(m_maxOffset)); }
 		}
 
 		public byte ReadByte()

src/MySqlConnector/MySqlClient/Caches/CachedProcedure.cs

@@ -67,16 +67,12 @@ internal MySqlParameterCollection AlignParamsWithDb(MySqlParameterCollection par
 				MySqlParameter alignParam;
 				if (cachedParam.Direction == ParameterDirection.ReturnValue)
 				{
-					if (returnParam == null)
-						throw new InvalidOperationException($"Attempt to call stored function {FullyQualified} without specifying a return parameter");
-					alignParam = returnParam;
+					alignParam = returnParam ?? throw new InvalidOperationException($"Attempt to call stored function {FullyQualified} without specifying a return parameter");
 				}
 				else
 				{
 					var index = parameterCollection.NormalizedIndexOf(cachedParam.Name);
-					if (index == -1)
-						throw new ArgumentException($"Parameter '{cachedParam.Name}' not found in the collection.");
-					alignParam = parameterCollection[index];
+					alignParam = index >= 0 ? parameterCollection[index] : throw new ArgumentException($"Parameter '{cachedParam.Name}' not found in the collection.");
 				}
 
 				if (alignParam.Direction == default(ParameterDirection))

src/MySqlConnector/MySqlClient/MySqlConnectionStringBuilder.cs

@@ -244,13 +244,8 @@ internal abstract class MySqlConnectionStringOption
 		public static MySqlConnectionStringOption TryGetOptionForKey(string key) =>
 			s_options.TryGetValue(key, out var option) ? option : null;
 
-		public static MySqlConnectionStringOption GetOptionForKey(string key)
-		{
-			var option = TryGetOptionForKey(key);
-			if (option == null)
-				throw new InvalidOperationException("Option '{0}' not supported.".FormatInvariant(key));
-			return option;
-		}
+		public static MySqlConnectionStringOption GetOptionForKey(string key) =>
+			TryGetOptionForKey(key) ?? throw new InvalidOperationException("Option '{0}' not supported.".FormatInvariant(key));
 
 		public string Key => m_keys[0];
 		public IReadOnlyList<string> Keys => m_keys;

src/MySqlConnector/MySqlClient/MySqlDataReader.cs

@@ -160,15 +160,9 @@ public override long GetChars(int ordinal, long dataOffset, char[] buffer, int b
 
 		public override IEnumerator GetEnumerator() => new DbEnumerator(this, closeReader: false);
 
-		public override int Depth
-		{
-			get { throw new NotSupportedException(); }
-		}
+		public override int Depth => throw new NotSupportedException();
 
-		protected override DbDataReader GetDbDataReader(int ordinal)
-		{
-			throw new NotSupportedException();
-		}
+		protected override DbDataReader GetDbDataReader(int ordinal) => throw new NotSupportedException();
 
 		public override DateTime GetDateTime(int ordinal) => GetResultSet().GetCurrentRow().GetDateTime(ordinal);
 
@@ -185,10 +179,7 @@ protected override DbDataReader GetDbDataReader(int ordinal)
 		public override int VisibleFieldCount => FieldCount;
 
 #if !NETSTANDARD1_3
-		public override DataTable GetSchemaTable()
-		{
-			throw new NotSupportedException();
-		}
+		public override DataTable GetSchemaTable() => throw new NotSupportedException();
 
 		public override void Close()
 		{
@@ -280,9 +271,7 @@ private void VerifyNotDisposed()
 		private ResultSet GetResultSet()
 		{
 			VerifyNotDisposed();
-			if (m_resultSet == null)
-				throw new InvalidOperationException("There is no current result set.");
-			return m_resultSet;
+			return m_resultSet ?? throw new InvalidOperationException("There is no current result set.");
 		}
 
 		readonly CommandBehavior m_behavior;

src/MySqlConnector/MySqlClient/MySqlParser.cs

@@ -6,10 +6,7 @@ internal abstract class MySqlParser
 	{
 		public int Parse(string sql)
 		{
-			if (sql == null)
-				throw new ArgumentNullException(nameof(sql));
-
-			OnBeforeParse(sql);
+			OnBeforeParse(sql ?? throw new ArgumentNullException(nameof(sql)));
 
 			int statementCount = 0;
 			int parameterStartIndex = -1;

src/MySqlConnector/MySqlClient/Results/ResultSet.cs

@@ -384,9 +384,7 @@ public Row GetCurrentRow()
 		{
 			if (State != ResultSetState.ReadingRows)
 				throw new InvalidOperationException("Read must be called first.");
-			if (m_row == null)
-				throw new InvalidOperationException("There is no current row.");
-			return m_row;
+			return m_row ?? throw new InvalidOperationException("There is no current row.");
 		}
 
 		public readonly MySqlDataReader DataReader;

src/MySqlConnector/MySqlClient/Results/Row.cs

@@ -128,10 +128,7 @@ public char GetChar(int ordinal)
 			return (char) GetValue(ordinal);
 		}
 
-		public long GetChars(int ordinal, long dataOffset, char[] buffer, int bufferOffset, int length)
-		{
-			throw new NotImplementedException();
-		}
+		public long GetChars(int ordinal, long dataOffset, char[] buffer, int bufferOffset, int length) => throw new NotImplementedException();
 
 		public Guid GetGuid(int ordinal)
 		{

src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs

@@ -243,10 +243,7 @@ public CompressedByteHandler(CompressedPayloadHandler compressedPayloadHandler,
 			public ValueTask<int> ReadBytesAsync(ArraySegment<byte> buffer, IOBehavior ioBehavior) =>
 				m_compressedPayloadHandler.ReadBytesAsync(buffer, m_protocolErrorBehavior, ioBehavior);
 
-			public ValueTask<int> WriteBytesAsync(ArraySegment<byte> data, IOBehavior ioBehavior)
-			{
-				throw new NotSupportedException();
-			}
+			public ValueTask<int> WriteBytesAsync(ArraySegment<byte> data, IOBehavior ioBehavior) => throw new NotSupportedException();
 
 			readonly CompressedPayloadHandler m_compressedPayloadHandler;
 			readonly ProtocolErrorBehavior m_protocolErrorBehavior;

src/MySqlConnector/Protocol/Serialization/StandardPayloadHandler.cs

@@ -20,9 +20,7 @@ public IByteHandler ByteHandler
 			get { return m_byteHandler; }
 			set
 			{
-				if (value == null)
-					throw new ArgumentNullException(nameof(value));
-				m_byteHandler = value;
+				m_byteHandler = value ?? throw new ArgumentNullException(nameof(value));
 				m_bufferedByteReader = new BufferedByteReader();
 			}
 		}

src/MySqlConnector/SocketAwaitable.cs

@@ -11,10 +11,7 @@ internal sealed class SocketAwaitable : INotifyCompletion
 	{
 		public SocketAwaitable(SocketAsyncEventArgs eventArgs)
 		{
-			if (eventArgs == null)
-				throw new ArgumentNullException(nameof(eventArgs));
-
-			EventArgs = eventArgs;
+			EventArgs = eventArgs ?? throw new ArgumentNullException(nameof(eventArgs));
 			eventArgs.Completed += (s, e) => (m_continuation ?? Interlocked.CompareExchange(ref m_continuation, s_sentinel, null))?.Invoke();
 		}