chore: Modifications after rebasing on original branch

Author: purvavasudeo

apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data.Tests/SpannerBatchCommandTests.cs

@@ -53,7 +53,8 @@ public void TransactionConstructor()
         {
             var connection = new SpannerConnection();
             SpannerClient fakeClient = ManagedSessionTests.CreateFakeClient();
-            ManagedSession fakeManagedSession = new ManagedSession(fakeClient, null, null, null);
+            DatabaseName dbName = ManagedSessionTests.FetchTestDatabaseName();
+            ManagedSession fakeManagedSession = new ManagedSession(fakeClient, dbName, null, null);
             ManagedTransaction managedTransaction = new ManagedTransaction(fakeManagedSession, null, null, false, null);
 
             var transaction = new SpannerTransaction(connection, managedTransaction, SpannerTransactionCreationOptions.ReadWrite, transactionOptions: null, isRetriable: false);

apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data.Tests/V1/ManagedSessionTests.cs

@@ -61,13 +61,20 @@ internal static SpannerClient CreateFakeClient()
         return fakeClient;
     }
 
-    internal async Task<ManagedSession> FetchTestMultiplexSessionAsync(SpannerClient client = null)
+    internal static DatabaseName FetchTestDatabaseName()
     {
         if (!DatabaseName.TryParse(TestDatabase, out var databaseName))
         {
             throw new Exception($"Unable to parse string to DatabaseName {TestDatabase}");
         }
 
+        return databaseName;
+    }
+
+    internal async Task<ManagedSession> FetchTestMultiplexSessionAsync(SpannerClient client = null)
+    {
+        var databaseName = FetchTestDatabaseName();
+
         if (client == null)
         {
             client = CreateFakeClient();

apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SessionPoolManager.cs

@@ -49,7 +49,7 @@ static SessionPoolManager()
         /// is specified on construction.
         /// </summary>
         public static SessionPoolManager Default { get; } =
-            new SessionPoolManager(new SessionPoolOptions(), CreateDefaultSpannerSettings(), Logger.DefaultLogger, CreateClientAsync);
+            new SessionPoolManager(new ManagedSessionOptions(), CreateDefaultSpannerSettings(), Logger.DefaultLogger, CreateClientAsync);
 
         private readonly Func<SpannerClientCreationOptions, SpannerSettings, Task<SpannerClient>> _clientFactory;
 

apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SpannerConnection.cs

@@ -607,7 +607,7 @@ internal Task<SpannerTransaction> BeginTransactionAsyncImpl(
                     SpannerTransactionCreationOptions effectiveCreationOptions = transactionCreationOptions;
                     ManagedTransaction transaction = transactionCreationOptions.TransactionId is null ?
                                                      await AcquireManagedTransaction(transactionCreationOptions, out effectiveCreationOptions).ConfigureAwait(false) :
-                                                     await _managedSession.CreateManagedTransactionWithMode(ByteString.FromBase64(effectiveCreationOptions.TransactionId.Id), ModeOneofCase.ReadOnly).ConfigureAwait(false);
+                                                     await _managedSession.CreateManagedTransaction(ByteString.FromBase64(effectiveCreationOptions.TransactionId.Id), ModeOneofCase.ReadOnly).ConfigureAwait(false);
 
                     return new SpannerTransaction(this, transaction, effectiveCreationOptions, transactionOptions, isRetriable: false);
                 }, "SpannerConnection.BeginTransactionAsync", Logger);
@@ -1084,10 +1084,10 @@ internal Task<ManagedTransaction> AcquireManagedTransaction(SpannerTransactionCr
                 // If we already have a transaction, we need to create a ManagedTransaction object around this transactionId.
 
                 transactionIdBytes = ByteString.FromBase64(effectiveCreationOptions.TransactionId.Id);
-                return _managedSession.CreateManagedTransactionWithSpannerTransaction(transactionIdBytes, effectiveCreationOptions.GetTransactionOptions(), effectiveCreationOptions?.IsSingleUse == true);
+                return _managedSession.CreateManagedTransaction(transactionIdBytes, effectiveCreationOptions.GetTransactionOptions(), effectiveCreationOptions?.IsSingleUse == true);
             }
 
-            return _managedSession.CreateManagedTransactionWithOptions(effectiveCreationOptions?.GetTransactionOptions(), effectiveCreationOptions?.IsSingleUse == true);
+            return _managedSession.CreateManagedTransaction(effectiveCreationOptions?.GetTransactionOptions(), effectiveCreationOptions?.IsSingleUse == true);
             //return new ManagedTransaction(_managedSession, transactionIdBytes, effectiveCreationOptions?.GetTransactionOptions(), effectiveCreationOptions?.IsSingleUse == true, null);
         }