refactor(Spanner): Delete now unused code

Author: amanda-tarafa

apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data.Tests/V1/SessionPoolTests.TargetedSessionPoolTests.cs

@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
-using static Google.Cloud.Spanner.V1.SessionPool;
 using static Google.Cloud.Spanner.V1.TransactionOptions;
 
 namespace Google.Cloud.Spanner.V1.Tests
@@ -35,7 +34,6 @@ public partial class SessionPoolTests
 
         private static readonly DatabaseName s_sampleDatabaseName = new DatabaseName("project", "instance", "database");
         private static readonly DatabaseName s_sampleDatabaseName2 = new DatabaseName("project", "instance", "database2");
-        private static readonly string s_databaseRole = "testrole";
         private static readonly SessionName s_sampleSessionName = new SessionName("project", "instance", "database", "session");
         private static readonly ByteString s_sampleTransactionId = ByteString.CopyFromUtf8("transaction-id");
 

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

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Google.Api.Gax;
 using Google.Api.Gax.Grpc;
 using Google.Api.Gax.Grpc.Testing;
 using Google.Api.Gax.Testing;
@@ -21,18 +20,17 @@
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
 using Google.Rpc;
-using Google.Rpc.Context;
 using Grpc.Core;
+using NSubstitute;
+using NSubstitute.Core;
+using NSubstitute.ExceptionExtensions;
+using NSubstitute.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Status = Grpc.Core.Status;
 using static Google.Cloud.Spanner.V1.SpannerClientImpl;
-using NSubstitute;
-using NSubstitute.Extensions;
-using NSubstitute.ExceptionExtensions;
-using NSubstitute.Core;
+using Status = Grpc.Core.Status;
 
 namespace Google.Cloud.Spanner.V1.Tests
 {
@@ -65,31 +63,6 @@ internal static SpannerClient CreateMockClient(Logger logger)
             return mock;
         }
 
-        internal static SpannerClient SetupBatchCreateSessionsAsync(this SpannerClient spannerClientMock)
-        {
-            spannerClientMock.Configure()
-                .BatchCreateSessionsAsync(Arg.Is<BatchCreateSessionsRequest>(x => x != null), Arg.Any<CallSettings>())
-                .Returns(args =>
-                {
-                    var request = (BatchCreateSessionsRequest) args[0];
-                    BatchCreateSessionsResponse response = new BatchCreateSessionsResponse();
-
-                    for (int i = 0; i < request.SessionCount; i++)
-                    {
-                        var session = request.SessionTemplate.Clone();
-                        session.CreateTime = session.ApproximateLastUseTime = spannerClientMock.GetNowTimestamp();
-                        session.Expired = false;
-                        session.Name = Guid.NewGuid().ToString();
-                        session.SessionName = new SessionName(ProjectId, Instance, Database, session.Name);
-
-                        response.Session.Add(session);
-                    }
-
-                    return Task.FromResult(response);
-                });
-            return spannerClientMock;
-        }
-
         internal static SpannerClient SetupCreateSessionAsync(this SpannerClient spannerClientMock)
         {
             spannerClientMock.Configure()

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

@@ -27,45 +27,6 @@ public static class ExecuteHelper
         internal const string SessionResourceType = "type.googleapis.com/google.spanner.v1.Session";
         internal const string ResourceInfoMetadataKey = "google.rpc.resourceinfo-bin";
 
-        /// <summary>
-        /// Waits for <paramref name="task"/> to complete, handling session expiry by marking the session appropriately.
-        /// </summary>
-        internal static async Task<T> WithSessionExpiryChecking<T>(this Task<T> task, Session session)
-        {
-            try
-            {
-                return await task.ConfigureAwait(false);
-            }
-            catch (RpcException ex) when (ex.CheckForSessionExpiredError(session))
-            {
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Waits for <paramref name="task"/> to complete, handling session expiry by marking the session appropriately.
-        /// </summary>
-        internal static async Task WithSessionExpiryChecking(this Task task, Session session)
-        {
-            try
-            {
-                await task.ConfigureAwait(false);
-            }
-            catch (RpcException ex) when (ex.CheckForSessionExpiredError(session))
-            {
-                throw;
-            }
-        }
-
-        private static bool CheckForSessionExpiredError(this RpcException rpcException, Session session)
-        {
-            if (rpcException.IsSessionExpiredError())
-            {
-                session.Expired = true;
-            }
-            return false;
-        }
-
         /// <summary>
         /// Determines whether <paramref name="rpcException"/> is due to a session expiry.
         /// </summary>