diff --git a/pom.xml b/pom.xml index ca507fdbb..0b7ea871c 100644 --- a/pom.xml +++ b/pom.xml @@ -37,10 +37,9 @@ - org.slf4j - jcl-over-slf4j + slf4j-api [1.7,) @@ -74,25 +73,6 @@ spring-context ${spring.framework.version} provided - - - - org.springframework - spring-core - ${spring.framework.version} - provided - - - commons-logging - commons-logging - - - - - org.springframework - spring-aspects - ${spring.framework.version} - provided commons-logging @@ -135,6 +115,12 @@ test + + org.slf4j + jcl-over-slf4j + [1.7,) + test + @@ -170,7 +156,7 @@ - org.eclipse.m2e @@ -230,7 +216,7 @@ - + diff --git a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java b/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java index b4ffee5b0..11bd6a0c2 100644 --- a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java +++ b/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.InitializingBean; /** * To Setup Enhancement in Spring - * + * * * * diff --git a/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java b/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java index c1fbea2e9..e6402b3b5 100644 --- a/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java +++ b/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java @@ -20,22 +20,21 @@ package com.avaje.ebean.springsupport.txn; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.persistence.PersistenceException; import javax.sql.DataSource; import com.avaje.ebean.config.ExternalTransactionManager; import com.avaje.ebeaninternal.api.SpiTransaction; import com.avaje.ebeaninternal.server.transaction.DefaultTransactionThreadLocal; import com.avaje.ebeaninternal.server.transaction.TransactionManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.datasource.ConnectionHolder; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; /** - * A Spring aware TransactionScopeManager. - * + * A Spring-aware {@link ExternalTransactionManager}. *

* Will look for Spring transactions and use them if they exist. *

@@ -45,7 +44,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager */ public class SpringAwareJdbcTransactionManager implements ExternalTransactionManager { - private final static Logger logger = Logger.getLogger(SpringAwareJdbcTransactionManager.class.getName()); + private static final Logger log = LoggerFactory.getLogger(SpringAwareJdbcTransactionManager.class); /** * The data source. @@ -97,23 +96,18 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan if (holder == null || !holder.isSynchronizedWithTransaction()) { // no current Spring transaction SpiTransaction currentEbeanTransaction = DefaultTransactionThreadLocal.get(serverName); - if (currentEbeanTransaction != null) { - // NOT expecting this so log WARNING - String msg = "SpringTransaction - no current spring txn BUT using current Ebean one " + currentEbeanTransaction.getId(); - logger.log(Level.WARNING, msg); - - } else if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Spring Txn - no current transaction "); + if (currentEbeanTransaction != null) { // this is unexpected + log.warn("No current Spring transaction BUT using current Ebean one {}", currentEbeanTransaction.getId()); + } else { + log.trace("No current Spring transaction"); } return currentEbeanTransaction; } SpringTxnListener springTxnLister = getSpringTxnListener(); - if (springTxnLister != null) { // we have already seen this transaction return springTxnLister.getTransaction(); - } else { // This is a new spring transaction that we have not seen before. // "wrap" it in a SpringJdbcTransaction for use with Ebean @@ -210,23 +204,18 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan switch (status) { case STATUS_COMMITTED: - if (logger.isLoggable(Level.FINE)) { - logger.fine("Spring Txn [" + transaction.getId() + "] committed"); - } + log.debug("Spring Txn [{}] committed", transaction.getId()); transactionManager.notifyOfCommit(transaction); break; case STATUS_ROLLED_BACK: - if (logger.isLoggable(Level.FINE)) { - logger.fine("Spring Txn [" + transaction.getId() + "] rollback"); - } + log.debug("Spring Txn [{}] rollback", transaction.getId()); transactionManager.notifyOfRollback(transaction, null); break; default: // this should never happen - String msg = "Invalid status " + status; - throw new PersistenceException(msg); + throw new PersistenceException("Invalid status " + status); } // Remove this transaction object as it is completed diff --git a/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java b/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java index 54f50f495..6d31d3e2d 100644 --- a/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java +++ b/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java @@ -19,17 +19,14 @@ */ package com.avaje.test.springsupport; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.logging.Logger; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Unit test for Ebean Spring Module. diff --git a/src/test/java/com/avaje/test/springsupport/Role.java b/src/test/java/com/avaje/test/springsupport/Role.java index 02381291e..1ff6aa60e 100644 --- a/src/test/java/com/avaje/test/springsupport/Role.java +++ b/src/test/java/com/avaje/test/springsupport/Role.java @@ -20,9 +20,7 @@ package com.avaje.test.springsupport; -import java.util.HashSet; import java.util.Set; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; @@ -56,6 +54,4 @@ public class Role { public void setUsers(Set users) { this.users = users; } - - } diff --git a/src/test/resources/init-database.xml b/src/test/resources/init-database.xml index 42fea58d6..d0739c9c0 100644 --- a/src/test/resources/init-database.xml +++ b/src/test/resources/init-database.xml @@ -8,6 +8,11 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + + + + +