chore: remove deprecated method (googleapis#38)

Co-authored-by: Knut Olav Løite <koloite@gmail.com>

src/test/java/com/google/cloud/spanner/jdbc/AbortedTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.MockSpannerServiceImpl;
 import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;

src/test/java/com/google/cloud/spanner/jdbc/AbstractConnectionImplTest.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.ErrorCode;

src/test/java/com/google/cloud/spanner/jdbc/AbstractJdbcResultSetTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 

src/test/java/com/google/cloud/spanner/jdbc/AbstractSqlScriptVerifier.java

@@ -21,8 +21,8 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.cloud.Timestamp;

src/test/java/com/google/cloud/spanner/jdbc/AutocommitDmlModeConverterTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.jdbc.ClientSideStatementImpl.CompileException;
 import com.google.cloud.spanner.jdbc.ClientSideStatementValueConverters.AutocommitDmlModeConverter;

src/test/java/com/google/cloud/spanner/jdbc/AutocommitDmlModeTest.java

@@ -17,7 +17,7 @@
 package com.google.cloud.spanner.jdbc;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

src/test/java/com/google/cloud/spanner/jdbc/BooleanConverterTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.jdbc.ClientSideStatementImpl.CompileException;
 import com.google.cloud.spanner.jdbc.ClientSideStatementValueConverters.BooleanConverter;

src/test/java/com/google/cloud/spanner/jdbc/ConnectionImplTest.java

@@ -23,7 +23,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Matchers.anyString;

src/test/java/com/google/cloud/spanner/jdbc/ConnectionStatementExecutorTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;

src/test/java/com/google/cloud/spanner/jdbc/CredentialsServiceTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.auth.oauth2.GoogleCredentials;

src/test/java/com/google/cloud/spanner/jdbc/DdlBatchTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Matchers.anyString;

src/test/java/com/google/cloud/spanner/jdbc/DirectExecuteResultSetTest.java

@@ -17,7 +17,7 @@
 package com.google.cloud.spanner.jdbc;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/com/google/cloud/spanner/jdbc/DmlBatchTest.java

@@ -17,7 +17,7 @@
 package com.google.cloud.spanner.jdbc;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;

src/test/java/com/google/cloud/spanner/jdbc/DurationConverterTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.jdbc.ClientSideStatementImpl.CompileException;
 import com.google.cloud.spanner.jdbc.ClientSideStatementValueConverters.DurationConverter;

src/test/java/com/google/cloud/spanner/jdbc/JdbcAbortedTransactionTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.cloud.Timestamp;

src/test/java/com/google/cloud/spanner/jdbc/JdbcBlobTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.rpc.Code;
 import java.io.IOException;

src/test/java/com/google/cloud/spanner/jdbc/JdbcClobTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.rpc.Code;
 import java.io.IOException;

src/test/java/com/google/cloud/spanner/jdbc/JdbcConnectionTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

src/test/java/com/google/cloud/spanner/jdbc/JdbcParameterStoreTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.cloud.ByteArray;

src/test/java/com/google/cloud/spanner/jdbc/JdbcPreparedStatementTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;

src/test/java/com/google/cloud/spanner/jdbc/JdbcSqlScriptVerifier.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.jdbc.StatementResult.ResultType;
 import com.google.rpc.Code;

src/test/java/com/google/cloud/spanner/jdbc/JdbcStatementTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

src/test/java/com/google/cloud/spanner/jdbc/JdbcTypeConverterTest.java

@@ -16,7 +16,19 @@
 
 package com.google.cloud.spanner.jdbc;
 
-import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.*;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.convert;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.getAsSqlTimestamp;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.setTimestampInCalendar;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toGoogleBytes;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toGoogleDate;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toGoogleDates;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toGoogleTimestamp;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toJavaByteArrays;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toSqlDate;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toSqlDates;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toSqlTime;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toSqlTimestamp;
+import static com.google.cloud.spanner.jdbc.JdbcTypeConverter.toSqlTimestamps;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 

src/test/java/com/google/cloud/spanner/jdbc/ReadOnlyStalenessConverterTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.TimestampBound;

src/test/java/com/google/cloud/spanner/jdbc/ReadOnlyStalenessTest.java

@@ -17,7 +17,7 @@
 package com.google.cloud.spanner.jdbc;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

src/test/java/com/google/cloud/spanner/jdbc/ReadOnlyStalenessUtilTest.java

@@ -23,7 +23,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.ErrorCode;

src/test/java/com/google/cloud/spanner/jdbc/ReadOnlyTransactionTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

src/test/java/com/google/cloud/spanner/jdbc/ReadWriteTransactionTest.java

@@ -21,7 +21,7 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;

src/test/java/com/google/cloud/spanner/jdbc/ReplaceableForwardingResultSetTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/com/google/cloud/spanner/jdbc/SingleUseTransactionTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;

src/test/java/com/google/cloud/spanner/jdbc/SpannerPoolTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

src/test/java/com/google/cloud/spanner/jdbc/SqlScriptVerifier.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.ResultSet;

src/test/java/com/google/cloud/spanner/jdbc/StatementParserTest.java

@@ -19,7 +19,10 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.jdbc.ClientSideStatementImpl.CompileException;

src/test/java/com/google/cloud/spanner/jdbc/StatementResultImplTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import com.google.cloud.Timestamp;

src/test/java/com/google/cloud/spanner/jdbc/StatementTimeoutTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Mockito.doAnswer;

src/test/java/com/google/cloud/spanner/jdbc/TransactionModeConverterTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.jdbc.ClientSideStatementImpl.CompileException;
 import com.google.cloud.spanner.jdbc.ClientSideStatementValueConverters.TransactionModeConverter;

src/test/java/com/google/cloud/spanner/jdbc/it/ITBulkConnectionTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.ResultSet;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.jdbc.CloudSpannerJdbcConnection;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDatabaseMetaDataTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.api.client.util.Base64;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadWriteAutocommitTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.Mutation;