Merge pull request #2912 from ebean-orm/wip/spi-txn-logging

Refactoring SpiLogger to better support conditional logging

ebean-test/src/main/java/io/ebean/test/CaptureLogger.java

@@ -2,6 +2,7 @@ package io.ebean.test;
 
 import io.ebeaninternal.api.SpiLogger;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,24 +25,11 @@ final class CaptureLogger implements SpiLogger {
   }
 
   @Override
-  public boolean isTrace() {
-    return true;
-  }
-
-  @Override
-  public void debug(String msg) {
+  public void debug(String msg, Object... args) {
     if (active) {
-      messages.add(msg);
+      messages.add(MessageFormat.format(msg, args));
     }
-    wrapped.debug(msg);
-  }
-
-  @Override
-  public void trace(String msg) {
-    if (active) {
-      messages.add(msg);
-    }
-    wrapped.trace(msg);
+    wrapped.debug(msg, args);
   }
 
   List<String> start() {

ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java

@@ -5,7 +5,6 @@ import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
 
 import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.TRACE;
 
 /**
  * Create a logger that captures the SQL and register it for later access in tests.
@@ -38,18 +37,8 @@ public class CapturingLoggerFactory implements SpiLoggerFactory {
     }
 
     @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);
+    public void debug(String msg, Object... args) {
+      logger.log(DEBUG, msg, args);
     }
   }
 }