Add convenience PayloadData constructor.

Author: bgrainger

src/MySqlConnector/Core/ServerSession.cs

@@ -313,20 +313,20 @@ private async Task<PayloadData> SwitchAuthenticationAsync(ConnectionSettings cs,
 			case "mysql_native_password":
 				AuthPluginData = switchRequest.Data;
 				var hashedPassword = AuthenticationUtility.CreateAuthenticationResponse(AuthPluginData, 0, cs.Password);
-				payload = new PayloadData(new ArraySegment<byte>(hashedPassword));
+				payload = new PayloadData(hashedPassword);
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
 			case "mysql_clear_password":
 				if (!m_isSecureConnection)
 					throw new MySqlException("Authentication method '{0}' requires a secure connection.".FormatInvariant(switchRequest.Name));
-				payload = new PayloadData(new ArraySegment<byte>(Encoding.UTF8.GetBytes(cs.Password)));
+				payload = new PayloadData(Encoding.UTF8.GetBytes(cs.Password));
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
 			case "caching_sha2_password":
 				var scrambleBytes = AuthenticationUtility.CreateScrambleResponse(Utility.TrimZeroByte(switchRequest.Data), cs.Password);
-				payload = new PayloadData(new ArraySegment<byte>(scrambleBytes));
+				payload = new PayloadData(scrambleBytes);
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				payload = await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
@@ -366,7 +366,7 @@ private async Task<PayloadData> SendClearPasswordAsync(ConnectionSettings cs, IO
 			Array.Resize(ref passwordBytes, passwordBytes.Length + 1);
 
 			// send plaintext password
-			var payload = new PayloadData(new ArraySegment<byte>(passwordBytes));
+			var payload = new PayloadData(passwordBytes);
 			await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 			return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 		}
@@ -404,7 +404,7 @@ private async Task<PayloadData> SendEncryptedPasswordAsync(
 				// encrypt with RSA public key
 				var padding = switchRequest.Name == "caching_sha2_password" ? RSAEncryptionPadding.Pkcs1 : RSAEncryptionPadding.OaepSHA1;
 				var encryptedPassword = rsa.Encrypt(passwordBytes, padding);
-				var payload = new PayloadData(new ArraySegment<byte>(encryptedPassword));
+				var payload = new PayloadData(encryptedPassword);
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 			}
@@ -429,7 +429,7 @@ private async Task<string> GetRsaPublicKeyAsync(string switchRequestName, Connec
 			{
 				// request the RSA public key
 				var payloadContent = switchRequestName == "caching_sha2_password" ? (byte) 0x02 : (byte) 0x01;
-				await SendReplyAsync(new PayloadData(new ArraySegment<byte>(new byte[] { payloadContent }, 0, 1)), ioBehavior, cancellationToken).ConfigureAwait(false);
+				await SendReplyAsync(new PayloadData(new[] { payloadContent }), ioBehavior, cancellationToken).ConfigureAwait(false);
 				var payload = await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 				var publicKeyPayload = AuthenticationMoreDataPayload.Create(payload);
 				return Encoding.ASCII.GetString(publicKeyPayload.Data);

src/MySqlConnector/Protocol/PayloadData.cs

@@ -5,10 +5,9 @@ namespace MySqlConnector.Protocol
 {
 	internal struct PayloadData
 	{
-		public PayloadData(ArraySegment<byte> data)
-		{
-			ArraySegment = data;
-		}
+		public PayloadData(byte[] data) => ArraySegment = new ArraySegment<byte>(data);
+
+		public PayloadData(ArraySegment<byte> data) => ArraySegment = data;
 
 		public void ThrowIfError()
 		{

src/MySqlConnector/Protocol/Payloads/ChangeUserPayload.cs

@@ -20,7 +20,7 @@ public static PayloadData Create(string user, byte[] authResponse, string schema
 			if (connectionAttributes != null)
 				writer.Write(connectionAttributes);
 
-			return new PayloadData(new ArraySegment<byte>(writer.ToBytes()));
+			return new PayloadData(writer.ToBytes());
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/EmptyPayload.cs

@@ -6,7 +6,7 @@ internal sealed class EmptyPayload
     {
         public static PayloadData Create()
         {
-            return new PayloadData(new ArraySegment<byte>(new byte[] { }));
+            return new PayloadData(new byte[0]);
         }
     }
 }

src/MySqlConnector/Protocol/Payloads/HandshakeResponse41Payload.cs

@@ -33,7 +33,7 @@ private static PayloadWriter CreateCapabilitiesPayload(ProtocolCapabilities serv
 		}
 
 		public static PayloadData CreateWithSsl(ProtocolCapabilities serverCapabilities, ConnectionSettings cs, bool useCompression) =>
-			new PayloadData(new ArraySegment<byte>(CreateCapabilitiesPayload(serverCapabilities, cs, useCompression, ProtocolCapabilities.Ssl).ToBytes()));
+			new PayloadData(CreateCapabilitiesPayload(serverCapabilities, cs, useCompression, ProtocolCapabilities.Ssl).ToBytes());
 
 		public static PayloadData Create(InitialHandshakePayload handshake, ConnectionSettings cs, bool useCompression, byte[] connectionAttributes)
 		{
@@ -53,7 +53,7 @@ public static PayloadData Create(InitialHandshakePayload handshake, ConnectionSe
 			if (connectionAttributes != null)
 				writer.Write(connectionAttributes);
 
-			return new PayloadData(new ArraySegment<byte>(writer.ToBytes()));
+			return new PayloadData(writer.ToBytes());
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/InitDatabasePayload.cs

@@ -13,7 +13,7 @@ public static PayloadData Create(string databaseName)
 			writer.WriteByte((byte) CommandKind.InitDatabase);
 			writer.Write(Encoding.UTF8.GetBytes(databaseName));
 
-			return new PayloadData(new ArraySegment<byte>(writer.ToBytes()));
+			return new PayloadData(writer.ToBytes());
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/PingPayload.cs

@@ -1,9 +1,7 @@
-using System;
-
 namespace MySqlConnector.Protocol.Payloads
 {
 	internal sealed class PingPayload
 	{
-		public static PayloadData Create() => new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.Ping }));
+		public static PayloadData Create() => new PayloadData(new[] { (byte) CommandKind.Ping });
 	}
 }

src/MySqlConnector/Protocol/Payloads/QueryPayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 
 namespace MySqlConnector.Protocol.Payloads
@@ -11,7 +10,7 @@ public static PayloadData Create(string query)
 			var payload = new byte[length + 1];
 			payload[0] = (byte) CommandKind.Query;
 			Encoding.UTF8.GetBytes(query, 0, query.Length, payload, 1);
-			return new PayloadData(new ArraySegment<byte>(payload));
+			return new PayloadData(payload);
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/QuitPayload.cs

@@ -1,9 +1,7 @@
-using System;
-
 namespace MySqlConnector.Protocol.Payloads
 {
 	internal sealed class QuitPayload
 	{
-		public static PayloadData Create() => new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.Quit }));
+		public static PayloadData Create() => new PayloadData(new[] { (byte) CommandKind.Quit });
 	}
 }

src/MySqlConnector/Protocol/Payloads/ResetConnectionPayload.cs

@@ -1,9 +1,7 @@
-using System;
-
 namespace MySqlConnector.Protocol.Payloads
 {
 	internal sealed class ResetConnectionPayload
 	{
-		public static PayloadData Create() => new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.ResetConnection }));
+		public static PayloadData Create() => new PayloadData(new[] { (byte) CommandKind.ResetConnection });
 	}
 }