Skip to content

Commit f9bb8b7

Browse files
dahfjkgdahfjkg
authored
Merge pull request #30 from mendix/remove-commons-io-2.6
Update libraries
2 parents f543725 + fe3a85b commit f9bb8b7

File tree

50 files changed

+72
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+72
-106
lines changed

‎build.gradle‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,39 @@ repositories {
99
mavenCentral()
1010
}
1111

12+
apply plugin: "com.github.ben-manes.versions"
13+
14+
buildscript {
15+
repositories {
16+
gradlePluginPortal()
17+
}
18+
19+
dependencies {
20+
classpath "com.github.ben-manes:gradle-versions-plugin:0.42.0"
21+
}
22+
}
23+
1224
dependencies {
1325
// Test dependencies
14-
compile 'org.mockito:mockito-core:3.2.4'
15-
compile 'commons-io:commons-io:2.6'
16-
compile group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
26+
compile 'org.mockito:mockito-core:4.3.1'
27+
compile 'commons-io:commons-io:2.11.0'
1728

1829
// Module dependencies
19-
compile 'com.zaxxer:HikariCP:3.4.5'
20-
compile 'org.slf4j:slf4j-api:1.7.28'
30+
compile 'com.zaxxer:HikariCP:5.0.1'
31+
compile 'org.slf4j:slf4j-api:1.7.36'
2132
compile 'com.ibm.db2.jcc:db2jcc:db2jcc4'
2233
compile 'org.hsqldb:hsqldb:2.5.0'
2334
compile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
2435
compile 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre11'
2536
compile 'com.oracle.database.jdbc:ojdbc8:19.6.0.0'
26-
compile 'org.postgresql:postgresql:42.2.14'
37+
compile 'org.postgresql:postgresql:42.2.25'
2738
compile 'com.sap.cloud.db.jdbc:ngdbc:2.4.76'
2839

2940
// UnitTesting
30-
compile group: 'junit', name: 'junit', version: '4.11', { transitive = false }
31-
compile group: 'commons-io', name: 'commons-io', version: '2.3', { transitive = false }
32-
compile group: 'org.apache.httpcomponents', name: 'httpcore-osgi', version: '4.4.1', { transitive = false }
33-
compile group: 'org.apache.httpcomponents', name: 'httpclient-osgi', version: '4.4.1', { transitive = false }
41+
compile group: 'junit', name: 'junit', version: '4.11'
42+
compile group: 'org.apache.httpcomponents', name: 'httpcore-osgi', version: '4.4.15', { transitive = false }
43+
compile group: 'org.apache.httpcomponents', name: 'httpclient-osgi', version: '4.5.13', { transitive = false }
3444

3545
// UnitTesting and ObjectHandling
36-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.1', { transitive = false }
46+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0', { transitive = false }
3747
}

‎javasource/databaseconnector/actions/ExecuteParameterizedQuery.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public java.util.List<IMendixObject> executeAction() throws Exception
7373
IMetaObject metaObject = Core.getMetaObject(this.resultObjectType);
7474
List<IMendixObject> resultList = connector.executeQuery(this.jdbcUrl, this.userName, this.password,
7575
metaObject, this.sql, this.getContext());
76-
logNode.trace(String.format("Result list count: %d", resultList.size()));
76+
if (logNode.isTraceEnabled()) logNode.trace(String.format("Result list count: %d", resultList.size()));
7777

7878
return resultList;
7979
// END USER CODE

‎javasource/databaseconnector/actions/ExecuteQuery.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public java.util.List<IMendixObject> executeAction() throws Exception
7272
IMetaObject metaObject = resultObject.getMetaObject();
7373
List<IMendixObject> resultList = connector.executeQuery(this.jdbcUrl, this.userName, this.password,
7474
metaObject, this.sql, this.getContext());
75-
logNode.trace(String.format("Result list count: %d", resultList.size()));
75+
if (logNode.isTraceEnabled()) logNode.trace(String.format("Result list count: %d", resultList.size()));
7676

7777
return resultList;
7878
// END USER CODE

‎javasource/databaseconnector/impl/JdbcConnectionManager.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,16 @@ public Connection getConnection(final String jdbcUrl, final String userName, fin
4545

4646
final Integer connPoolKey = toConnPoolKey(jdbcUrl, userName);
4747
final HikariDataSource dataSource = connectionPool.computeIfAbsent(connPoolKey, k -> {
48-
logNode.trace(
49-
String.format("Creating data source in connection pool for [url=%s, user=%s]", jdbcUrl, userName));
48+
if (logNode.isTraceEnabled()) {
49+
logNode.trace(String.format("Creating data source in connection pool for [url=%s, user=%s]", jdbcUrl, userName));
50+
}
5051
return createHikariDataSource(jdbcUrl, userName, password, connPoolKey);
5152
});
52-
logNode.trace(String.format("Getting connection from data source in connection pool for [url=%s, user=%s]",
53+
54+
if (logNode.isTraceEnabled()) {
55+
logNode.trace(String.format("Getting connection from data source in connection pool for [url=%s, user=%s]",
5356
jdbcUrl, userName));
57+
}
5458
return dataSource.getConnection();
5559
}
5660

@@ -64,10 +68,12 @@ public Connection getConnection(final String jdbcUrl, final String userName, fin
6468
private synchronized void initializeDrivers() {
6569
if (!hasDriversInitialized) {
6670
ServiceLoader<Driver> loader = ServiceLoader.load(Driver.class);
67-
Stream<String> driverNames = StreamSupport.stream(loader.spliterator(), false)
68-
.map(a -> a.getClass().getName());
69-
String logMessage = driverNames.collect(Collectors.joining(", ", "Found JDBC Drivers: ", ""));
70-
logNode.trace(logMessage);
71+
if (logNode.isTraceEnabled()) {
72+
Stream<String> driverNames = StreamSupport.stream(loader.spliterator(), false)
73+
.map(a -> a.getClass().getName());
74+
String logMessage = driverNames.collect(Collectors.joining(", ", "Found JDBC Drivers: ", ""));
75+
logNode.trace(logMessage);
76+
}
7177
hasDriversInitialized = true;
7278
}
7379
}

‎javasource/databaseconnector/impl/JdbcConnector.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.sql.PreparedStatement;
2121
import java.sql.ResultSet;
2222
import java.sql.SQLException;
23-
import java.util.LinkedList;
23+
import java.util.ArrayList;
2424
import java.util.List;
2525
import java.util.Map;
2626
import java.util.Optional;
@@ -56,7 +56,7 @@ public JdbcConnector(final ILogNode logNode) {
5656

5757
public List<IMendixObject> executeQuery(final String jdbcUrl, final String userName, final String password,
5858
final IMetaObject metaObject, final String sql, final IContext context) throws SQLException, DatabaseConnectorException {
59-
logNode.trace(String.format("executeQuery: %s, %s, %s", jdbcUrl, userName, sql));
59+
if (logNode.isTraceEnabled()) logNode.trace(String.format("executeQuery: %s, %s, %s", jdbcUrl, userName, sql));
6060

6161
try (Connection connection = connectionManager.getConnection(jdbcUrl, userName, password);
6262
PreparedStatement preparedStatement = preparedStatementCreator.create(sql, connection);
@@ -68,7 +68,7 @@ public List<IMendixObject> executeQuery(final String jdbcUrl, final String userN
6868

6969
public List<IMendixObject> executeQuery(final String jdbcUrl, final String userName, final String password,
7070
final IMetaObject metaObject, final IStringTemplate sql, final IContext context) throws SQLException, DatabaseConnectorException {
71-
logNode.trace(String.format("executeQuery: %s, %s, %s", jdbcUrl, userName, sql));
71+
if (logNode.isTraceEnabled()) logNode.trace(String.format("executeQuery: %s, %s, %s", jdbcUrl, userName, sql));
7272

7373
try (Connection connection = connectionManager.getConnection(jdbcUrl, userName, password);
7474
PreparedStatement preparedStatement = preparedStatementCreator.create(sql, connection);
@@ -84,7 +84,7 @@ private Function<Object, Object> toSuitableValue(final PrimitiveType type) {
8484

8585
private List<IMendixObject> createMendixObjects(final IContext context,
8686
final IMetaObject metaObject, List<Map<String, Optional<Object>>> resultSet) throws DatabaseConnectorException {
87-
List<IMendixObject> convertedResult = new LinkedList<IMendixObject>();
87+
List<IMendixObject> convertedResult = new ArrayList<IMendixObject>();
8888
for (Map<String, Optional<Object>> result : resultSet) {
8989
convertedResult.add(createMendixObject(context, metaObject, result));
9090
}
@@ -98,7 +98,7 @@ private IMendixObject createMendixObject(final IContext context,
9898
for (Map.Entry<String, Optional<Object>> column : columns.entrySet()) {
9999
setMemberValue(context, metaObject, obj, column.getKey(), column.getValue());
100100
}
101-
logNode.trace("Instantiated object: " + obj);
101+
if (logNode.isTraceEnabled()) logNode.trace("Instantiated object: " + obj);
102102
return obj;
103103
}
104104

@@ -131,7 +131,7 @@ private void setMemberValue(IContext context, IMetaObject metaObject, IMendixObj
131131

132132
public long executeStatement(final String jdbcUrl, final String userName, final String password, final String sql)
133133
throws SQLException {
134-
logNode.trace(String.format("executeStatement: %s, %s, %s", jdbcUrl, userName, sql));
134+
if (logNode.isTraceEnabled()) logNode.trace(String.format("executeStatement: %s, %s, %s", jdbcUrl, userName, sql));
135135

136136
try (Connection connection = connectionManager.getConnection(jdbcUrl, userName, password);
137137
PreparedStatement preparedStatement = preparedStatementCreator.create(sql, connection)) {
@@ -141,7 +141,7 @@ public long executeStatement(final String jdbcUrl, final String userName, final
141141

142142
public long executeStatement(final String jdbcUrl, final String userName, final String password,
143143
final IStringTemplate sql) throws SQLException {
144-
logNode.trace(String.format("executeStatement: %s, %s, %s", jdbcUrl, userName, sql));
144+
if (logNode.isTraceEnabled()) logNode.trace(String.format("executeStatement: %s, %s, %s", jdbcUrl, userName, sql));
145145

146146
try (Connection connection = connectionManager.getConnection(jdbcUrl, userName, password);
147147
PreparedStatement preparedStatement = preparedStatementCreator.create(sql, connection)) {
@@ -151,7 +151,7 @@ public long executeStatement(final String jdbcUrl, final String userName, final
151151

152152
public void executeCallableStatement(final String jdbcUrl, final String userName, final String password,
153153
final Statement stmt) throws SQLException, DatabaseConnectorException {
154-
logNode.trace(String.format("executeCallableStatement: %s, %s, %s", jdbcUrl, userName, stmt.getContent()));
154+
if (logNode.isTraceEnabled()) logNode.trace(String.format("executeCallableStatement: %s, %s, %s", jdbcUrl, userName, stmt.getContent()));
155155

156156
try (Connection connection = connectionManager.getConnection(jdbcUrl, userName, password);
157157
StatementWrapper callableStatement = callableStatementCreator.create(stmt, connection)) {

‎javasource/databaseconnectortest/test/ConnectionManagerTest.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package databaseconnectortest.test;
22

33
import static org.junit.Assert.assertNotEquals;
4-
import static org.mockito.Matchers.anyString;
4+
import static org.mockito.ArgumentMatchers.anyString;
55
import static org.mockito.Mockito.times;
66

77
import java.sql.Connection;
@@ -24,22 +24,14 @@ private ConnectionManager newConnManager(final ILogNode logNode) {
2424
return new JdbcConnectionManager(logNode);
2525
}
2626

27-
// @Before
28-
// public void setUp() {
29-
// ILogNode logNode = Mockito.mock(ILogNode.class);
30-
// ILogManager logManager = Mockito.mock(ILogManager.class);
31-
// Mockito.when(logManager.getLogNode(Matchers.anyString())).thenReturn(logNode);
32-
// StaticLoggerBinder.init(logManager);
33-
// }
34-
3527
@Test
3628
public void testGetConnection() throws SQLException {
3729
ILogNode logger = Mockito.mock(ILogNode.class);
30+
Mockito.when(logger.isTraceEnabled()).thenReturn(true);
3831
ConnectionManager manager = newConnManager(logger);
3932

4033
Connection conn1 = manager.getConnection(jdbcUrl, userName, password);
41-
Mockito.verify(logger, times(3)).trace(anyString()); // One log message is printed in
42-
// JdbcConnectionManager.initializeDrivers.
34+
Mockito.verify(logger, times(3)).trace(anyString());
4335
conn1.close();
4436

4537
Connection conn2 = manager.getConnection(jdbcUrl, userName, password);

‎javasource/databaseconnectortest/test/JdbcConnectorTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void testObjectInstantiatorException() throws SQLException, DatabaseConne
114114
when(preparedStatement.executeQuery()).thenReturn(resultSet);
115115
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
116116
when(resultSet.next()).thenReturn(true, false);
117-
when(objectInstantiator.instantiate(anyObject(), anyString())).thenThrow(testException);
117+
when(objectInstantiator.instantiate(any(), anyString())).thenThrow(testException);
118118

119119
try {
120120
jdbcConnector.executeQuery(jdbcUrl, userName, password, mockIMetaObject(), sqlQuery, context);
@@ -152,7 +152,7 @@ public void testSomeResults() throws SQLException, DatabaseConnectorException {
152152
when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
153153
when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
154154
when(preparedStatement.executeQuery()).thenReturn(resultSet);
155-
when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
155+
when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
156156
when(resultSetMetaData.getColumnName(anyInt())).thenReturn("a", "b");
157157
when(resultSetMetaData.getColumnCount()).thenReturn(2);
158158
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
@@ -188,7 +188,7 @@ public void testSomeResultsWithTwoColumns() throws SQLException, DatabaseConnect
188188
when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
189189
when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
190190
when(preparedStatement.executeQuery()).thenReturn(resultSet);
191-
when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject1, resultObject2);
191+
when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject1, resultObject2);
192192
when(resultSetMetaData.getColumnCount()).thenReturn(2);
193193
when(resultSetMetaData.getColumnName(1)).thenReturn(columnName1);
194194
when(resultSetMetaData.getColumnName(2)).thenReturn(columnName2);
@@ -217,7 +217,7 @@ public void testResultForBoolean() throws SQLException, DatabaseConnectorExcepti
217217
when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
218218
when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
219219
when(preparedStatement.executeQuery()).thenReturn(resultSet);
220-
when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
220+
when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
221221

222222
when(resultSetMetaData.getColumnCount()).thenReturn(1);
223223
when(resultSetMetaData.getColumnName(1)).thenReturn("Boolean");
@@ -244,7 +244,7 @@ public void testNoResults() throws Exception {
244244
when(connectionManager.getConnection(anyString(), anyString(), anyString())).thenReturn(connection);
245245
when(preparedStatementCreator.create(anyString(), eq(connection))).thenReturn(preparedStatement);
246246
when(preparedStatement.executeQuery()).thenReturn(resultSet);
247-
when(objectInstantiator.instantiate(anyObject(), anyString())).thenReturn(resultObject);
247+
when(objectInstantiator.instantiate(any(), anyString())).thenReturn(resultObject);
248248
when(resultSetMetaData.getColumnCount()).thenReturn(2);
249249
when(resultSetMetaData.getColumnName(1)).thenReturn("a");
250250
when(resultSetMetaData.getColumnName(2)).thenReturn("b");

‎javasource/databaseconnectortest/test/ResultSetReaderTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static org.mockito.Mockito.when;
88

99
import java.math.BigDecimal;
10+
import java.nio.charset.StandardCharsets;
1011
import java.sql.ResultSet;
1112
import java.sql.ResultSetMetaData;
1213
import java.sql.SQLException;
@@ -200,7 +201,7 @@ public void testAllTypes() throws SQLException {
200201
assertEquals(new BigDecimal("123"), record.get("Decimal").get());
201202
assertEquals("A1", record.get("Enum").get());
202203
assertEquals("A2", record.get("String").get());
203-
assertEquals("привет мир", new String((byte[]) record.get("Binary").get()));
204+
assertEquals("привет мир", new String((byte[]) record.get("Binary").get(), StandardCharsets.UTF_8));
204205
assertEquals(new Date(0L), record.get("DateTime").get());
205206
}
206207

‎javasource/databaseconnectortest/test/callablestatement/StatementBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.nio.file.Files;
66
import java.nio.file.Path;
77
import java.util.Date;
8-
import java.util.LinkedList;
8+
import java.util.ArrayList;
99
import java.util.List;
1010

1111
import com.mendix.core.Core;
@@ -27,7 +27,7 @@ public class StatementBuilder {
2727
private IContext context;
2828
private Statement statement;
2929

30-
private List<Parameter> parameters = new LinkedList<Parameter>();
30+
private List<Parameter> parameters = new ArrayList<Parameter>();
3131

3232
public StatementBuilder(IContext context, Statement statement) {
3333
this.context = context;

‎javasource/databaseconnectortest/test/callablestatement/TestCallableStatementLists.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static databaseconnectortest.test.callablestatement.Queries.*;
44
import static org.junit.Assert.assertEquals;
55

6-
import java.util.LinkedList;
6+
import java.util.ArrayList;
77
import java.util.List;
88
import java.util.stream.Collectors;
99
import java.util.stream.Stream;
@@ -188,7 +188,7 @@ public void testInputListOutputLong() throws Exception {
188188
public void testInputEmptyList() throws Exception {
189189
StatementBuilder builder = new StatementBuilder(context);
190190

191-
List<ParameterLong> inputList = new LinkedList<ParameterLong>();
191+
List<ParameterLong> inputList = new ArrayList<ParameterLong>();
192192

193193
builder = builder
194194
.withListInputParameter(1, null, inputList, "ARRAY_6_NUMBERS")

0 commit comments

Comments
 (0)