chore(spanner): remove temp fixes

Author: harshachinta

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java

@@ -132,7 +132,10 @@ public void testWriteAndReadInvalidJsonValues() throws IOException {
                               .to(Value.json(jsonStr))
                               .build())));
 
-      if(env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+      if (env.getTestHelper()
+          .getOptions()
+          .getSessionPoolOptions()
+          .getUseMultiplexedSessionForRW()) {
         assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode());
       } else {
         assertEquals(ErrorCode.FAILED_PRECONDITION, exception.getErrorCode());

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java

@@ -38,7 +38,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -102,11 +101,6 @@ public static void setUpDatabase() {
                         + ")"));
     postgreSQLClient = env.getTestHelper().getDatabaseClient(postgreSQLDatabase);
     hasher = Hashing.goodFastHash(64);
-    try {
-      Thread.sleep(10000);
-    } catch (Exception e) {
-
-    }
     List<Mutation> mutations = new ArrayList<>();
     Random rnd = new Random();
     int totalSize = 0;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPgJsonbTest.java

@@ -120,15 +120,6 @@ public void setUp() throws Exception {
                     + "\" (id BIGINT PRIMARY KEY, col1 JSONB, colarray JSONB[])"),
             null)
         .get(OPERATION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
-
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
   }
 
   @Test
@@ -421,14 +412,6 @@ public void testMutationsWithPgJsonbAsString() {
 
   @Test
   public void testMutationsWithPgJsonbAsValue() {
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
     databaseClient
         .readWriteTransaction()
         .run(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPgNumericTest.java

@@ -108,15 +108,6 @@ public void setUp() throws Exception {
                 "CREATE TABLE \"" + tableName + "\" (id BIGINT PRIMARY KEY, col1 NUMERIC)"),
             null)
         .get(OPERATION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
-
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
   }
 
   @Test
@@ -333,14 +324,6 @@ public void testMutationsWithPgNumericAsString() {
 
   @Test
   public void testMutationsWithPgNumericAsInt() {
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
     databaseClient
         .readWriteTransaction()
         .run(
@@ -367,14 +350,6 @@ public void testMutationsWithPgNumericAsInt() {
 
   @Test
   public void testMutationsWithPgNumericAsLong() {
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
     databaseClient
         .readWriteTransaction()
         .run(
@@ -401,14 +376,6 @@ public void testMutationsWithPgNumericAsLong() {
 
   @Test
   public void testMutationsWithPgNumericAsBigDecimal() {
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
     databaseClient
         .readWriteTransaction()
         .run(
@@ -446,14 +413,6 @@ public void testMutationsWithPgNumericAsBigDecimal() {
 
   @Test
   public void testMutationsWithPgNumericAsValue() {
-    databaseClient.readWriteTransaction().run(
-        transaction -> {
-          ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-          while (rs.next()) {
-            // do nothing
-          }
-          return null;
-        });
     databaseClient
         .readWriteTransaction()
         .run(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java

@@ -161,7 +161,10 @@ public void testInvalidInsert() throws InterruptedException {
         } catch (ExecutionException e) {
           assertThat(e.getCause()).isInstanceOf(SpannerException.class);
           SpannerException se = (SpannerException) e.getCause();
-          if(env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+          if (env.getTestHelper()
+              .getOptions()
+              .getSessionPoolOptions()
+              .getUseMultiplexedSessionForRW()) {
             assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
           } else {
             assertThat(se.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java

@@ -471,10 +471,6 @@ public void nestedTxnSucceedsWhenAllowed() {
         .run(
             transaction -> {
               client.singleUseReadOnlyTransaction();
-              ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"));
-              while(rs.next()) {
-                // do nothing
-              }
               return null;
             });
   }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java

@@ -1043,7 +1043,10 @@ public void tableNotFound() {
               .build());
       fail("Expected exception");
     } catch (SpannerException ex) {
-      if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+      if (env.getTestHelper()
+          .getOptions()
+          .getSessionPoolOptions()
+          .getUseMultiplexedSessionForRW()) {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
       } else {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);
@@ -1057,7 +1060,10 @@ public void columnNotFound() {
       write(baseInsert().set("ColumnThatDoesNotExist").to("V1").build());
       fail("Expected exception");
     } catch (SpannerException ex) {
-      if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+      if (env.getTestHelper()
+          .getOptions()
+          .getSessionPoolOptions()
+          .getUseMultiplexedSessionForRW()) {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
       } else {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);
@@ -1071,7 +1077,10 @@ public void incorrectType() {
       write(baseInsert().set("StringValue").to(1.234).build());
       fail("Expected exception");
     } catch (SpannerException ex) {
-      if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
+      if (env.getTestHelper()
+          .getOptions()
+          .getSessionPoolOptions()
+          .getUseMultiplexedSessionForRW()) {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
       } else {
         assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);