Skip to content

Commit 3452f92

Browse files
committed
Logger
1 parent 84ea8f9 commit 3452f92

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

core/src/main/java/me/zort/sqllib/Logger.java renamed to core/src/main/java/me/zort/sqllib/LocalLogger.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.sql.Connection;
44

5-
public final class Logger {
5+
public final class LocalLogger {
66

7-
private Logger() {
7+
private LocalLogger() {
88
}
99

1010
public static void debug(Connection connection, String message) {

core/src/main/java/me/zort/sqllib/SQLDatabaseConnection.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*
2121
* @author ZorTik
2222
*/
23+
@SuppressWarnings("unused")
2324
public abstract class SQLDatabaseConnection implements SQLConnection {
2425

2526
private final SQLConnectionFactory connectionFactory;

core/src/main/java/me/zort/sqllib/SQLDatabaseConnectionImpl.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package me.zort.sqllib;
22

33
import com.google.gson.Gson;
4-
import lombok.AllArgsConstructor;
5-
import lombok.Data;
6-
import lombok.Getter;
7-
import lombok.RequiredArgsConstructor;
4+
import lombok.*;
85
import me.zort.sqllib.api.ObjectMapper;
96
import me.zort.sqllib.api.Query;
107
import me.zort.sqllib.api.StatementFactory;
@@ -41,6 +38,7 @@
4138
import java.sql.*;
4239
import java.util.*;
4340
import java.util.concurrent.CopyOnWriteArrayList;
41+
import java.util.logging.Logger;
4442

4543
/**
4644
* Main database client object implementation.
@@ -69,6 +67,8 @@ public class SQLDatabaseConnectionImpl extends SQLDatabaseConnection {
6967
@ApiStatus.Experimental
7068
private final transient StatementMappingResultAdapter mappingResultAdapter;
7169
private transient ObjectMapper objectMapper;
70+
@Setter
71+
private transient Logger logger;
7272

7373
/**
7474
* Constructs new instance of this implementation with default
@@ -101,6 +101,7 @@ public SQLDatabaseConnectionImpl(SQLConnectionFactory connectionFactory, @Nullab
101101
this.objectMapper = new DefaultObjectMapper(this);
102102
this.mappingFactory = new DefaultStatementMappingFactory();
103103
this.mappingResultAdapter = new DefaultResultAdapter();
104+
this.logger = Logger.getGlobal();
104105

105106
// Default backup value resolvers.
106107
registerBackupValueResolver(new LinkedOneFieldResolver());
@@ -470,9 +471,7 @@ public UpsertQuery save(Object obj) {
470471
}
471472

472473
public void debug(String message) {
473-
if(options.isDebug()) {
474-
System.out.println(message);
475-
}
474+
if(options.isDebug()) logger.info(message);
476475
}
477476

478477
@Override
@@ -513,7 +512,7 @@ private static class DefaultStatementFactory implements StatementFactory<Prepare
513512
public PreparedStatement prepare(Connection connection) throws SQLException {
514513
String queryString = query.getAncestor().buildQuery();
515514

516-
Logger.debug(connection, "Query: " + queryString);
515+
LocalLogger.debug(connection, "Query: " + queryString);
517516
return connection.prepareStatement(queryString);
518517
}
519518
}

core/src/main/java/me/zort/sqllib/internal/query/QueryDetails.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.zort.sqllib.internal.query;
22

33
import lombok.*;
4-
import me.zort.sqllib.Logger;
4+
import me.zort.sqllib.LocalLogger;
55
import me.zort.sqllib.util.Pair;
66
import me.zort.sqllib.util.Util;
77

@@ -52,8 +52,8 @@ protected PreparedStatement prepare(Connection connection) throws SQLException {
5252
Pair<String, Object[]> requirements = buildStatementDetails();
5353

5454
// Shows plain query for prepared statement.
55-
Logger.debug(connection, String.format("P-Query: %s", requirements.getFirst()));
56-
Logger.debug(connection, String.format("P-Values: %s", Arrays.toString(requirements.getSecond())));
55+
LocalLogger.debug(connection, String.format("P-Query: %s", requirements.getFirst()));
56+
LocalLogger.debug(connection, String.format("P-Values: %s", Arrays.toString(requirements.getSecond())));
5757

5858
PreparedStatement statement = connection.prepareStatement(requirements.getFirst());
5959
Object[] values = requirements.getSecond();

0 commit comments

Comments
 (0)