Use target-typed new.

Author: bgrainger

src/MySqlConnector.Logging.Serilog/SerilogLoggerProvider.cs

@@ -47,7 +47,7 @@ public void Log(MySqlConnectorLogLevel level, string message, object[] args = nu
 				_ => throw new ArgumentOutOfRangeException(nameof(level), level, "Invalid value for 'level'."),
 			};
 
-			static readonly Regex tokenReplacer = new Regex(@"((\w+)?\s?(?:=|:)?\s?'?)\{(?:\d+)(\:\w+)?\}('?)", RegexOptions.Compiled);
+			static readonly Regex tokenReplacer = new(@"((\w+)?\s?(?:=|:)?\s?'?)\{(?:\d+)(\:\w+)?\}('?)", RegexOptions.Compiled);
 
 			readonly ILogger m_logger;
             readonly string m_name;

src/MySqlConnector/Core/CommandExecutor.cs

@@ -31,7 +31,7 @@ public static async Task<MySqlDataReader> ExecuteReaderAsync(IReadOnlyList<IMySq
 			{
 				if (command2.CommandType == CommandType.StoredProcedure)
 				{
-					cachedProcedures ??= new Dictionary<string, CachedProcedure?>();
+					cachedProcedures ??= new();
 					var commandText = command2.CommandText!;
 					if (!cachedProcedures.ContainsKey(commandText))
 					{

src/MySqlConnector/Core/ConnectionPool.cs

@@ -90,7 +90,7 @@ public async ValueTask<ServerSession> GetSessionAsync(MySqlConnection connection
 					else
 					{
 						// pooled session is ready to be used; return it
-						session.OwningConnection = new WeakReference<MySqlConnection>(connection);
+						session.OwningConnection = new(connection);
 						int leasedSessionsCountPooled;
 						lock (m_leasedSessions)
 						{
@@ -104,12 +104,12 @@ public async ValueTask<ServerSession> GetSessionAsync(MySqlConnection connection
 				}
 
 				// create a new session
-				session = new ServerSession(this, m_generation, Interlocked.Increment(ref m_lastSessionId));
+				session = new(this, m_generation, Interlocked.Increment(ref m_lastSessionId));
 				if (Log.IsInfoEnabled())
 					Log.Info("Pool{0} no pooled session available; created new Session{1}", m_logArguments[0], session.Id);
 				await session.ConnectAsync(ConnectionSettings, startTickCount, m_loadBalancer, ioBehavior, cancellationToken).ConfigureAwait(false);
 				AdjustHostConnectionCount(session, 1);
-				session.OwningConnection = new WeakReference<MySqlConnection>(connection);
+				session.OwningConnection = new(connection);
 				int leasedSessionsCountNew;
 				lock (m_leasedSessions)
 				{
@@ -376,7 +376,7 @@ private async Task CreateMinimumPooledSessions(IOBehavior ioBehavior, Cancellati
 			// check if pool has already been created for this exact connection string
 			if (s_pools.TryGetValue(connectionString, out var pool))
 			{
-				s_mruCache = new ConnectionStringPool(connectionString, pool);
+				s_mruCache = new(connectionString, pool);
 				return pool;
 			}
 
@@ -385,7 +385,7 @@ private async Task CreateMinimumPooledSessions(IOBehavior ioBehavior, Cancellati
 			if (!connectionStringBuilder.Pooling)
 			{
 				s_pools.GetOrAdd(connectionString, default(ConnectionPool));
-				s_mruCache = new ConnectionStringPool(connectionString, null);
+				s_mruCache = new(connectionString, null);
 				return null;
 			}
 
@@ -396,7 +396,7 @@ private async Task CreateMinimumPooledSessions(IOBehavior ioBehavior, Cancellati
 				// try to set the pool for the connection string to the canonical pool; if someone else
 				// beats us to it, just use the existing value
 				pool = s_pools.GetOrAdd(connectionString, pool)!;
-				s_mruCache = new ConnectionStringPool(connectionString, pool);
+				s_mruCache = new(connectionString, pool);
 				return pool;
 			}
 
@@ -407,7 +407,7 @@ private async Task CreateMinimumPooledSessions(IOBehavior ioBehavior, Cancellati
 
 			if (pool == newPool)
 			{
-				s_mruCache = new ConnectionStringPool(connectionString, pool);
+				s_mruCache = new(connectionString, pool);
 				pool.StartReaperTask();
 
 				// if we won the race to create the new pool, also store it under the original connection string
@@ -445,13 +445,13 @@ private ConnectionPool(ConnectionSettings cs)
 			ConnectionSettings = cs;
 			SslProtocols = cs.TlsVersions;
 			m_generation = 0;
-			m_cleanSemaphore = new SemaphoreSlim(1);
-			m_sessionSemaphore = new SemaphoreSlim(cs.MaximumPoolSize);
-			m_sessions = new LinkedList<ServerSession>();
-			m_leasedSessions = new Dictionary<string, ServerSession>();
+			m_cleanSemaphore = new(1);
+			m_sessionSemaphore = new(cs.MaximumPoolSize);
+			m_sessions = new();
+			m_leasedSessions = new();
 			if (cs.ConnectionProtocol == MySqlConnectionProtocol.Sockets && cs.LoadBalance == MySqlLoadBalance.LeastConnections)
 			{
-				m_hostSessions = new Dictionary<string, int>();
+				m_hostSessions = new();
 				foreach (var hostName in cs.HostNames!)
 					m_hostSessions[hostName] = 0;
 			}

src/MySqlConnector/Core/ILoadBalancer.cs

@@ -46,14 +46,14 @@ public IEnumerable<string> LoadBalance(IReadOnlyList<string> hosts)
 			return shuffled;
 		}
 
-		private RandomLoadBalancer() => m_random = new Random();
+		private RandomLoadBalancer() => m_random = new();
 
 		readonly Random m_random;
 	}
 
 	internal sealed class RoundRobinLoadBalancer : ILoadBalancer
 	{
-		public RoundRobinLoadBalancer() => m_lock = new object();
+		public RoundRobinLoadBalancer() => m_lock = new();
 
 		public IEnumerable<string> LoadBalance(IReadOnlyList<string> hosts)
 		{

src/MySqlConnector/Core/ParsedStatement.cs

@@ -18,12 +18,12 @@ internal sealed class ParsedStatement
 		/// The names of the parameters (if known) of the parameters in the prepared statement. There
 		/// is one entry in this list for each parameter, which will be <c>null</c> if the name is unknown.
 		/// </summary>
-		public List<string?> ParameterNames { get; } = new List<string?>();
+		public List<string?> ParameterNames { get; } = new();
 
 		/// <summary>
 		/// The indexes of the parameters in the prepared statement. There is one entry in this list for
 		/// each parameter; it will be <c>-1</c> if the parameter is named.
 		/// </summary>
-		public List<int> ParameterIndexes { get; }= new List<int>();
+		public List<int> ParameterIndexes { get; }= new();
 	}
 }

src/MySqlConnector/Core/ResultSet.cs

@@ -88,7 +88,7 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 									int byteCount;
 									while ((byteCount = await stream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
 									{
-										payload = new PayloadData(new ArraySegment<byte>(buffer, 0, byteCount));
+										payload = new(new ArraySegment<byte>(buffer, 0, byteCount));
 										await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
 									}
 								}
@@ -110,7 +110,7 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 						catch (Exception ex)
 						{
 							// store the exception, to be thrown after reading the response packet from the server
-							ReadResultSetHeaderException = new MySqlException("Error during LOAD DATA LOCAL INFILE", ex);
+							ReadResultSetHeaderException = new("Error during LOAD DATA LOCAL INFILE", ex);
 						}
 
 						await Session.SendReplyAsync(EmptyPayload.Instance, ioBehavior, CancellationToken.None).ConfigureAwait(false);
@@ -219,7 +219,7 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance
 			var row = await ScanRowAsync(ioBehavior, null, cancellationToken).ConfigureAwait(false);
 			if (row is null)
 				return null;
-			m_readBuffer ??= new Queue<Row>();
+			m_readBuffer ??= new();
 			m_readBuffer.Enqueue(row);
 			return row;
 		}

src/MySqlConnector/Core/SchemaProvider.cs

@@ -12,7 +12,7 @@ internal sealed class SchemaProvider
 		public SchemaProvider(MySqlConnection connection)
 		{
 			m_connection = connection;
-			m_schemaCollections = new Dictionary<string, Action<DataTable>>
+			m_schemaCollections = new()
 			{
 				{ "DataSourceInformation", FillDataSourceInformation},
 				{ "MetaDataCollections", FillMetadataCollections },

src/MySqlConnector/Core/ServerSession.cs

@@ -37,8 +37,8 @@ public ServerSession()
 
 		public ServerSession(ConnectionPool? pool, int poolGeneration, int id)
 		{
-			m_lock = new object();
-			m_payloadCache = new ArraySegmentHolder<byte>();
+			m_lock = new();
+			m_payloadCache = new();
 			Id = (pool?.Id ?? 0) + "." + id;
 			ServerVersion = ServerVersion.Empty;
 			CreatedTicks = unchecked((uint) Environment.TickCount);
@@ -224,7 +224,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can
 				preparedStatements.Add(new(response.StatementId, statement, columns, parameters));
 			}
 
-			m_preparedStatements ??= new Dictionary<string, PreparedStatements>();
+			m_preparedStatements ??= new();
 			m_preparedStatements.Add(commandText, new(preparedStatements, parsedStatements));
 		}
 
@@ -399,7 +399,7 @@ public async Task ConnectAsync(ConnectionSettings cs, int startTickCount, ILoadB
 						throw new NotSupportedException("Authentication method '{0}' is not supported.".FormatInvariant(initialHandshake.AuthPluginName));
 					}
 
-					ServerVersion = new ServerVersion(initialHandshake.ServerVersion);
+					ServerVersion = new(initialHandshake.ServerVersion);
 					ConnectionId = initialHandshake.ConnectionId;
 					AuthPluginData = initialHandshake.AuthPluginData;
 					m_useCompression = cs.UseCompression && (initialHandshake.ProtocolCapabilities & ProtocolCapabilities.Compress) != 0;
@@ -561,7 +561,7 @@ private async Task<PayloadData> SwitchAuthenticationAsync(ConnectionSettings cs,
 			case "mysql_native_password":
 				AuthPluginData = switchRequest.Data;
 				var hashedPassword = AuthenticationUtility.CreateAuthenticationResponse(AuthPluginData, cs.Password);
-				payload = new PayloadData(hashedPassword);
+				payload = new(hashedPassword);
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
@@ -574,13 +574,13 @@ private async Task<PayloadData> SwitchAuthenticationAsync(ConnectionSettings cs,
 				// send the password as a NULL-terminated UTF-8 string
 				var passwordBytes = Encoding.UTF8.GetBytes(cs.Password);
 				Array.Resize(ref passwordBytes, passwordBytes.Length + 1);
-				payload = new PayloadData(passwordBytes);
+				payload = new(passwordBytes);
 				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.AsSpan()), cs.Password);
-				payload = new PayloadData(scrambleBytes);
+				payload = new(scrambleBytes);
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				payload = await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
@@ -620,7 +620,7 @@ private async Task<PayloadData> SwitchAuthenticationAsync(ConnectionSettings cs,
 			case "client_ed25519":
 				if (!AuthenticationPlugins.TryGetPlugin(switchRequest.Name, out var ed25519Plugin))
 					throw new NotSupportedException("You must install the MySqlConnector.Authentication.Ed25519 package and call Ed25519AuthenticationPlugin.Install to use client_ed25519 authentication.");
-				payload = new PayloadData(ed25519Plugin.CreateResponse(cs.Password, switchRequest.Data));
+				payload = new(ed25519Plugin.CreateResponse(cs.Password, switchRequest.Data));
 				await SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
 				return await ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 
@@ -891,7 +891,7 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer
 					TcpClient? tcpClient = null;
 					try
 					{
-						tcpClient = new TcpClient(ipAddress.AddressFamily);
+						tcpClient = new(ipAddress.AddressFamily);
 
 						using (cancellationToken.Register(() => tcpClient.Client?.Dispose()))
 						{
@@ -1084,7 +1084,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 							throw new MySqlException("No certificates were found in the certificate store");
 						}
 
-						clientCertificates = new X509CertificateCollection(store.Certificates);
+						clientCertificates = new(store.Certificates);
 					}
 					else
 					{
@@ -1097,7 +1097,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 							throw new MySqlException("Certificate with Thumbprint {0} not found".FormatInvariant(cs.CertificateThumbprint));
 						}
 
-						clientCertificates = new X509CertificateCollection(foundCertificates);
+						clientCertificates = new(foundCertificates);
 					}
 				}
 				catch (CryptographicException ex)
@@ -1168,7 +1168,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 #endif
 
 					m_clientCertificate = certificate;
-					clientCertificates = new X509CertificateCollection { certificate };
+					clientCertificates = new() { certificate };
 				}
 
 				catch (CryptographicException ex)
@@ -1195,7 +1195,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 							"CertificateFile should be in PKCS #12 (.pfx) format and contain both a Certificate and Private Key");
 					}
 					m_clientCertificate = certificate;
-					clientCertificates = new X509CertificateCollection { certificate };
+					clientCertificates = new() { certificate };
 				}
 				catch (CryptographicException ex)
 				{
@@ -1210,13 +1210,13 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 			X509Chain? caCertificateChain = null;
 			if (cs.CACertificateFile is not null)
 			{
-				X509Chain? certificateChain = new X509Chain
+				X509Chain? certificateChain = new()
 				{
 					ChainPolicy =
-						{
-							RevocationMode = X509RevocationMode.NoCheck,
-							VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority
-						}
+					{
+						RevocationMode = X509RevocationMode.NoCheck,
+						VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority
+					}
 				};
 
 				try

src/MySqlConnector/Core/ServerVersion.cs

@@ -43,7 +43,7 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 							{
 								totalBytesRead += bytesConsumed;
 								if (totalBytesRead == mariaDbIndex)
-									MariaDbVersion = new Version(major, minor, build);
+									MariaDbVersion = new(major, minor, build);
 							}
 						}
 					}
@@ -55,7 +55,7 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 		public Version Version { get; }
 		public Version? MariaDbVersion { get; }
 
-		public static ServerVersion Empty { get; } = new ServerVersion();
+		public static ServerVersion Empty { get; } = new();
 
 		private ServerVersion()
 		{

src/MySqlConnector/Core/ServerVersions.cs

@@ -5,18 +5,18 @@ namespace MySqlConnector.Core
 	internal static class ServerVersions
 	{
 		// https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-3.html
-        public static readonly Version SupportsUtf8Mb4 = new Version(5, 5, 3);
+        public static readonly Version SupportsUtf8Mb4 = new(5, 5, 3);
 
 		// https://dev.mysql.com/doc/refman/5.7/en/mysql-reset-connection.html
-		public static readonly Version SupportsResetConnection = new Version(5, 7, 3);
+		public static readonly Version SupportsResetConnection = new(5, 7, 3);
 
 		// https://mariadb.com/kb/en/library/com_reset_connection/
-		public static readonly Version MariaDbSupportsResetConnection = new Version(10, 2, 4);
+		public static readonly Version MariaDbSupportsResetConnection = new(10, 2, 4);
 
 		// http://dev.mysql.com/doc/refman/5.5/en/parameters-table.html
-		public static readonly Version SupportsProcedureCache = new Version(5, 5, 3);
+		public static readonly Version SupportsProcedureCache = new(5, 5, 3);
 
 		// https://ocelot.ca/blog/blog/2017/08/22/no-more-mysql-proc-in-mysql-8-0/
-		public static readonly Version RemovesMySqlProcTable = new Version(8, 0, 0);
+		public static readonly Version RemovesMySqlProcTable = new(8, 0, 0);
 	}
 }