diff --git a/ebean-spring-txn/.editorconfig b/ebean-spring-txn/.editorconfig new file mode 100644 index 000000000..18b710430 --- /dev/null +++ b/ebean-spring-txn/.editorconfig @@ -0,0 +1,13 @@ +# editorconfig.org + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true +spaces_around_operators = true +max_line_length = 130 diff --git a/ebean-spring-txn/.gitignore b/ebean-spring-txn/.gitignore new file mode 100644 index 000000000..2befb7af3 --- /dev/null +++ b/ebean-spring-txn/.gitignore @@ -0,0 +1,9 @@ +*.sql +.classpath +.project +.settings/ +target/ +logs/ +.idea/ +*.iml + diff --git a/ebean-spring-txn/LICENSE b/ebean-spring-txn/LICENSE new file mode 100644 index 000000000..1ab0a32fa --- /dev/null +++ b/ebean-spring-txn/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2012 Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/ebean-spring-txn/README.md b/ebean-spring-txn/README.md new file mode 100644 index 000000000..a49f215e2 --- /dev/null +++ b/ebean-spring-txn/README.md @@ -0,0 +1,45 @@ +[![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-spring-txn/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-spring-txn) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean-spring-txn/blob/master/LICENSE) + +ebean-spring-txn +===================== + +Integration with Spring managed transactions. + +This project provides an Ebean `ExternalTransactionManager` specifically +to integrate with Springs JDBC Transaction manager. + +## To use + +```java +DatabaseConfig config = new DatabaseConfig(); + +// set SpringJdbcTransactionManager ... as the external transaction manager +config.setExternalTransactionManager(new SpringJdbcTransactionManager()); + +... +Database database = DatabaseFactory.create(config); + +``` + +## Notes + +You can use Ebean in Spring/Spring Boot *without* this and that case Ebean +manages the Transactions itself. With Ebean managing the transactions there +are some benefits with more control over JDBC batch, getGeneratedKeys +and a simpler abstraction (as Spring transactions is designed to manage +multiple resources such as JDBC Transactions and JPA EntityManager and Ebean +only needs to manage JDBC Transactions). + + +## Java modules + +Add `requires io.ebean.spring.txn` to module-info. + +```java +module foo { + + requires io.ebean.spring.txn; + ... +} +``` diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml new file mode 100644 index 000000000..8761d3224 --- /dev/null +++ b/ebean-spring-txn/pom.xml @@ -0,0 +1,156 @@ + + + 4.0.0 + + + org.avaje + java11-oss + 3.9 + + + io.ebean + ebean-spring-txn + 13.14.0 + + ebean-spring-txn + jar + Ebean support for Spring transactions + + + 5.3.25 + 2.7.3 + false + + + https://ebean.io/ + + scm:git:git@github.com:ebean-orm/ebean-spring-txn.git + HEAD + + + + + org.slf4j + slf4j-api + 1.7.32 + provided + + + + io.ebean + ebean-core + 13.14.0 + provided + + + + io.ebean + ebean-h2 + 13.14.0 + test + + + + io.ebean + ebean-ddl-generator + 13.14.0 + test + + + + com.fasterxml.jackson.core + jackson-databind + 2.14.1 + test + + + + + org.springframework + spring-jdbc + ${spring.framework.version} + provided + + + commons-logging + commons-logging + + + + + + + org.springframework + spring-test + ${spring.framework.version} + test + + + commons-logging + commons-logging + + + + + + org.springframework.boot + spring-boot-test + ${spring.boot.version} + test + + + + junit + junit + 4.13.2 + test + + + + org.assertj + assertj-core + 3.23.1 + test + + + + com.h2database + h2 + 2.1.214 + test + + + + ch.qos.logback + logback-classic + 1.2.11 + test + + + + org.slf4j + jcl-over-slf4j + 2.0.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:13.14.0 + + + + + + + + diff --git a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransaction.java b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransaction.java new file mode 100644 index 000000000..d8208d900 --- /dev/null +++ b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransaction.java @@ -0,0 +1,20 @@ +package io.ebean.spring.txn; + +import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; +import io.ebeaninternal.server.transaction.TransactionManager; +import org.springframework.jdbc.datasource.ConnectionHolder; + +final class SpringJdbcTransaction extends ExternalJdbcTransaction { + + private final ConnectionHolder holder; + + SpringJdbcTransaction(ConnectionHolder holder, TransactionManager manager) { + super(true, holder.getConnection(), manager); + this.holder = holder; + } + + @Override + public boolean isActive() { + return holder.isSynchronizedWithTransaction(); + } +} diff --git a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java new file mode 100644 index 000000000..8375acf7c --- /dev/null +++ b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -0,0 +1,166 @@ +package io.ebean.spring.txn; + +import io.avaje.applog.AppLog; +import io.ebean.TxScope; +import io.ebean.config.ExternalTransactionManager; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.transaction.TransactionManager; +import org.springframework.jdbc.datasource.ConnectionHolder; +import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.support.TransactionSynchronizationManager; + +import javax.persistence.PersistenceException; +import javax.sql.DataSource; +import java.util.List; + +import static java.lang.System.Logger.Level.DEBUG; + +/** + * A Spring-aware {@link ExternalTransactionManager}. + *

+ * Will look for Spring transactions and use them if they exist. + * + * @author E Mc Greal + * @since 18.05.2009 + */ +public final class SpringJdbcTransactionManager implements ExternalTransactionManager { + + private static final System.Logger log = AppLog.getLogger(SpringJdbcTransactionManager.class); + + private DataSource dataSource; + private TransactionManager transactionManager; + + /** + * Instantiates a new spring aware transaction scope manager. + */ + public SpringJdbcTransactionManager() { + } + + /** + * Initialise this with the Ebean internal transaction manager. + */ + @Override + 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.dataSource(); + } + + /** + * 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). + */ + @Override + 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 = transactionManager.inScope(); + if (currentEbeanTransaction == null || !currentEbeanTransaction.isActive()) { + return null; + } else { + return currentEbeanTransaction; + } + } + + SpringTxnListener springTxnLister = listener(); + if (springTxnLister != null) { + // we have already seen this transaction + return springTxnLister.transaction(); + } 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 = createListener(newTrans); + TransactionSynchronizationManager.registerSynchronization(springTxnLister); + return transactionManager.externalBeginTransaction(newTrans, TxScope.required()); + } + } + + /** + * Search for our specific transaction listener. + *

+ * If it exists then we have already seen and "wrapped" this transaction. + */ + private SpringTxnListener listener() { + if (TransactionSynchronizationManager.isSynchronizationActive()) { + List synchronizations = TransactionSynchronizationManager.getSynchronizations(); + // search for our specific listener + for (TransactionSynchronization synchronization : synchronizations) { + if (synchronization instanceof SpringTxnListener) { + return (SpringTxnListener) synchronization; + } + } + } + return null; + } + + /** + * Create a listener to enable Ebean to be notified when transactions commit and rollback. + */ + private SpringTxnListener createListener(SpringJdbcTransaction transaction) { + return new SpringTxnListener(transactionManager, transaction); + } + + /** + * 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 implements TransactionSynchronization { + + private final TransactionManager transactionManager; + + private final SpringJdbcTransaction transaction; + + private SpringTxnListener(TransactionManager transactionManager, SpringJdbcTransaction t) { + this.transactionManager = transactionManager; + this.transaction = t; + } + + private SpringJdbcTransaction transaction() { + return transaction; + } + + @Override + public void flush() { + transaction.flush(); + } + + @Override + public void beforeCommit(boolean readOnly) { + if (!readOnly) { + transaction.preCommit(); + } + } + + @Override + public void afterCompletion(int status) { + switch (status) { + case STATUS_COMMITTED: + log.log(DEBUG, "Spring Txn [{0}] committed", transaction.getId()); + transaction.postCommit(); + break; + + case STATUS_ROLLED_BACK: + log.log(DEBUG, "Spring Txn [{0}] rollback", transaction.getId()); + transaction.postRollback(null); + break; + + default: + // this should never happen + throw new PersistenceException("Invalid status " + status); + } + + // Remove this transaction object as it is completed + transactionManager.externalRemoveTransaction(); + } + } +} diff --git a/ebean-spring-txn/src/main/java/module-info.java b/ebean-spring-txn/src/main/java/module-info.java new file mode 100644 index 000000000..13c688f67 --- /dev/null +++ b/ebean-spring-txn/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module io.ebean.spring.txn { + + exports io.ebean.spring.txn; + + requires io.ebean.api; + requires io.ebean.core; + requires spring.jdbc; + requires spring.tx; +} diff --git a/ebean-spring-txn/src/test/java/org/example/Account.java b/ebean-spring-txn/src/test/java/org/example/Account.java new file mode 100644 index 000000000..dea4c103d --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/Account.java @@ -0,0 +1,33 @@ +package org.example; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +@Table(name="o_account") +@Entity +public class Account { + + @Id + private Long id; + + @OneToOne + private User user; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } +} diff --git a/ebean-spring-txn/src/test/java/org/example/EbeanServerFactoryBean.java b/ebean-spring-txn/src/test/java/org/example/EbeanServerFactoryBean.java new file mode 100644 index 000000000..935a2d224 --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/EbeanServerFactoryBean.java @@ -0,0 +1,67 @@ +package org.example; + +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.annotation.PersistBatch; +import io.ebean.config.DatabaseConfig; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; + +/** + * A Spring FactoryBean for constructing EbeanServer instances. + * + * @since 18.05.2009 + * @author E Mc Greal + */ +public class EbeanServerFactoryBean implements InitializingBean, FactoryBean { + + /** + * The Ebean server configuration. + */ + private DatabaseConfig serverConfig; + + /** + * The EbeanServer instance. + */ + private Database ebeanServer; + + public void afterPropertiesSet() throws Exception { + + if (serverConfig == null) { + throw new Exception("No ServerConig set. You must define a ServerConfig bean"); + } + + serverConfig.setPersistBatch(PersistBatch.ALL); + // Create the new EbeanServer using the configuration + this.ebeanServer = DatabaseFactory.create(serverConfig); + } + + public Database getObject() throws Exception { + return ebeanServer; + } + + public Class getObjectType() { + return Database.class; + } + + /** + * Returns true for EbeanServer. + */ + public boolean isSingleton() { + return true; + } + + /** + * Return the server configuration. + */ + public DatabaseConfig getServerConfig() { + return serverConfig; + } + + /** + * Set the server configuration. + */ + public void setServerConfig(DatabaseConfig serverConfig) { + this.serverConfig = serverConfig; + } +} diff --git a/ebean-spring-txn/src/test/java/org/example/EbeanSpringModuleTest.java b/ebean-spring-txn/src/test/java/org/example/EbeanSpringModuleTest.java new file mode 100644 index 000000000..4d59cc0db --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/EbeanSpringModuleTest.java @@ -0,0 +1,129 @@ +package org.example; + +import io.ebean.DB; +import io.ebean.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +/** + * Unit test for Ebean Spring Module. + * @since 18.05.2009 + * @author E Mc Greal + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = {"/init-database.xml"}) +public class EbeanSpringModuleTest { + + /** The Constant logger. */ + private final static Logger logger = LoggerFactory.getLogger(EbeanSpringModuleTest.class); + + /** The user service. */ + @Autowired + private UserService userService; + + /** + * Create the test case. + */ + public EbeanSpringModuleTest() { + super(); + } + + /** + * Test app. + */ + @Test + public void testInactiveTransaction() { + + Transaction transaction = DB.beginTransaction(); + long id; + try { + User user = new User(); + user.setName("save with txn 1"); + DB.save(user); + transaction.commit(); + id = user.getOid(); + } finally { + // don't end the transaction ... + //transaction.end(); + } + + DB.delete(User.class, id); + } + + @Test + public void testBatchInsert() { + userService.batchInsert(); + } + + @Test + public void testRequiresNew() { + userService.requiresNew(); + } + + /** + * Test app. + */ + @Test + public void testSaveUser() { + logger.info("Saving new User..."); + User user = new User(); + user.setName("ebean"); + userService.save(user); + logger.info("Saved new User"); + assertThat(user.getOid()).isGreaterThan(0); + + final User found = DB.find(User.class, user.getOid()); + assertThat(found).isNotNull(); + } + + /** + * Test app. + */ + @Test + public void testFindUser() { + logger.info("Finding User with OID = 1 ..."); + User user = userService.find(1); + + assertNotNull(user); + assertTrue("ebean".equals(user.getName())); + logger.info("Found User with OID = 1"); + } + + @Test + public void testNonTransactional() { + userService.nonTransactional(); + logger.info("nonTransactional done"); + } + + @Test + public void testFindNonTransactional() { + logger.info("Finding User with OID = 1 ..."); + User user = userService.find(1); + User user2 = userService.findNoCurrentTransaction(2); + logger.info("nonTransactional find user1:{} user2:{}", user, user2); + } + + /** + * Return the user service. + */ + public UserService getUserService() { + return userService; + } + + + /** + * Sets the user service. + */ + public void setUserService(UserService userService) { + this.userService = userService; + } +} diff --git a/ebean-spring-txn/src/test/java/org/example/Role.java b/ebean-spring-txn/src/test/java/org/example/Role.java new file mode 100644 index 000000000..6fcee501e --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/Role.java @@ -0,0 +1,34 @@ +package org.example; + +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.Table; + +@Table(name="o_role") +@Entity +public class Role { + + @Id + Long id; + + @ManyToMany + private Set users; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getUsers() { + return users; + } + + public void setUsers(Set users) { + this.users = users; + } +} diff --git a/ebean-spring-txn/src/test/java/org/example/User.java b/ebean-spring-txn/src/test/java/org/example/User.java new file mode 100644 index 000000000..337796f06 --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/User.java @@ -0,0 +1,59 @@ +package org.example; + +import io.ebean.Model; + +import javax.persistence.*; +import java.util.Set; + +@Table(name="o_user") +@Entity +public class User extends Model { + + @Id + long oid; + + private String name; + + @ManyToMany + private Set roles; + + @OneToOne(mappedBy = "user") + private Account account; + + public String toString() { + return "{user:" + oid + " name:" + name + "}"; + } + + public long getOid() { + return oid; + } + + public void setOid(long oid) { + this.oid = oid; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Account getAccount() { + return account; + } + + public void setAccount(Account account) { + this.account = account; + } + +} diff --git a/ebean-spring-txn/src/test/java/org/example/UserService.java b/ebean-spring-txn/src/test/java/org/example/UserService.java new file mode 100644 index 000000000..6370601ba --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/UserService.java @@ -0,0 +1,19 @@ +package org.example; + +/** + * The Interface UserService. + */ +public interface UserService { + + void save(User user); + + User find(long id); + + User findNoCurrentTransaction(long id); + + void nonTransactional(); + + void batchInsert(); + + void requiresNew(); +} diff --git a/ebean-spring-txn/src/test/java/org/example/UserServiceImpl.java b/ebean-spring-txn/src/test/java/org/example/UserServiceImpl.java new file mode 100644 index 000000000..2a49f43f7 --- /dev/null +++ b/ebean-spring-txn/src/test/java/org/example/UserServiceImpl.java @@ -0,0 +1,98 @@ +package org.example; + +import io.ebean.Database; +import io.ebean.Transaction; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * The Class UserServiceImpl. + * + * @author E Mc Greal + * @since 18.05.2009 + */ +public class UserServiceImpl implements UserService, ApplicationContextAware { + + private ApplicationContext applicationContext; + + /** + * The ebean server. + */ + @Autowired + private Database ebeanServer; + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) + public void save(User user) { + ebeanServer.save(user); + } + + @Transactional(readOnly = true, propagation = Propagation.REQUIRED) + public User find(long id) { + return ebeanServer.find(User.class, id); + } + + public void nonTransactional() { + ebeanServer.currentTransaction(); + } + + public User findNoCurrentTransaction(long id) { + return ebeanServer.find(User.class, id); + } + + @Transactional(propagation = Propagation.REQUIRED) + public void batchInsert() { + + List users = new ArrayList<>(); + for (int i = 0; i < 25; i++) { + User user = new User(); + user.setName("user" + i); + users.add(user); + } + + System.out.println("---------before batch-------"); + + Transaction tx = ebeanServer.currentTransaction(); + tx.setBatchSize(20); + ebeanServer.saveAll(users); + + System.out.println("---------after batch-------"); + + applicationContext.getBean(UserService.class).requiresNew(); + } + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void requiresNew() { + User user = new User(); + user.setName("user_x0"); + user.insert(); + //ebeanServer.save(user); + } + + + /** + * Return the ebean server. + */ + public Database getEbeanServer() { + return ebeanServer; + } + + /** + * Sets the ebean server. + */ + public void setEbeanServer(Database ebeanServer) { + this.ebeanServer = ebeanServer; + } + + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } +} diff --git a/ebean-spring-txn/src/test/resources/default-ebean-server.xml b/ebean-spring-txn/src/test/resources/default-ebean-server.xml new file mode 100644 index 000000000..87ebce8bd --- /dev/null +++ b/ebean-spring-txn/src/test/resources/default-ebean-server.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/ebean-spring-txn/src/test/resources/init-database.xml b/ebean-spring-txn/src/test/resources/init-database.xml new file mode 100644 index 000000000..0ccf4cd6b --- /dev/null +++ b/ebean-spring-txn/src/test/resources/init-database.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.example.User + org.example.Role + org.example.Account + + + + + + + + + + + + + + + + + diff --git a/ebean-spring-txn/src/test/resources/logback-test.xml b/ebean-spring-txn/src/test/resources/logback-test.xml new file mode 100644 index 000000000..6512a5202 --- /dev/null +++ b/ebean-spring-txn/src/test/resources/logback-test.xml @@ -0,0 +1,29 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + + + + + + +