chore: remove workaround for non-public method (#1634)

* chore: remove workaround for non-public method

* chore: add ignored diff to clirr

Author: olavloite

clirr-ignored-differences.xml

@@ -72,5 +72,8 @@
     <className>com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection</className>
     <method>void setProtoDescriptors(java.io.InputStream)</method>
   </difference>
-
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/spanner/connection/ConnectionHelper</className>
+  </difference>
 </differences>

src/main/java/com/google/cloud/spanner/connection/ConnectionHelper.java

@@ -20,7 +20,6 @@
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.connection.AbstractStatementParser;
-import com.google.cloud.spanner.connection.ConnectionHelper;
 import com.google.cloud.spanner.connection.ConnectionOptions;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.rpc.Code;
@@ -81,7 +80,7 @@ ConnectionOptions getConnectionOptions() {
   }
 
   Spanner getSpanner() {
-    return ConnectionHelper.getSpanner(this.spanner);
+    return this.spanner.getSpanner();
   }
 
   @Override

src/main/java/com/google/cloud/spanner/jdbc/AbstractJdbcConnection.java

@@ -51,7 +51,7 @@ public static void startEmulator() {
         new GenericContainer<>(
                 DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:latest"))
             .withExposedPorts(9010)
-            .waitingFor(Wait.forListeningPort());
+            .waitingFor(Wait.forListeningPorts(9010));
     emulator.start();
     properties = new Properties();
     properties.setProperty("autoConfigEmulator", "true");