#16 - Bump to support Ebean 11.5.1+

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-spring-txn</artifactId>
-  <version>10.1.2-SNAPSHOT</version>
+  <version>11.5.1-SNAPSHOT</version>
 
   <name>ebean-spring-txn</name>
   <packaging>jar</packaging>
@@ -32,14 +32,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.21</version>
+      <version>1.7.25</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>[10,)</version>
+      <version>11.5.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -79,10 +79,30 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>avaje-composite-testing-ebean</artifactId>
-      <version>4.1</version>
-      <type>pom</type>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.196</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -104,7 +124,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:2.1</tile>
+            <tile>io.ebean.tile:enhancement:5.2</tile>
           </tiles>
         </configuration>
       </plugin>

src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java

@@ -19,10 +19,15 @@
  */
 package io.ebean.spring.txn;
 
+import io.ebean.TxScope;
 import io.ebean.config.ExternalTransactionManager;
+import io.ebeaninternal.api.ScopeTrans;
+import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.transaction.DefaultTransactionScopeManager;
 import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
 import io.ebeaninternal.server.transaction.TransactionManager;
+import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.ConnectionHolder;
@@ -57,10 +62,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
    */
   private TransactionManager transactionManager;
 
-  /**
-   *  The EbeanServer name.
-   */
-  private String serverName;
+  private TransactionScopeManager scope;
 
   /**
    * Instantiates a new spring aware transaction scope manager.
@@ -76,10 +78,9 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
 
     // 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();
+    this.scope = new DefaultTransactionScopeManager(transactionManager);
   }
 
   /**
@@ -96,7 +97,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
 
     if (holder == null || !holder.isSynchronizedWithTransaction()) {
       // no current Spring transaction
-      SpiTransaction currentEbeanTransaction = DefaultTransactionThreadLocal.get(serverName);
+      SpiTransaction currentEbeanTransaction = scope.get();
       if (currentEbeanTransaction != null) { // this is unexpected
         log.warn("No current Spring transaction BUT using current Ebean one {}", currentEbeanTransaction.getId());
       } else {
@@ -118,9 +119,10 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
       springTxnLister = createSpringTxnListener(newTrans);
       TransactionSynchronizationManager.registerSynchronization(springTxnLister);
 
-      // also put in Ebean ThreadLocal
-      DefaultTransactionThreadLocal.set(serverName, newTrans);
-      return newTrans;
+      ScopedTransaction scopedTxn = new ScopedTransaction(scope);
+      scopedTxn.push(new ScopeTrans(true, false, newTrans, TxScope.required()));
+      scope.set(scopedTxn);
+      return scopedTxn;
     }
   }
 
@@ -185,7 +187,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
     /**
      * Return the associated Ebean wrapped transaction.
      */
-    public SpringJdbcTransaction getTransaction() {
+    SpringJdbcTransaction getTransaction() {
       return transaction;
     }
 

src/test/java/org/example/UserServiceImpl.java

@@ -21,7 +21,6 @@
 package org.example;
 
 import io.ebean.Transaction;
-import io.ebean.PersistBatch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,10 +42,7 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private EbeanServer ebeanServer;
 
-	/* (non-Javadoc)
-	 * @see org.spring.modules.ebean.UserService#save(org.spring.modules.ebean.User)
-	 */
-	@Transactional(readOnly = false, propagation = Propagation.REQUIRED, rollbackFor=Throwable.class)
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor=Throwable.class)
 	public void save(User user) {
 		ebeanServer.save(user);
 	}
@@ -56,12 +52,11 @@ public class UserServiceImpl implements UserService {
 		return ebeanServer.find(User.class, id);
 	}
 
+  @Transactional(propagation = Propagation.REQUIRED)
+  public void batchInsert() {
 
-  @Transactional(readOnly = false, propagation = Propagation.REQUIRED)
-  public void batchInsert(){
-
-    List<User> users = new ArrayList<User>();
-    for(int i=0 ;i<5;i++){
+    List<User> users = new ArrayList<>();
+    for(int i=0 ;i<25;i++){
       User user = new User();
       user.setName("user"+i);
       users.add(user);
@@ -69,11 +64,9 @@ public class UserServiceImpl implements UserService {
 
     System.out.println("---------before batch-------");
 
-    Transaction tx = ebeanServer.beginTransaction();
-    tx.setBatch(PersistBatch.NONE);
-    tx.setBatchOnCascade(PersistBatch.ALL);
+    Transaction tx = ebeanServer.currentTransaction();
     tx.setBatchSize(20);
-    ebeanServer.saveAll(users);//
+    ebeanServer.saveAll(users);
 
     System.out.println("---------after batch-------");
   }

src/test/resources/logback-test.xml

@@ -0,0 +1,32 @@
+<configuration scan="true" scanPeriod="10 seconds">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>TRACE</level>
+    </filter>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <logger name="io.ebean" level="INFO"/>
+
+  <!-- sql and transaction logging -->
+  <logger name="io.ebean.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>
+  <logger name="io.ebean.DDL" level="TRACE"/>
+
+  <!-- l2 cache logging -->
+  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
+  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
+  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
+
+  <!-- elasticSearch query logging -->
+  <!--<logger name="io.ebean.ELA" level="TRACE"/>-->
+
+</configuration>