From bc4d9837c6b3fa73194abc06011117e31f075660 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Dec 2022 23:45:27 +1300 Subject: [PATCH] Modify SpiLogger removing isTrace(), trace() and the 2 uses - Not bothered to log when changing isolation level - Not bothering to log at end of query only transaction --- .../main/java/io/ebeaninternal/api/SpiLogger.java | 9 --------- .../io/ebeaninternal/server/logger/DSpiLogger.java | 9 --------- .../server/transaction/TransactionFactory.java | 3 --- .../server/transaction/TransactionManager.java | 3 --- .../src/main/java/io/ebean/test/CaptureLogger.java | 13 ------------- .../java/io/ebean/test/CapturingLoggerFactory.java | 9 --------- .../EbeanServerFactory_ServerConfigStart_Test.java | 9 --------- 7 files changed, 55 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiLogger.java index 8e6d5e71c..a2fafd796 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiLogger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiLogger.java @@ -14,18 +14,9 @@ public interface SpiLogger { */ boolean isDebug(); - /** - * Is trace logging enabled. - */ - boolean isTrace(); - /** * Log a debug level message. */ void debug(String msg); - /** - * Log a trace level message. - */ - void trace(String msg); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java index 922667037..341898ac1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java @@ -18,18 +18,9 @@ final class DSpiLogger implements SpiLogger { return logger.isLoggable(DEBUG); } - @Override - public boolean isTrace() { - return logger.isLoggable(TRACE); - } - @Override public void debug(String msg) { logger.log(DEBUG, msg); } - @Override - public void trace(String msg) { - logger.log(TRACE, msg); - } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index cf8f4591b..dcd6e73ea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -43,9 +43,6 @@ abstract class TransactionFactory { throw new PersistenceException(e); } } - if (explicit && manager.log().txn().isTrace()) { - manager.log().txn().trace(t.getLogPrefix() + "Begin"); - } return t; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 0a306640d..c7f0dde62 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -347,9 +347,6 @@ public class TransactionManager implements SpiTransactionManager { @Override public final void notifyOfQueryOnly(SpiTransaction transaction) { // Nothing that interesting here - if (txnLogger.isTrace()) { - txnLogger.trace(transaction.getLogPrefix() + "Commit - query only"); - } } private String formatThrowable(Throwable e) { diff --git a/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java b/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java index f76368f6c..6c6468570 100644 --- a/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java +++ b/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java @@ -23,11 +23,6 @@ final class CaptureLogger implements SpiLogger { return true; } - @Override - public boolean isTrace() { - return true; - } - @Override public void debug(String msg) { if (active) { @@ -36,14 +31,6 @@ final class CaptureLogger implements SpiLogger { wrapped.debug(msg); } - @Override - public void trace(String msg) { - if (active) { - messages.add(msg); - } - wrapped.trace(msg); - } - List start() { this.active = true; return collect(); diff --git a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java index c7887dd75..1e56f87d0 100644 --- a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java +++ b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java @@ -37,19 +37,10 @@ public class CapturingLoggerFactory implements SpiLoggerFactory { return logger.isLoggable(DEBUG); } - @Override - public boolean isTrace() { - return logger.isLoggable(TRACE); - } - @Override public void debug(String msg) { logger.log(DEBUG, msg); } - @Override - public void trace(String msg) { - logger.log(TRACE, msg); - } } } diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java index 113596331..f597705e7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java @@ -34,18 +34,9 @@ public class EbeanServerFactory_ServerConfigStart_Test { return false; } - @Override - public boolean isTrace() { - return false; - } - @Override public void debug(String msg) { } - - @Override - public void trace(String msg) { - } }; }