diff --git a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java b/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java
index 940177208..b4ffee5b0 100644
--- a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java
+++ b/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java
@@ -15,32 +15,32 @@ import org.springframework.beans.factory.InitializingBean;
*/
public class AgentLoaderSupport implements InitializingBean {
- private Logger logger = LoggerFactory.getLogger(getClass());
+ private Logger logger = LoggerFactory.getLogger(getClass());
- private int debug;
- private String packages;
+ private int debug;
+ private String packages;
- public int getDebug() {
- return debug;
- }
+ public int getDebug() {
+ return debug;
+ }
- public void setDebug(int debug) {
- this.debug = debug;
- }
+ public void setDebug(int debug) {
+ this.debug = debug;
+ }
- public String getPackages() {
- return packages;
- }
+ public String getPackages() {
+ return packages;
+ }
- public void setPackages(String packages) {
- this.packages = packages;
- }
+ public void setPackages(String packages) {
+ this.packages = packages;
+ }
- @Override
- public void afterPropertiesSet() throws Exception {
- String args = "debug=" + getDebug() + ";packages=" + getPackages();
- if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", args)) {
- logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
- }
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ String args = "debug=" + getDebug() + ";packages=" + getPackages();
+ if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", args)) {
+ logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
}
+ }
}
diff --git a/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java b/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java
index a1daaeb6e..3b9475393 100644
--- a/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java
+++ b/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java
@@ -1,18 +1,18 @@
/**
* Copyright (C) 2009 the original author or authors
- *
+ *
* This file is part of Ebean.
- *
+ *
* Ebean is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
- *
+ *
* Ebean is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with Ebean; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -34,52 +34,52 @@ import com.avaje.ebean.config.ServerConfig;
*/
public class EbeanServerFactoryBean implements InitializingBean, FactoryBean {
- /**
- * The Ebean server configuration.
- */
- private ServerConfig serverConfig;
+ /**
+ * The Ebean server configuration.
+ */
+ private ServerConfig serverConfig;
- /**
- * The EbeanServer instance.
- */
- private EbeanServer ebeanServer;
+ /**
+ * The EbeanServer instance.
+ */
+ private EbeanServer ebeanServer;
- public void afterPropertiesSet() throws Exception {
+ public void afterPropertiesSet() throws Exception {
- if (serverConfig == null){
- throw new Exception("No ServerConig set. You must define a ServerConfig bean");
- }
+ if (serverConfig == null) {
+ throw new Exception("No ServerConig set. You must define a ServerConfig bean");
+ }
- // Create the new EbeanServer using the configuration
- this.ebeanServer = EbeanServerFactory.create(serverConfig);
- }
+ // Create the new EbeanServer using the configuration
+ this.ebeanServer = EbeanServerFactory.create(serverConfig);
+ }
- public EbeanServer getObject() throws Exception {
- return ebeanServer;
- }
+ public EbeanServer getObject() throws Exception {
+ return ebeanServer;
+ }
- public Class getObjectType() {
- return EbeanServer.class;
- }
+ public Class getObjectType() {
+ return EbeanServer.class;
+ }
- /**
- * Returns true for EbeanServer.
- */
- public boolean isSingleton() {
- return true;
- }
+ /**
+ * Returns true for EbeanServer.
+ */
+ public boolean isSingleton() {
+ return true;
+ }
- /**
- * Return the server configuration.
- */
- public ServerConfig getServerConfig() {
- return serverConfig;
- }
+ /**
+ * Return the server configuration.
+ */
+ public ServerConfig getServerConfig() {
+ return serverConfig;
+ }
- /**
- * Set the server configuration.
- */
- public void setServerConfig(ServerConfig serverConfig) {
- this.serverConfig = serverConfig;
- }
+ /**
+ * Set the server configuration.
+ */
+ public void setServerConfig(ServerConfig serverConfig) {
+ this.serverConfig = serverConfig;
+ }
}
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 0fb7ac0b0..76221a568 100644
--- a/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java
+++ b/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java
@@ -1,18 +1,18 @@
/**
* Copyright (C) 2009 the original author or authors
- *
+ *
* This file is part of Ebean.
- *
+ *
* Ebean is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
- *
+ *
* Ebean is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with Ebean; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -38,195 +38,195 @@ import com.avaje.ebeaninternal.server.transaction.TransactionManager;
/**
* A Spring aware TransactionScopeManager.
- *
+ *
*
* Will look for Spring transactions and use them if they exist.
*
- *
+ *
* @since 18.05.2009
* @author E Mc Greal
*/
public class SpringAwareJdbcTransactionManager implements ExternalTransactionManager {
- private final static Logger logger = Logger.getLogger(SpringAwareJdbcTransactionManager.class.getName());
+ private final static Logger logger = Logger.getLogger(SpringAwareJdbcTransactionManager.class.getName());
- /**
- * The data source.
- */
- private DataSource dataSource;
+ /**
+ * The data source.
+ */
+ private DataSource dataSource;
- /**
- * The Ebean transaction manager.
- */
- private TransactionManager transactionManager;
+ /**
+ * The Ebean transaction manager.
+ */
+ private TransactionManager transactionManager;
- /**
- * The EbeanServer name.
- */
- private String serverName;
-
- /**
- * Instantiates a new spring aware transaction scope manager.
- */
- public SpringAwareJdbcTransactionManager() {
+ /**
+ * The EbeanServer name.
+ */
+ private String serverName;
+
+ /**
+ * Instantiates a new spring aware transaction scope manager.
+ */
+ public SpringAwareJdbcTransactionManager() {
+ }
+
+ /**
+ * Initialise this with the Ebean internal transaction manager.
+ */
+ public void setTransactionManager(Object txnMgr) {
+
+ // RB: At this stage not exposing TransactionManager to
+ // the public API and hence the Object type and casting here
+
+ this.transactionManager = (TransactionManager) txnMgr;
+ this.dataSource = transactionManager.getDataSource();
+ this.serverName = transactionManager.getServerName();
+ }
+
+ /**
+ * Looks for a current Spring managed transaction and wraps/returns that as a Ebean transaction.
+ *
+ * Returns null if there is no current spring transaction (lazy loading outside a spring txn etc).
+ *
+ */
+ public Object getCurrentTransaction() {
+
+ // Get the current Spring ConnectionHolder associated to the current spring managed transaction
+ ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource);
+
+ 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 ");
+ }
+ 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
+ SpringJdbcTransaction newTrans = new SpringJdbcTransaction(holder, transactionManager);
+
+ // Create and register a Spring TransactionSynchronization for this transaction
+ springTxnLister = createSpringTxnListener(newTrans);
+ TransactionSynchronizationManager.registerSynchronization(springTxnLister);
+
+ // also put in Ebean ThreadLocal
+ DefaultTransactionThreadLocal.set(serverName, newTrans);
+ return newTrans;
+ }
+ }
+
+ /**
+ * Search for our specific transaction listener.
+ *
+ * If it exists then we have already seen and "wrapped" this transaction.
+ *
+ */
+ private SpringTxnListener getSpringTxnListener() {
+
+ if (TransactionSynchronizationManager.isSynchronizationActive()) {
+ List synchronizations = TransactionSynchronizationManager.getSynchronizations();
+ if (synchronizations != null) {
+ // search for our specific listener
+ for (int i = 0; i < synchronizations.size(); i++) {
+ if (synchronizations.get(i) instanceof SpringTxnListener) {
+ return (SpringTxnListener) synchronizations.get(i);
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Create a listener to register with Spring to enable Ebean to be
+ * notified when transactions commit and rollback.
+ *
+ * This is used by Ebean to notify it's appropriate listeners and maintain it's server
+ * cache etc.
+ *
+ */
+ private SpringTxnListener createSpringTxnListener(SpringJdbcTransaction t) {
+ return new SpringTxnListener(transactionManager, t);
+ }
+
+ /**
+ * A Spring TransactionSynchronization that we register with Spring to get
+ * notified when a Spring managed transaction has been committed or rolled
+ * back.
+ *
+ * When Ebean is notified (of the commit/rollback) it can then manage its
+ * cache, notify BeanPersistListeners etc.
+ *
+ */
+ private static class SpringTxnListener extends TransactionSynchronizationAdapter {
+
+ private final TransactionManager transactionManager;
+
+ private final SpringJdbcTransaction transaction;
+
+ private final String serverName;
+
+ private SpringTxnListener(TransactionManager transactionManager, SpringJdbcTransaction t) {
+ this.transactionManager = transactionManager;
+ this.transaction = t;
+ this.serverName = transactionManager.getServerName();
}
/**
- * Initialise this with the Ebean internal transaction manager.
+ * Return the associated Ebean wrapped transaction.
*/
- public void setTransactionManager(Object txnMgr) {
-
- // RB: At this stage not exposing TransactionManager to
- // the public API and hence the Object type and casting here
-
- this.transactionManager = (TransactionManager) txnMgr;
- this.dataSource = transactionManager.getDataSource();
- this.serverName = transactionManager.getServerName();
+ public SpringJdbcTransaction getTransaction() {
+ return transaction;
}
- /**
- * Looks for a current Spring managed transaction and wraps/returns that as a Ebean transaction.
- *
- * Returns null if there is no current spring transaction (lazy loading outside a spring txn etc).
- *
- */
- public Object getCurrentTransaction() {
-
- // Get the current Spring ConnectionHolder associated to the current spring managed transaction
- ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource);
-
- 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 ");
- }
- 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
- SpringJdbcTransaction newTrans = new SpringJdbcTransaction(holder, transactionManager);
-
- // Create and register a Spring TransactionSynchronization for this transaction
- springTxnLister = createSpringTxnListener(newTrans);
- TransactionSynchronizationManager.registerSynchronization(springTxnLister);
-
- // also put in Ebean ThreadLocal
- DefaultTransactionThreadLocal.set(serverName, newTrans);
- return newTrans;
- }
+ @Override
+ public void beforeCommit(boolean readOnly) {
+ // Future note: for JPA2 locking we will
+ // have beforeCommit events to fire
}
- /**
- * Search for our specific transaction listener.
- *
- * If it exists then we have already seen and "wrapped" this transaction.
- *
- */
- private SpringTxnListener getSpringTxnListener() {
+ @Override
+ public void afterCompletion(int status) {
- if (TransactionSynchronizationManager.isSynchronizationActive()){
- List synchronizations = TransactionSynchronizationManager.getSynchronizations();
- if (synchronizations != null){
- // search for our specific listener
- for (int i = 0; i < synchronizations.size(); i++) {
- if (synchronizations.get(i) instanceof SpringTxnListener){
- return (SpringTxnListener)synchronizations.get(i);
- }
- }
- }
- }
-
- return null;
- }
-
- /**
- * Create a listener to register with Spring to enable Ebean to be
- * notified when transactions commit and rollback.
- *
- * This is used by Ebean to notify it's appropriate listeners and maintain it's server
- * cache etc.
- *
- */
- private SpringTxnListener createSpringTxnListener(SpringJdbcTransaction t) {
- return new SpringTxnListener(transactionManager, t);
- }
+ switch (status) {
+ case STATUS_COMMITTED:
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine("Spring Txn [" + transaction.getId() + "] committed");
+ }
+ transactionManager.notifyOfCommit(transaction);
+ break;
- /**
- * A Spring TransactionSynchronization that we register with Spring to get
- * notified when a Spring managed transaction has been committed or rolled
- * back.
- *
- * When Ebean is notified (of the commit/rollback) it can then manage its
- * cache, notify BeanPersistListeners etc.
- *
- */
- private static class SpringTxnListener extends TransactionSynchronizationAdapter {
-
- private final TransactionManager transactionManager;
-
- private final SpringJdbcTransaction transaction;
-
- private final String serverName;
-
- private SpringTxnListener(TransactionManager transactionManager, SpringJdbcTransaction t){
- this.transactionManager = transactionManager;
- this.transaction = t;
- this.serverName = transactionManager.getServerName();
- }
-
- /**
- * Return the associated Ebean wrapped transaction.
- */
- public SpringJdbcTransaction getTransaction() {
- return transaction;
- }
-
- @Override
- public void beforeCommit(boolean readOnly) {
- // Future note: for JPA2 locking we will
- // have beforeCommit events to fire
- }
+ case STATUS_ROLLED_BACK:
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine("Spring Txn [" + transaction.getId() + "] rollback");
+ }
+ transactionManager.notifyOfRollback(transaction, null);
+ break;
- @Override
- public void afterCompletion(int status) {
-
- switch (status) {
- case STATUS_COMMITTED:
- if (logger.isLoggable(Level.FINE)){
- logger.fine("Spring Txn ["+transaction.getId()+"] committed");
- }
- transactionManager.notifyOfCommit(transaction);
- break;
-
- case STATUS_ROLLED_BACK:
- if (logger.isLoggable(Level.FINE)){
- logger.fine("Spring Txn ["+transaction.getId()+"] rollback");
- }
- transactionManager.notifyOfRollback(transaction, null);
- break;
-
- default:
- // this should never happen
- String msg = "Invalid status "+status;
- throw new PersistenceException(msg);
- }
-
- // Remove this transaction object as it is completed
- DefaultTransactionThreadLocal.replace(serverName, null);
- }
+ default:
+ // this should never happen
+ String msg = "Invalid status " + status;
+ throw new PersistenceException(msg);
+ }
+
+ // Remove this transaction object as it is completed
+ DefaultTransactionThreadLocal.replace(serverName, null);
}
+ }
}
diff --git a/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java b/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java
index 367e0f6bb..6b38fa7af 100644
--- a/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java
+++ b/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java
@@ -1,18 +1,18 @@
/**
* Copyright (C) 2009 the original author or authors
- *
+ *
* This file is part of Ebean.
- *
+ *
* Ebean is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
- *
+ *
* Ebean is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with Ebean; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -27,19 +27,19 @@ import com.avaje.ebeaninternal.server.transaction.TransactionManager;
public class SpringJdbcTransaction extends ExternalJdbcTransaction {
- private final ConnectionHolder holder;
+ private final ConnectionHolder holder;
- public SpringJdbcTransaction(ConnectionHolder holder, TransactionManager manager) {
- super("s"+holder.hashCode(), true, holder.getConnection(), manager);
- this.holder = holder;
- }
+ public SpringJdbcTransaction(ConnectionHolder holder, TransactionManager manager) {
+ super("s" + holder.hashCode(), true, holder.getConnection(), manager);
+ this.holder = holder;
+ }
- @Override
- public boolean isActive() {
- return holder.isSynchronizedWithTransaction();
- }
+ @Override
+ public boolean isActive() {
+ return holder.isSynchronizedWithTransaction();
+ }
- public ConnectionHolder getConnectionHolder() {
- return holder;
- }
+ public ConnectionHolder getConnectionHolder() {
+ return holder;
+ }
}