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

Refactoring SpiLogger to better support conditional logging

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java

@@ -35,16 +35,7 @@ public class EbeanServerFactory_ServerConfigStart_Test {
         }
 
         @Override
-        public boolean isTrace() {
-          return false;
-        }
-
-        @Override
-        public void debug(String msg) {
-        }
-
-        @Override
-        public void trace(String msg) {
+        public void debug(String msg, Object... args) {
         }
       };
 

ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java

@@ -34,7 +34,7 @@ public class TransactionManagerTest extends BaseTestCase {
     DataSource dataSource = transactionManager.dataSource();
     Connection connection = dataSource.getConnection();
     try {
-      SpiTransaction externalTxn = new ExternalJdbcTransaction("external0", true, connection, null);
+      SpiTransaction externalTxn = new ExternalJdbcTransaction(true, connection, null);
 
       // push an externally managed transaction onto scope
       ScopedTransaction scopedTransaction = transactionManager.externalBeginTransaction(externalTxn, TxScope.required());