fix imports ordering and remove matcher that's incompatible with graalvm

Author: whowes

google-cloud-jar-parent/pom.xml

@@ -71,12 +71,6 @@
       </dependency>
 
       <!-- Test dependencies -->
-      <dependency>
-        <groupId>org.awaitility</groupId>
-        <artifactId>awaitility</artifactId>
-        <version>4.3.0</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/it/ITBigQueryStorageTest.java

@@ -81,9 +81,9 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import org.apache.avro.Conversions;
 import org.apache.avro.LogicalTypes;
@@ -1233,13 +1233,19 @@ private void ProcessRowsAtSnapshot(
           TableReadOptions.newBuilder().setRowRestriction(filter).build());
     }
 
-    final CreateReadSessionRequest request = createSessionRequestBuilder.build();
-    ReadSession session =
-        await()
-            .atMost(Duration.ofSeconds(30))
-            .pollInterval(Duration.ofSeconds(1))
-            .ignoreException(NotFoundException.class)
-            .until(() -> client.createReadSession(request), Objects::nonNull);
+    CreateReadSessionRequest request = createSessionRequestBuilder.build();
+    AtomicReference<ReadSession> sessionRef = new AtomicReference<>();
+    await()
+        .atMost(Duration.ofSeconds(10))
+        .pollInterval(Duration.ofSeconds(1))
+        // retry if the newly-created table has not yet fully propagated
+        .ignoreException(NotFoundException.class)
+        .until(
+            () -> {
+              sessionRef.set(client.createReadSession(request));
+              return true;
+            });
+    ReadSession session = sessionRef.get();
     assertEquals(
         1,
         session.getStreamsCount(),

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryStorageTest.java

@@ -78,8 +78,8 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import org.apache.avro.Conversions;
 import org.apache.avro.LogicalTypes;
@@ -1214,13 +1214,19 @@ private void ProcessRowsAtSnapshot(
           .setReadOptions(TableReadOptions.newBuilder().setRowRestriction(filter).build());
     }
 
-    final CreateReadSessionRequest request = createSessionRequestBuilder.build();
-    ReadSession session =
-        await()
-            .atMost(Duration.ofSeconds(30))
-            .pollInterval(Duration.ofSeconds(1))
-            .ignoreException(NotFoundException.class)
-            .until(() -> client.createReadSession(request), Objects::nonNull);
+    CreateReadSessionRequest request = createSessionRequestBuilder.build();
+    AtomicReference<ReadSession> sessionRef = new AtomicReference<>();
+    await()
+        .atMost(Duration.ofSeconds(10))
+        .pollInterval(Duration.ofSeconds(1))
+        // retry if the newly-created table has not yet fully propagated
+        .ignoreException(NotFoundException.class)
+        .until(
+            () -> {
+              sessionRef.set(client.createReadSession(request));
+              return true;
+            });
+    ReadSession session = sessionRef.get();
     assertEquals(
         1,
         session.getStreamsCount(),