Move callback data into a dedicated class.

This will make it easier to add additional properties in the future if they're ever needed.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/MySqlConnection.cs

@@ -584,7 +584,7 @@ internal async Task OpenAsync(IOBehavior? ioBehavior, CancellationToken cancella
 				EnlistTransaction(System.Transactions.Transaction.Current);
 
 			if (ConnectionOpenedCallback is { } connectionOpenedCallback)
-				await connectionOpenedCallback(this, m_session.Conditions).ConfigureAwait(false);
+				await connectionOpenedCallback(new(this, m_session.Conditions)).ConfigureAwait(false);
 		}
 		catch (Exception ex) when (activity is { IsAllDataRequested: true })
 		{

src/MySqlConnector/MySqlConnectionOpenedCallback.cs

@@ -3,10 +3,28 @@ namespace MySqlConnector;
 /// <summary>
 /// A callback that is invoked when a new <see cref="MySqlConnection"/> is opened.
 /// </summary>
-/// <param name="connection">The <see cref="MySqlConnection"/> that was opened.</param>
-/// <param name="conditions">Bitflags giving the conditions under which a connection was opened.</param>
+/// <param name="data">A <see cref="MySqlConnectionOpenedData"/> giving information about the connection being opened.</param>
 /// <returns>A <see cref="ValueTask"/> representing the result of the possibly-asynchronous operation.</returns>
-public delegate ValueTask MySqlConnectionOpenedCallback(MySqlConnection connection, MySqlConnectionOpenedConditions conditions);
+public delegate ValueTask MySqlConnectionOpenedCallback(MySqlConnectionOpenedData data);
+
+public sealed class MySqlConnectionOpenedData
+{
+	/// <summary>
+	/// The <see cref="MySqlConnection"/> that was opened.
+	/// </summary>
+	public MySqlConnection Connection { get; }
+
+	/// <summary>
+	/// Bitflags giving the conditions under which a connection was opened.
+	/// </summary>
+	public MySqlConnectionOpenedConditions Conditions { get; }
+
+	internal MySqlConnectionOpenedData(MySqlConnection connection, MySqlConnectionOpenedConditions conditions)
+	{
+		Connection = connection;
+		Conditions = conditions;
+	}
+}
 
 /// <summary>
 /// Bitflags giving the conditions under which a connection was opened.

src/MySqlConnector/MySqlDataSourceBuilder.cs

@@ -95,11 +95,11 @@ public MySqlDataSourceBuilder UseConnectionOpenedCallback(MySqlConnectionOpenedC
 		return this;
 	}
 
-	public MySqlDataSourceBuilder UseConnectionOpenedCallback(Action<MySqlConnection, MySqlConnectionOpenedConditions> callback)
+	public MySqlDataSourceBuilder UseConnectionOpenedCallback(Action<MySqlConnectionOpenedData> callback)
 	{
-		m_connectionOpenedCallback = (connection, conditions) =>
+		m_connectionOpenedCallback = data =>
 		{
-			callback(connection, conditions);
+			callback(data);
 			return default;
 		};
 		return this;

tests/MySqlConnector.Tests/ConnectionOpenedCallbackTests.cs

@@ -48,10 +48,10 @@ public void CallbackIsInvoked()
 	public void SyncCallbackIsInvoked()
 	{
 		var dataSource = new MySqlDataSourceBuilder(m_csb.ConnectionString)
-			.UseConnectionOpenedCallback((conn, cond) =>
+			.UseConnectionOpenedCallback(data =>
 			{
 				m_connectionOpenedCount++;
-				m_connectionOpenedConditions = cond;
+				m_connectionOpenedConditions = data.Conditions;
 			})
 			.Build();
 		using (var connection = dataSource.CreateConnection())
@@ -146,10 +146,10 @@ public void ConditionsForNonResetConnection()
 		}
 	}
 
-	private ValueTask OnConnectionOpenedAsync(MySqlConnection connection, MySqlConnectionOpenedConditions conditions)
+	private ValueTask OnConnectionOpenedAsync(MySqlConnectionOpenedData data)
 	{
 		m_connectionOpenedCount++;
-		m_connectionOpenedConditions = conditions;
+		m_connectionOpenedConditions = data.Conditions;
 		return default;
 	}