Removing hamcrest and adding hamcrest-core from junit.

Author: passalaqua

build.gradle

@@ -25,7 +25,6 @@ dependencies {
     // Test dependencies
     compile 'org.mockito:mockito-core:4.3.1'
     compile 'commons-io:commons-io:2.11.0'
-    compile group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
 
     // Module dependencies
     compile 'com.zaxxer:HikariCP:5.0.1'
@@ -39,7 +38,7 @@ dependencies {
     compile 'com.sap.cloud.db.jdbc:ngdbc:2.4.76'
 
     // UnitTesting
-    compile group: 'junit', name: 'junit', version: '4.13.2', { transitive = false }
+    compile group: 'junit', name: 'junit', version: '4.13.2'
     compile group: 'org.apache.httpcomponents', name: 'httpcore-osgi', version: '4.4.15', { transitive = false }
     compile group: 'org.apache.httpcomponents', name: 'httpclient-osgi', version: '4.5.13', { transitive = false }
 

javasource/databaseconnectortest/test/ConnectionManagerTest.java

@@ -1,7 +1,7 @@
 package databaseconnectortest.test;
 
 import static org.junit.Assert.assertNotEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 
 import java.sql.Connection;

javasource/databaseconnectortest/test/JdbcConnectorTest.java

@@ -114,7 +114,7 @@ public void testObjectInstantiatorException() throws SQLException, DatabaseConne
 		when(preparedStatement.executeQuery()).thenReturn(resultSet);
 		when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
 		when(resultSet.next()).thenReturn(true, false);
-		when(objectInstantiator.instantiate(anyObject(), anyString())).thenThrow(testException);
+		when(objectInstantiator.instantiate(any(), anyString())).thenThrow(testException);
 
 		try {
 			jdbcConnector.executeQuery(jdbcUrl, userName, password, mockIMetaObject(), sqlQuery, context);
@@ -152,7 +152,7 @@ public void testSomeResults() throws SQLException, DatabaseConnectorException {
 		when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
 		when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
 		when(preparedStatement.executeQuery()).thenReturn(resultSet);
-		when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
+		when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
 		when(resultSetMetaData.getColumnName(anyInt())).thenReturn("a", "b");
 		when(resultSetMetaData.getColumnCount()).thenReturn(2);
 		when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
@@ -188,7 +188,7 @@ public void testSomeResultsWithTwoColumns() throws SQLException, DatabaseConnect
 		when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
 		when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
 		when(preparedStatement.executeQuery()).thenReturn(resultSet);
-		when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject1, resultObject2);
+		when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject1, resultObject2);
 		when(resultSetMetaData.getColumnCount()).thenReturn(2);
 		when(resultSetMetaData.getColumnName(1)).thenReturn(columnName1);
 		when(resultSetMetaData.getColumnName(2)).thenReturn(columnName2);
@@ -217,7 +217,7 @@ public void testResultForBoolean() throws SQLException, DatabaseConnectorExcepti
 		when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
 		when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
 		when(preparedStatement.executeQuery()).thenReturn(resultSet);
-		when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
+		when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
 
 		when(resultSetMetaData.getColumnCount()).thenReturn(1);
 		when(resultSetMetaData.getColumnName(1)).thenReturn("Boolean");
@@ -244,7 +244,7 @@ public void testNoResults() throws Exception {
 		when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
 		when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
 		when(preparedStatement.executeQuery()).thenReturn(resultSet);
-		when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
+		when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
 		when(resultSetMetaData.getColumnCount()).thenReturn(2);
 		when(resultSetMetaData.getColumnName(1)).thenReturn("a");
 		when(resultSetMetaData.getColumnName(2)).thenReturn("b");