Skip to content

Commit 29ab611

Browse files
committed
Check for trace log level before creating the log string.
1 parent ad95f4c commit 29ab611

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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);
@@ -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)) {

0 commit comments

Comments
 (0)