Version 14.0.0

Bump ebean-agent to 14.0.0, no functional change
Merge pull request #3289 from FOCONIS/fix-nested-user-objects
2024-04-21 10:51:47 +00:00 · 2024-02-15 22:48:38 +13:00 · 2024-02-15 22:21:09 +13:00 · 2024-02-15 22:10:45 +13:00 · 2024-02-15 22:09:16 +13:00 · 2024-02-15 22:09:03 +13:00
118 changed files with 813 additions and 1751 deletions
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [21]
+        java_version: [11]
        os: [ubuntu-latest]

    steps:
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean api</name>
@@ -126,53 +126,6 @@
        </excludes>
      </resource>
    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <release>11</release>
-            </configuration>
-          </execution>
-          <execution>
-            <id>compile-21</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <release>21</release>
-              <compileSourceRoots>
-                <compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
-              </compileSourceRoots>
-              <multiReleaseOutput>true</multiReleaseOutput>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-            <manifestEntries>
-              <Multi-Release>true</Multi-Release>
-            </manifestEntries>
-          </archive>
-        </configuration>
-<!--          <manifest>-->
-<!--            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
-<!--          </manifest>-->
-
-      </plugin>
-    </plugins>
  </build>

 </project>
@@ -266,55 +266,6 @@ public final class DB {
    getDefault().register(transactionCallback);
  }

-  /**
-   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
-   * <p>
-   * Commit the current transaction.
-   */
-  @Deprecated(forRemoval = true)
-  public static void commitTransaction() {
-    getDefault().commitTransaction();
-  }
-
-  /**
-   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
-   * <p>
-   * Rollback the current transaction.
-   */
-  @Deprecated(forRemoval = true)
-  public static void rollbackTransaction() {
-    getDefault().rollbackTransaction();
-  }
-
-  /**
-   * If the current transaction has already been committed do nothing otherwise
-   * rollback the transaction.
-   * <p>
-   * It is preferable to use <em>try with resources</em> rather than this.
-   * <p>
-   * Useful to put in a finally block to ensure the transaction is ended, rather
-   * than a rollbackTransaction() in each catch block.
-   * <p>
-   * Code example:
-   *
-   * <pre>{@code
-   *   DB.beginTransaction();
-   *   try {
-   *     // do some fetching and or persisting
-   *
-   *     // commit at the end
-   *     DB.commitTransaction();
-   *
-   *   } finally {
-   *     // if commit didn't occur then rollback the transaction
-   *     DB.endTransaction();
-   *   }
-   * }</pre>
-   */
-  public static void endTransaction() {
-    getDefault().endTransaction();
-  }
-
  /**
   * Mark the current transaction as rollback only.
   */
@@ -666,49 +666,6 @@ public interface Database {
   */
  void flush();

-  /**
-   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
-   * <p>
-   * Commit the current transaction.
-   */
-  @Deprecated(forRemoval = true)
-  void commitTransaction();
-
-  /**
-   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
-   * <p>
-   * Rollback the current transaction.
-   */
-  @Deprecated(forRemoval = true)
-  void rollbackTransaction();
-
-  /**
-   * If the current transaction has already been committed do nothing otherwise
-   * rollback the transaction.
-   * <p>
-   * Useful to put in a finally block to ensure the transaction is ended, rather
-   * than a rollbackTransaction() in each catch block.
-   * <p>
-   * Code example:
-   * <p>
-   * <pre>{@code
-   *
-   *   database.beginTransaction();
-   *   try {
-   *     // do some fetching and or persisting ...
-   *
-   *     // commit at the end
-   *     database.commitTransaction();
-   *
-   *   } finally {
-   *     // if commit didn't occur then rollback the transaction
-   *     database.endTransaction();
-   *   }
-   *
-   * }</pre>
-   */
-  void endTransaction();
-
  /**
   * Refresh the values of a bean.
   * <p>
@@ -141,16 +141,14 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
    }
  }

-  public BeanCollectionAdd collectionAdd() {
-    if (list == null) {
-      list = new ArrayList<>();
-    }
-    return this;
-  }
-
-  public void refresh(ModifyListenMode modifyListenMode, BeanList<E> newList) {
-    setModifyListening(modifyListenMode);
-    this.list = newList.actualList();
+  /**
+   * Set the actual underlying list.
+   * <p>
+   * This is primarily for the deferred fetching function.
+   */
+  @SuppressWarnings("unchecked")
+  public void setActualList(List<?> list) {
+    this.list = (List<E>) list;
  }

  /**
@@ -1,6 +1,9 @@
 package io.ebean.common;

-import io.ebean.bean.*;
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollectionLoader;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.ToStringBuilder;

 import java.util.*;

@@ -14,12 +17,12 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
  /**
   * The underlying map implementation.
   */
-  private LinkedHashMap<K, E> map;
+  private Map<K, E> map;

  /**
   * Create with a given Map.
   */
-  public BeanMap(LinkedHashMap<K, E> map) {
+  public BeanMap(Map<K, E> map) {
    this.map = map;
  }

@@ -157,23 +160,18 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
    }
  }

-  public LinkedHashMap<K, E> collectionAdd() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    return map;
-  }
-
+  /**
+   * Set the actual underlying map. Used for performing lazy fetch.
+   */
  @SuppressWarnings("unchecked")
-  public void refresh(ModifyListenMode modifyListenMode, BeanMap<?, ?> newMap) {
-    setModifyListening(modifyListenMode);
-    this.map = (LinkedHashMap<K, E>) newMap.actualMap();
+  public void setActualMap(Map<?, ?> map) {
+    this.map = (Map<K, E>) map;
  }

  /**
   * Return the actual underlying map.
   */
-  public LinkedHashMap<K, E> actualMap() {
+  public Map<K, E> actualMap() {
    return map;
  }

@@ -3,7 +3,10 @@ package io.ebean.common;
 import io.ebean.bean.*;

 import java.io.Serializable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;

 /**
 * Set capable of lazy loading and modification aware.
@@ -15,12 +18,12 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
  /**
   * The underlying Set implementation.
   */
-  private LinkedHashSet<E> set;
+  private Set<E> set;

  /**
   * Create with a specific Set implementation.
   */
-  public BeanSet(LinkedHashSet<E> set) {
+  public BeanSet(Set<E> set) {
    this.set = set;
  }

@@ -141,22 +144,18 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
    }
  }

-  public BeanCollectionAdd collectionAdd() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    return this;
-  }
-
-  public void refresh(ModifyListenMode modifyListenMode, BeanSet<E> newSet) {
-    setModifyListening(modifyListenMode);
-    this.set = newSet.actualSet();
+  /**
+   * Set the underlying set (used for lazy fetch).
+   */
+  @SuppressWarnings("unchecked")
+  public void setActualSet(Set<?> set) {
+    this.set = (Set<E>) set;
  }

  /**
   * Return the actual underlying set.
   */
-  public LinkedHashSet<E> actualSet() {
+  public Set<E> actualSet() {
    return set;
  }

@@ -236,7 +236,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private PersistBatch persistBatchOnCascade = PersistBatch.INHERIT;

-  private int persistBatchSize = 20;
+  private int persistBatchSize = 100;

  private EnumType defaultEnumType = EnumType.ORDINAL;

@@ -1,450 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.BeanCollection;
-import io.ebean.bean.BeanCollectionLoader;
-import io.ebean.bean.EntityBean;
-import io.ebean.bean.ToStringBuilder;
-
-import java.util.*;
-
-/**
- * Map capable of lazy loading and modification aware.
- */
-public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements SequencedMap<K, E> {
-
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The underlying map implementation.
-   */
-  private LinkedHashMap<K, E> map;
-
-  /**
-   * Create with a given Map.
-   */
-  public BeanMap(LinkedHashMap<K, E> map) {
-    this.map = map;
-  }
-
-  /**
-   * Create using a underlying LinkedHashMap.
-   */
-  public BeanMap() {
-    this(new LinkedHashMap<>());
-  }
-
-  public BeanMap(BeanCollectionLoader ebeanServer, EntityBean ownerBean, String propertyName) {
-    super(ebeanServer, ownerBean, propertyName);
-  }
-
-  @Override
-  public void toString(ToStringBuilder builder) {
-    if (map == null || map.isEmpty()) {
-      builder.addRaw("{}");
-    } else {
-      builder.addRaw("{");
-      for (Entry<K, E> entry : map.entrySet()) {
-        builder.add(String.valueOf(entry.getKey()), entry.getValue());
-      }
-      builder.addRaw("}");
-    }
-  }
-
-  @Override
-  public void reset(EntityBean ownerBean, String propertyName) {
-    this.ownerBean = ownerBean;
-    this.propertyName = propertyName;
-    this.map = null;
-  }
-
-  @Override
-  public boolean isSkipSave() {
-    return map == null || (map.isEmpty() && !holdsModifications());
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void loadFrom(BeanCollection<?> other) {
-    BeanMap<K, E> otherMap = (BeanMap<K, E>) other;
-    internalPutNull();
-    map.putAll(otherMap.actualMap());
-  }
-
-  public void internalPutNull() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void internalPut(Object key, Object bean) {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    if (key != null) {
-      map.put((K) key, (E) bean);
-    }
-  }
-
-  public void internalPutWithCheck(Object key, Object bean) {
-    if (map == null || key == null || !map.containsKey(key)) {
-      internalPut(key, bean);
-    }
-  }
-
-  @Override
-  public void internalAddWithCheck(Object bean) {
-    throw new RuntimeException("Not allowed for map");
-  }
-
-  @Override
-  public void internalAdd(Object bean) {
-    throw new RuntimeException("Not allowed for map");
-  }
-
-  /**
-   * Return true if the underlying map has been populated. Returns false if it
-   * has a deferred fetch pending.
-   */
-  @Override
-  public boolean isPopulated() {
-    return map != null;
-  }
-
-  /**
-   * Return true if this is a reference (lazy loading) bean collection. This is
-   * the same as !isPopulated();
-   */
-  @Override
-  public boolean isReference() {
-    return map == null;
-  }
-
-  @Override
-  public boolean checkEmptyLazyLoad() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  private void initClear() {
-    lock.lock();
-    try {
-      if (map == null) {
-        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
-        } else {
-          map = new LinkedHashMap<>();
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private void init() {
-    lock.lock();
-    try {
-      if (map == null) {
-        if (disableLazyLoad) {
-          map = new LinkedHashMap<>();
-        } else {
-          lazyLoadCollection(false);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  public LinkedHashMap<K, E> collectionAdd() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    return map;
-  }
-
-  @SuppressWarnings("unchecked")
-  public void refresh(ModifyListenMode modifyListenMode, BeanMap<?, ?> newMap) {
-    setModifyListening(modifyListenMode);
-    this.map = (LinkedHashMap<K, E>) newMap.actualMap();
-  }
-
-  /**
-   * Return the actual underlying map.
-   */
-  public LinkedHashMap<K, E> actualMap() {
-    return map;
-  }
-
-  /**
-   * Returns the collection of beans (map values).
-   */
-  @Override
-  public Collection<E> actualDetails() {
-    return map.values();
-  }
-
-  /**
-   * Returns the map entrySet.
-   */
-  @Override
-  public Collection<?> actualEntries() {
-    return map.entrySet();
-  }
-
-  @Override
-  public String toString() {
-    if (map == null) {
-      return "BeanMap<deferred>";
-    } else {
-      return map.toString();
-    }
-  }
-
-  /**
-   * Equal if object is a Map and equal in a Map sense.
-   */
-  @Override
-  public boolean equals(Object object) {
-    init();
-    return map.equals(object);
-  }
-
-  @Override
-  public int hashCode() {
-    init();
-    return map.hashCode();
-  }
-
-  @Override
-  public void clear() {
-    checkReadOnly();
-    initClear();
-    if (modifyListening) {
-      // add all beans to the removal list
-      for (E bean : map.values()) {
-        modifyRemoval(bean);
-      }
-    }
-    map.clear();
-  }
-
-  @Override
-  public boolean containsKey(Object key) {
-    init();
-    return map.containsKey(key);
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    init();
-    return map.containsValue(value);
-  }
-
-  @Override
-  public Set<Entry<K, E>> entrySet() {
-    init();
-    if (readOnly) {
-      return Collections.unmodifiableSet(map.entrySet());
-    }
-    return modifyListening ? new ModifyEntrySet<>(this, map.entrySet()) : map.entrySet();
-  }
-
-  @Override
-  public E get(Object key) {
-    init();
-    return map.get(key);
-  }
-
-  @Override
-  public boolean isEmpty() {
-    init();
-    return map.isEmpty();
-  }
-
-  @Override
-  public Set<K> keySet() {
-    init();
-    if (readOnly) {
-      return Collections.unmodifiableSet(map.keySet());
-    }
-    return modifyListening ? new ModifyKeySet<>(this, map.keySet()) : map.keySet();
-  }
-
-  @Override
-  public E put(K key, E value) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      E oldBean = map.put(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.put(key, value);
-    }
-  }
-
-  @Override
-  public void putAll(Map<? extends K, ? extends E> puts) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      for (Entry<? extends K, ? extends E> entry : puts.entrySet()) {
-        Object oldBean = map.put(entry.getKey(), entry.getValue());
-        if (entry.getValue() != oldBean) {
-          modifyAddition(entry.getValue());
-          modifyRemoval(oldBean);
-        }
-      }
-    } else {
-      map.putAll(puts);
-    }
-  }
-
-  @Override
-  public void addBean(E bean) {
-    throw new IllegalStateException("Method not allowed on Map. Please use List instead.");
-  }
-
-  @Override
-  public void removeBean(E bean) {
-    throw new IllegalStateException("Method not allowed on Map. Please use List instead.");
-  }
-
-  @Override
-  public E remove(Object key) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      E o = map.remove(key);
-      modifyRemoval(o);
-      return o;
-    }
-    return map.remove(key);
-  }
-
-  @Override
-  public int size() {
-    init();
-    return map.size();
-  }
-
-  @Override
-  public Collection<E> values() {
-    init();
-    if (readOnly) {
-      return Collections.unmodifiableCollection(map.values());
-    }
-    return modifyListening ? new ModifyCollection<>(this, map.values()) : map.values();
-  }
-
-  @Override
-  public BeanCollection<E> shallowCopy() {
-    BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
-    copy.setFromOriginal(this);
-    return copy;
-  }
-
-  @Override
-  public SequencedMap<K, E> reversed() {
-    init();
-    if (modifyListening) {
-      throw new UnsupportedOperationException("Not supported on modify listening map");
-    }
-    return map.reversed();
-  }
-
-  @Override
-  public Entry<K, E> firstEntry() {
-    init();
-    return map.firstEntry();
-  }
-
-  @Override
-  public Entry<K, E> lastEntry() {
-    init();
-    return map.lastEntry();
-  }
-
-  @Override
-  public Entry<K, E> pollFirstEntry() {
-    checkReadOnly();
-    init();
-    var entry = map.pollFirstEntry();
-    if (modifyListening && entry != null) {
-        modifyRemoval(entry.getValue());
-    }
-    return entry;
-  }
-
-  @Override
-  public Entry<K, E> pollLastEntry() {
-    checkReadOnly();
-    init();
-    var entry = map.pollLastEntry();
-    if (modifyListening && entry != null) {
-      modifyRemoval(entry.getValue());
-    }
-    return entry;
-  }
-
-  @Override
-  public E putFirst(K key, E value) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      E oldBean = map.putFirst(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.putFirst(key, value);
-    }
-  }
-
-  @Override
-  public E putLast(K key, E value) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      E oldBean = map.putLast(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.putLast(key, value);
-    }
-  }
-
-  @Override
-  public SequencedSet<K> sequencedKeySet() {
-    init();
-    return map.sequencedKeySet();
-  }
-
-  @Override
-  public SequencedCollection<E> sequencedValues() {
-    init();
-    return map.sequencedValues();
-  }
-
-  @Override
-  public SequencedSet<Entry<K, E>> sequencedEntrySet() {
-    init();
-    return map.sequencedEntrySet();
-  }
-}
@@ -1,460 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.*;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.SequencedSet;
-
-/**
- * Set capable of lazy loading and modification aware.
- */
-public final class BeanSet<E> extends AbstractBeanCollection<E> implements SequencedSet<E>, BeanCollectionAdd {
-
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The underlying Set implementation.
-   */
-  private LinkedHashSet<E> set;
-
-  /**
-   * Create with a specific Set implementation.
-   */
-  public BeanSet(LinkedHashSet<E> set) {
-    this.set = set;
-  }
-
-  /**
-   * Create using an underlying LinkedHashSet.
-   */
-  public BeanSet() {
-    this(new LinkedHashSet<>());
-  }
-
-  public BeanSet(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) {
-    super(loader, ownerBean, propertyName);
-  }
-
-  @Override
-  public void toString(ToStringBuilder builder) {
-    builder.addCollection(set);
-  }
-
-  @Override
-  public void reset(EntityBean ownerBean, String propertyName) {
-    this.ownerBean = ownerBean;
-    this.propertyName = propertyName;
-    this.set = null;
-  }
-
-  @Override
-  public boolean isSkipSave() {
-    return set == null || (set.isEmpty() && !holdsModifications());
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void addEntityBean(EntityBean bean) {
-    set.add((E) bean);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void loadFrom(BeanCollection<?> other) {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    set.addAll((Collection<? extends E>) other.actualDetails());
-  }
-
-  @Override
-  public void internalAddWithCheck(Object bean) {
-    // set add() already de-dups so just add it
-    internalAdd(bean);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void internalAdd(Object bean) {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    if (bean != null) {
-      set.add((E) bean);
-    }
-  }
-
-  /**
-   * Returns true if the underlying set has its data.
-   */
-  @Override
-  public boolean isPopulated() {
-    return set != null;
-  }
-
-  /**
-   * Return true if this is a reference (lazy loading) bean collection. This is
-   * the same as !isPopulated();
-   */
-  @Override
-  public boolean isReference() {
-    return set == null;
-  }
-
-  @Override
-  public boolean checkEmptyLazyLoad() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  private void initClear() {
-    lock.lock();
-    try {
-      if (set == null) {
-        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(false);
-        } else {
-          set = new LinkedHashSet<>();
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private void init() {
-    lock.lock();
-    try {
-      if (set == null) {
-        if (disableLazyLoad) {
-          set = new LinkedHashSet<>();
-        } else {
-          lazyLoadCollection(false);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  public BeanCollectionAdd collectionAdd() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    return this;
-  }
-
-  public void refresh(ModifyListenMode modifyListenMode, BeanSet<E> newSet) {
-    setModifyListening(modifyListenMode);
-    this.set = newSet.actualSet();
-  }
-
-  /**
-   * Return the actual underlying set.
-   */
-  public LinkedHashSet<E> actualSet() {
-    return set;
-  }
-
-  @Override
-  public Collection<E> actualDetails() {
-    return set;
-  }
-
-  @Override
-  public Collection<?> actualEntries() {
-    return set;
-  }
-
-  @Override
-  public String toString() {
-    if (set == null) {
-      return "BeanSet<deferred>";
-    } else {
-      return set.toString();
-    }
-  }
-
-  /**
-   * Equal if obj is a Set and equal in a Set sense.
-   */
-  @Override
-  public boolean equals(Object obj) {
-    init();
-    return set.equals(obj);
-  }
-
-  @Override
-  public int hashCode() {
-    init();
-    return set.hashCode();
-  }
-
-  @Override
-  public void addBean(E bean) {
-    add(bean);
-  }
-
-  @Override
-  public void removeBean(E bean) {
-    if (set.remove(bean)) {
-      getModifyHolder().modifyRemoval(bean);
-    }
-  }
-
-  // -----------------------------------------------------//
-  // proxy method for map
-  // -----------------------------------------------------//
-
-  @Override
-  public boolean add(E bean) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      if (set.add(bean)) {
-        modifyAddition(bean);
-        return true;
-      } else {
-        return false;
-      }
-    }
-    return set.add(bean);
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends E> beans) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      for (E bean : beans) {
-        if (set.add(bean)) {
-          // register the addition of the bean
-          modifyAddition(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.addAll(beans);
-  }
-
-  @Override
-  public void clear() {
-    checkReadOnly();
-    initClear();
-    if (modifyListening) {
-      for (E bean : set) {
-        modifyRemoval(bean);
-      }
-    }
-    set.clear();
-  }
-
-  @Override
-  public boolean contains(Object bean) {
-    init();
-    return set.contains(bean);
-  }
-
-  @Override
-  public boolean containsAll(Collection<?> beans) {
-    init();
-    return set.containsAll(beans);
-  }
-
-  @Override
-  public boolean isEmpty() {
-    init();
-    return set.isEmpty();
-  }
-
-  @Override
-  public Iterator<E> iterator() {
-    init();
-    if (readOnly) {
-      return new ReadOnlyIterator<>(set.iterator());
-    }
-    if (modifyListening) {
-      return new ModifyIterator<>(this, set.iterator());
-    }
-    return set.iterator();
-  }
-
-  @Override
-  public boolean remove(Object bean) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      if (set.remove(bean)) {
-        modifyRemoval(bean);
-        return true;
-      }
-      return false;
-    }
-    return set.remove(bean);
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> beans) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      for (Object bean : beans) {
-        if (set.remove(bean)) {
-          modifyRemoval(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.removeAll(beans);
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> beans) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      Iterator<?> it = set.iterator();
-      while (it.hasNext()) {
-        Object bean = it.next();
-        if (!beans.contains(bean)) {
-          // not retaining this bean so add it to the removal list
-          it.remove();
-          modifyRemoval(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.retainAll(beans);
-  }
-
-  @Override
-  public int size() {
-    init();
-    return set.size();
-  }
-
-  @Override
-  public Object[] toArray() {
-    init();
-    return set.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(T[] array) {
-    init();
-    //noinspection SuspiciousToArrayCall
-    return set.toArray(array);
-  }
-
-
-  @Override
-  public SequencedSet<E> reversed() {
-    init();
-    if (modifyListening) {
-      throw new UnsupportedOperationException("Not supported on modify listening set");
-    }
-    return set.reversed();
-  }
-
-  @Override
-  public void addFirst(E bean) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      modifyAddition(bean);
-    }
-    set.addFirst(bean);
-  }
-
-  @Override
-  public void addLast(E bean) {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      modifyAddition(bean);
-    }
-    set.addLast(bean);
-  }
-
-  @Override
-  public E getFirst() {
-    init();
-    return set.getFirst();
-  }
-
-  @Override
-  public E getLast() {
-    init();
-    return set.getLast();
-  }
-
-  @Override
-  public E removeFirst() {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      var bean = set.removeFirst();
-      modifyRemoval(bean);
-      return bean;
-    }
-    return set.removeFirst();
-  }
-
-  @Override
-  public E removeLast() {
-    checkReadOnly();
-    init();
-    if (modifyListening) {
-      var bean = set.removeLast();
-      modifyRemoval(bean);
-      return bean;
-    }
-    return set.removeLast();
-  }
-
-  private static final class ReadOnlyIterator<E> implements Iterator<E>, Serializable {
-
-    private static final long serialVersionUID = 2577697326745352605L;
-
-    private final Iterator<E> it;
-
-    ReadOnlyIterator(Iterator<E> it) {
-      this.it = it;
-    }
-
-    @Override
-    public boolean hasNext() {
-      return it.hasNext();
-    }
-
-    @Override
-    public E next() {
-      return it.next();
-    }
-
-    @Override
-    public void remove() {
-      throw new IllegalStateException("This collection is in ReadOnly mode");
-    }
-  }
-
-  @Override
-  public BeanCollection<E> shallowCopy() {
-    BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
-    copy.setFromOriginal(this);
-    return copy;
-  }
-}
@@ -136,13 +136,13 @@ class ToStringBuilderTest {
  @Test
  void beanSet_null_empty() {
    assertThat(toStringFor(new BeanSet<String>(null))).isEqualTo("[]");
-    assertThat(toStringFor(new BeanSet<String>(new LinkedHashSet<>()))).isEqualTo("[]");
+    assertThat(toStringFor(new BeanSet<String>(Collections.emptySet()))).isEqualTo("[]");
  }

  @Test
  void beanMap_null_empty() {
    assertThat(toStringFor(new BeanMap<String, String>(null))).isEqualTo("{}");
-    assertThat(toStringFor(new BeanMap<String, String>(new LinkedHashMap<>()))).isEqualTo("{}");
+    assertThat(toStringFor(new BeanMap<String, String>(Collections.emptyMap()))).isEqualTo("{}");
  }

  @Test
@@ -159,7 +159,7 @@ class ToStringBuilderTest {

  @Test
  void beanMap_some() {
-    var under = new LinkedHashMap<String, Recurse>();
+    Map<String, Recurse> under = new LinkedHashMap<>();
    under.put("a", new Recurse(1, "a"));
    under.put("b", new Recurse(2, "b"));
    BeanMap<String, Recurse> list = new BeanMap<>(under);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
@@ -155,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <!-- platforms -->
@@ -193,79 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>13.26.1-jakarta</version>
+        <version>14.0.0</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -46,7 +46,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -159,21 +159,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -3,6 +3,8 @@ package io.ebeaninternal.api;
 import io.ebean.TxScope;

 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;

 /**
 * Used internally to handle the scoping of transactions for methods.
@@ -47,6 +49,11 @@ public final class ScopeTrans {
  private boolean nestedCommit;
  private boolean nestedUseSavepoint;

+  /**
+   * The UserObjects when using in nested transactions.
+   */
+  private Map<String, Object> userObjects;
+
  public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
    this.rollbackOnChecked = rollbackOnChecked;
    this.created = created;
@@ -218,4 +225,17 @@ public final class ScopeTrans {
    return e instanceof RuntimeException || rollbackOnChecked;
  }

+  public void putUserObject(String name, Object value) {
+    if (userObjects == null) {
+      userObjects = new HashMap<>();
+    }
+    userObjects.put(name, value);
+  }
+
+  public Object getUserObject(String name) {
+    if (userObjects == null) {
+      return null;
+    }
+    return userObjects.get(name);
+  }
 }
@@ -2,7 +2,6 @@ package io.ebeaninternal.api;

 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
-
 import jakarta.persistence.PersistenceException;

 /**
@@ -173,4 +172,31 @@ public final class ScopedTransaction extends SpiTransactionProxy {
    return current.caughtThrowable(e);
  }

+  /**
+   * New user objects are always written to the current ScopeTrans.
+   */
+  @Override
+  public void putUserObject(String name, Object value) {
+    current.putUserObject(name, value);
+  }
+
+  /**
+   * Returns the userObject in the stack, Herew we search
+   * the stack and return the first found userObject
+   */
+  @Override
+  public Object getUserObject(String name) {
+    Object obj = current.getUserObject(name);
+    if (obj != null) {
+      return obj;
+    }
+    for (ScopeTrans trans : stack) {
+      obj = trans.getUserObject(name);
+      if (obj != null) {
+        return obj;
+      }
+    }
+    return transaction.getUserObject(name);
+  }
+
 }
@@ -86,6 +86,11 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiTransactionManager transactionManager();

+  /**
+   * End the current transaction if it is active.
+   */
+  void endTransaction();
+
  /**
   * Return all the descriptors.
   */
@@ -756,16 +756,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    currentTransaction().flush();
  }

-  @Override
-  public void commitTransaction() {
-    currentTransaction().commit();
-  }
-
-  @Override
-  public void rollbackTransaction() {
-    currentTransaction().rollback();
-  }
-
  @Override
  public void endTransaction() {
    Transaction transaction = transactionManager.inScope();
@@ -773,4 +773,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
  public int forwardOnlyFetchSize() {
    return queryEngine.forwardOnlyFetchSize();
  }
+
+  public void clearContext() {
+    if (!transaction.isAutoPersistUpdates()) {
+      beanDescriptor.contextClear(transaction.persistenceContext());
+    }
+  }
 }
@@ -77,10 +77,13 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
   */
  @Override
  public void postExecute() {
+    OrmUpdateType ormUpdateType = ormUpdate.ormUpdateType();
+    if (OrmUpdateType.INSERT != ormUpdateType && !transaction.isAutoPersistUpdates()) {
+      beanDescriptor.contextClear(transaction.persistenceContext());
+    }
    if (startNanos > 0) {
      persistExecute.collectOrmUpdate(label, startNanos);
    }
-    OrmUpdateType ormUpdateType = ormUpdate.ormUpdateType();
    String tableName = ormUpdate.baseTable();
    if (transaction.isLogSummary()) {
      transaction.logSummary("{0} table[{1}] rows[{2}] bind[{3}]", ormUpdateType, tableName, rowCount, bindLog);
@@ -3,10 +3,13 @@ package io.ebeaninternal.server.core;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.persist.TrimLogSql;

+import java.util.List;
+
 /**
 * Persist request specifically for CallableSql.
 */
@@ -156,6 +159,14 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   */
  @Override
  public void postExecute() {
+    if (sqlType != SqlType.SQL_INSERT && !transaction.isAutoPersistUpdates()) {
+      List<BeanDescriptor<?>> descriptors = server.descriptors(tableName);
+      if (descriptors != null) {
+        for (BeanDescriptor<?> descriptor : descriptors) {
+          descriptor.contextClear(transaction.persistenceContext());
+        }
+      }
+    }
    if (startNanos > 0) {
      persistExecute.collectSqlUpdate(label, startNanos);
    }
@@ -1,9 +1,12 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.query.CQueryCollectionAdd;

@@ -31,7 +34,7 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
   * For Map's this needs to take the mapKey.
   * </p>
   */
-  BeanCollectionAdd collectionAdd(Object bc, String mapKey);
+  BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey);

  /**
   * Create an empty collection of the correct type without a parent bean.
@@ -2056,6 +2056,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    pc.clear(rootBeanType, idValue);
  }

+  /**
+   * Clear a bean from the persistence context.
+   */
+  public void contextClear(PersistenceContext pc) {
+    pc.clear(rootBeanType);
+  }
+
  /**
   * Delete a bean from the persistence context (such that we don't fetch it in the same transaction).
   */
@@ -399,7 +399,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   * Return the BeanDescriptors mapped to the table.
   */
  public List<BeanDescriptor<?>> descriptors(String tableName) {
-    return tableToDescMap.get(tableName.toLowerCase());
+    return tableName == null ? Collections.emptyList() : tableToDescMap.get(tableName.toLowerCase());
  }

  /**
@@ -1,12 +1,16 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanList;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

@@ -19,11 +23,19 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
    super(many);
  }

+  BeanListHelp() {
+    super();
+  }
+
  @Override
-  public final BeanCollectionAdd collectionAdd(Object bc, String mapKey) {
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (bc instanceof BeanList<?>) {
      BeanList<?> bl = (BeanList<?>) bc;
-      return bl.collectionAdd();
+      if (bl.actualList() == null) {
+        bl.setActualList(new ArrayList<>());
+      }
+      return bl;
+
    } else {
      throw new RuntimeException("Unhandled type " + bc);
    }
@@ -55,20 +67,20 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
    return beanList;
  }

-  @SuppressWarnings("unchecked")
  @Override
  public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
-    BeanList<T> newBeanList = (BeanList<T>) bc;
+    BeanList<?> newBeanList = (BeanList<?>) bc;
    List<?> currentList = (List<?>) many.getValue(parentBean);
    newBeanList.setModifyListening(many.modifyListenMode());
    if (currentList == null) {
      // the currentList is null? Not really expecting this...
      many.setValue(parentBean, newBeanList);

-    } else if (currentList instanceof BeanList) {
+    } else if (currentList instanceof BeanList<?>) {
      // normally this case, replace just the underlying list
-      BeanList<T> currentBeanList = (BeanList<T>) currentList;
-      currentBeanList.refresh(many.modifyListenMode(), newBeanList);
+      BeanList<?> currentBeanList = (BeanList<?>) currentList;
+      currentBeanList.setActualList(newBeanList.actualList());
+      currentBeanList.setModifyListening(many.modifyListenMode());

    } else {
      // replace the entire list with the BeanList
@@ -1,13 +1,17 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;

@@ -33,14 +37,20 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {

  @Override
  @SuppressWarnings("unchecked")
-  public final BeanCollectionAdd collectionAdd(Object bc, String mapKey) {
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (mapKey == null) {
      mapKey = many.mapKey();
    }
    BeanProperty beanProp = targetDescriptor.beanProperty(mapKey);
    if (bc instanceof BeanMap<?, ?>) {
      BeanMap<Object, Object> bm = (BeanMap<Object, Object>) bc;
-      return new Adder(beanProp, bm.collectionAdd());
+      Map<Object, Object> actualMap = bm.actualMap();
+      if (actualMap == null) {
+        actualMap = new LinkedHashMap<>();
+        bm.setActualMap(actualMap);
+      }
+      return new Adder(beanProp, actualMap);
+
    } else {
      throw new RuntimeException("Unhandled type " + bc);
    }
@@ -116,7 +126,8 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
    } else if (current instanceof BeanMap<?, ?>) {
      // normally this case, replace just the underlying list
      BeanMap<?, ?> currentBeanMap = (BeanMap<?, ?>) current;
-      currentBeanMap.refresh(many.modifyListenMode(), newBeanMap);
+      currentBeanMap.setActualMap(newBeanMap.actualMap());
+      currentBeanMap.setModifyListening(many.modifyListenMode());

    } else {
      // replace the entire set
@@ -655,7 +655,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
  }

  private BeanCollectionAdd beanCollectionAdd(Object bc) {
-    return help.collectionAdd(bc, null);
+    return help.getBeanCollectionAdd(bc, null);
  }

  public Object parentId(EntityBean parentBean) {
@@ -1,13 +1,17 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanSet;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Set;

 /**
@@ -22,11 +26,21 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
    super(many);
  }

+  /**
+   * For a query that returns a set.
+   */
+  BeanSetHelp() {
+    super();
+  }
+
  @Override
-  public final BeanCollectionAdd collectionAdd(Object bc, String mapKey) {
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (bc instanceof BeanSet<?>) {
      BeanSet<?> beanSet = (BeanSet<?>) bc;
-      return beanSet.collectionAdd();
+      if (beanSet.actualSet() == null) {
+        beanSet.setActualSet(new LinkedHashSet<>());
+      }
+      return beanSet;
    } else {
      throw new RuntimeException("Unhandled type " + bc);
    }
@@ -58,10 +72,9 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
    return beanSet;
  }

-  @SuppressWarnings("unchecked")
  @Override
  public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
-    BeanSet<T> newBeanSet = (BeanSet<T>) bc;
+    BeanSet<?> newBeanSet = (BeanSet<?>) bc;
    Set<?> current = (Set<?>) many.getValue(parentBean);
    newBeanSet.setModifyListening(many.modifyListenMode());
    if (current == null) {
@@ -70,8 +83,9 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {

    } else if (current instanceof BeanSet<?>) {
      // normally this case, replace just the underlying list
-      BeanSet<T> currentBeanSet = (BeanSet<T>) current;
-      currentBeanSet.refresh(many.modifyListenMode(), newBeanSet);
+      BeanSet<?> currentBeanSet = (BeanSet<?>) current;
+      currentBeanSet.setActualSet(newBeanSet.actualSet());
+      currentBeanSet.setModifyListening(many.modifyListenMode());

    } else {
      // replace the entire set
@@ -4,6 +4,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.common.BeanMap;

 import java.util.LinkedHashMap;
+import java.util.Map;

 final class ElementHelpMap implements ElementHelp {

@@ -14,7 +15,7 @@ final class ElementHelpMap implements ElementHelp {

  private static class Collector implements ElementCollector {

-    private final LinkedHashMap<Object, Object> map = new LinkedHashMap<>();
+    private final Map<Object, Object> map = new LinkedHashMap<>();

    @Override
    public void addElement(Object element) {
@@ -4,6 +4,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.common.BeanSet;

 import java.util.LinkedHashSet;
+import java.util.Set;

 final class ElementHelpSet implements ElementHelp {

@@ -14,7 +15,7 @@ final class ElementHelpSet implements ElementHelp {

  private static class Collector implements ElementCollector {

-    private final LinkedHashSet<Object> set = new LinkedHashSet<>();
+    private final Set<Object> set = new LinkedHashSet<>();

    @Override
    public void addElement(Object element) {
@@ -122,7 +122,7 @@ public final class DeployCreateProperties {
      return new DeployBeanProperty(desc, propertyType, field.getGenericType());
    }
    // check for Collection type (list, set or map)
-    ManyType manyType = determineManyType.manyType(propertyType);
+    ManyType manyType = determineManyType.getManyType(propertyType);
    if (manyType != null) {
      // List, Set or Map based object
      Class<?> targetType = determineTargetType(field);
@@ -11,14 +11,14 @@ import java.util.Set;
 */
 final class DetermineManyType {

-  ManyType manyType(Class<?> type) {
+  ManyType getManyType(Class<?> type) {
    if (type.equals(List.class)) {
      return ManyType.LIST;
    }
-    if (type.equals(Set.class) || type.getCanonicalName().equals("java.util.SequencedSet")) {
+    if (type.equals(Set.class)) {
      return ManyType.SET;
    }
-    if (type.equals(Map.class) || type.getCanonicalName().equals("java.util.SequencedMap")) {
+    if (type.equals(Map.class)) {
      return ManyType.MAP;
    }
    return null;
@@ -74,6 +74,9 @@ public final class CQueryEngine {
      if (request.logSql()) {
        request.logSql("{0}; --bind({1}) --micros({2}) --rows({3})", query.generatedSql(), query.bindLog(), query.micros(), rows);
      }
+      if (rows > 0) {
+        request.clearContext();
+      }
      return rows;
    } catch (SQLException e) {
      throw translate(request, query.bindLog(), query.generatedSql(), e);
@@ -61,6 +61,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
  /**
   * Execute the update or delete statement returning the row count.
   */
+  @SuppressWarnings("resource")
  public int execute() throws SQLException {
    long startNano = System.nanoTime();
    try {
@@ -109,6 +110,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
    pstmt = null;
  }

+  @SuppressWarnings("resource")
  @Override
  public void profile() {
    transaction()
@@ -2,12 +2,13 @@ package io.ebeaninternal.server.util;

 import java.util.ArrayList;
 import java.util.EmptyStackException;
+import java.util.Iterator;
 import java.util.List;

 /**
 * Stack based on ArrayList.
 */
-public class ArrayStack<E> {
+public class ArrayStack<E> implements Iterable<E> {

  private final List<E> list;

@@ -89,4 +90,9 @@ public class ArrayStack<E> {
  public boolean contains(E o) {
    return list.contains(o);
  }
+
+  @Override
+  public Iterator<E> iterator() {
+    return list.iterator();
+  }
 }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -63,14 +63,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -84,7 +84,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -57,7 +57,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -77,7 +77,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean test</name>
@@ -33,20 +33,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -149,14 +149,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -1,5 +1,6 @@
 package io.ebean.xtest.base;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.AfterEach;
@@ -18,15 +19,17 @@ import org.tests.model.basic.ResetBasicData;
 */
 public abstract class TransactionalTestCase extends BaseTestCase {

+  private Transaction transaction;
+
  @BeforeEach
  public void startTransaction() {
    ResetBasicData.reset();
-    DB.beginTransaction();
+    transaction = DB.beginTransaction();
  }

  @AfterEach
  public void endTransaction() {
-    DB.rollbackTransaction();
-    DB.endTransaction();
+    transaction.rollback();
+    transaction.end();
  }
 }
@@ -578,14 +578,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
  public void flush() {
  }

-  @Override
-  public void commitTransaction() {
-  }
-
-  @Override
-  public void rollbackTransaction() {
-  }
-
  @Override
  public void endTransaction() {
  }
@@ -222,21 +222,6 @@ public class TDSpiServer implements SpiServer {

  }

-  @Override
-  public void commitTransaction() {
-
-  }
-
-  @Override
-  public void rollbackTransaction() {
-
-  }
-
-  @Override
-  public void endTransaction() {
-
-  }
-
  @Override
  public void refresh(Object bean) {

@@ -79,9 +79,7 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
  @ForPlatform({Platform.H2})
  @Test
  public void end_withoutActiveTransaction_isFine() {
-
    assertNull(DB.currentTransaction());
-    DB.endTransaction();
  }

  @ForPlatform({Platform.H2})
@@ -1,5 +1,6 @@
 package org.tests.basic;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
@@ -36,13 +37,11 @@ public class TestDynamicUpdate extends BaseTestCase {

    server.save(b2);

-    server.beginTransaction();
-    try {
+    try (Transaction txn = server.beginTransaction()) {
      EMain b3 = server.find(EMain.class, b.getId());
      assertEquals("ABC", b3.getEmbeddable().getDescription());
-    } finally {
-      server.endTransaction();
    }
+
    EMain b4 = server.find(EMain.class, b.getId());
    b4.setName("bbb");
    b4.getEmbeddable().setDescription("123");
@@ -1,5 +1,6 @@
 package org.tests.basic;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -17,8 +18,7 @@ public class TestInheritRef extends BaseTestCase {
  @Test
  public void testAssocOne() {

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      DB.createUpdate(Vehicle.class, "delete from vehicle");

      Car c = new Car();
@@ -52,9 +52,6 @@ public class TestInheritRef extends BaseTestCase {

      assertEquals(1, found);
      assertTrue(foundTruck.getCapacity() == 20D);
-
-    } finally {
-      DB.rollbackTransaction();
    }
  }
 }
@@ -47,10 +47,9 @@ public class TestPersistenceContext extends BaseTestCase {
    // implicit transaction with its own persistence context
    Order oBefore = DB.find(Order.class, 1);
    // start a persistence context
-    DB.beginTransaction();

    Order order;
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      order = DB.find(Order.class, 1);
      // not the same instance ...as a different persistence context
      assertNotSame(order, oBefore);
@@ -63,9 +62,6 @@ public class TestPersistenceContext extends BaseTestCase {
      // all the same instance
      assertSame(order, o2);
      assertSame(order, o3);
-
-    } finally {
-      DB.endTransaction();
    }

    // implicit transaction with its own persistence context
@@ -74,8 +70,7 @@ public class TestPersistenceContext extends BaseTestCase {
    assertNotSame(oAfter, order);

    // start a persistence context
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
      Integer id = testOrder.getCustomer().getId();
      Integer orderId = testOrder.getId();
@@ -94,9 +89,6 @@ public class TestPersistenceContext extends BaseTestCase {

      assertEquals(customer.getId(), customer2.getId());
      assertSame(customer, customer2);
-
-    } finally {
-      DB.endTransaction();
    }
  }

@@ -1,5 +1,6 @@
 package org.tests.cache;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -26,8 +27,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
    order.setCustomer(customer);
    DB.save(order);

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {

      Order foundOrder = DB.find(Order.class)
        .where().eq("id", order.getId())
@@ -47,9 +47,6 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {

      assertSame(foundOrder, order1);
      assertTrue(DB.beanState(foundOrder).isDirty());
-
-    } finally {
-      DB.endTransaction();
    }

    // cleanup
@@ -1,6 +1,7 @@
 package org.tests.genkey;

 import io.ebean.DB;
+import io.ebean.Transaction;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TOne;

@@ -19,12 +20,10 @@ public class TestGeneratedKeys {
    c1.setName("Two");
    c1.setDescription("Test Gen Key Two");

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      DB.save(c);
      DB.save(c1);
-    } finally {
-      DB.commitTransaction();
+      txn.commit();
    }
    Integer id = c.getId();
    assertNotNull(id);
@@ -1,9 +1,6 @@
 package org.tests.insert;

-import io.ebean.DB;
-import io.ebean.Database;
-import io.ebean.InsertOptions;
-import io.ebean.Transaction;
+import io.ebean.*;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import io.ebean.xtest.BaseTestCase;
@@ -11,6 +8,10 @@ import io.ebean.xtest.ForPlatform;
 import org.junit.jupiter.api.Test;
 import org.tests.update.EPersonOnline;

+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;

 import static io.ebean.InsertOptions.ON_CONFLICT_NOTHING;
@@ -288,6 +289,119 @@ class TestInsertOnConflict extends BaseTestCase {
    assertThat(list.get(0).getWhenUpdated()).isEqualTo(bean.getWhenUpdated());
  }

+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void updateQueryReturning() throws SQLException {
+    Database db = DB.getDefault();
+    db.truncate(EPersonOnline.class);
+
+    var bean1 = newBean("a1@bee.com");
+    var bean2 = newBean("a2@cee.com");
+    var bean3 = newBean("a3@bee.com");
+    db.saveAll(bean1, bean2, bean3);
+
+    String sql = "update e_person_online set email = concat('x',email) where email like ? returning id, email, online_status";
+
+    try (Transaction txn = db.createTransaction()) {
+      Connection connection = txn.connection();
+      try (PreparedStatement pstmt = connection.prepareStatement(sql)) {
+        pstmt.setString(1, "%bee.com");
+        try (ResultSet resultSet = pstmt.executeQuery()) {
+          while (resultSet.next()) {
+            long id = resultSet.getLong(1);
+            String email = resultSet.getString(2);
+            boolean status = resultSet.getBoolean(3);
+            // do something with the id, email and status
+            assertThat(id).isGreaterThan(0);
+            assertThat(email).startsWith("x");
+            assertThat(status).isTrue();
+          }
+        }
+      }
+      txn.commit();
+    }
+
+    try (Transaction txn = db.beginTransaction()) {
+      List<SqlRow> sqlRowList = DB.sqlQuery(sql)
+        .setParameter("%bee.com")
+        .findList();
+
+      assertThat(sqlRowList).hasSize(2);
+      assertThat(sqlRowList.get(0).getString("email")).startsWith("xx");
+
+      txn.addModification("e_person_online", false, true, false);
+      txn.commit();
+    }
+
+    try (Transaction txn = db.beginTransaction()) {
+      List<ReturnDto> dtoList = db.findDto(ReturnDto.class, sql)
+        .setParameter("%bee.com")
+        .findList();
+
+      assertThat(dtoList).hasSize(2);
+      assertThat(dtoList.get(0).email).startsWith("xxx");
+
+      txn.addModification("e_person_online", false, true, false);
+      txn.commit();
+    }
+
+    try (Transaction txn = db.beginTransaction()) {
+      List<ReturnDto2> dtoList2 = db.findDto(ReturnDto2.class, sql)
+        .setParameter("%bee.com")
+        .findList();
+
+      assertThat(dtoList2).hasSize(2);
+      assertThat(dtoList2.get(0).email).startsWith("xxxx");
+      assertThat(dtoList2.get(0).id).isGreaterThan(0);
+      txn.addModification("e_person_online", false, true, false);
+      txn.commit();
+    }
+  }
+
+  public static class ReturnDto {
+
+    private final long id;
+    private final String email;
+    private final boolean onlineStatus;
+
+      public ReturnDto(long id, String email, boolean onlineStatus) {
+          this.id = id;
+          this.email = email;
+          this.onlineStatus = onlineStatus;
+      }
+  }
+
+  public static class ReturnDto2 {
+
+    private long id;
+    private String email;
+    private boolean onlineStatus;
+
+    public long getId() {
+      return id;
+    }
+
+    public void setId(long id) {
+      this.id = id;
+    }
+
+    public String getEmail() {
+      return email;
+    }
+
+    public void setEmail(String email) {
+      this.email = email;
+    }
+
+    public boolean isOnlineStatus() {
+      return onlineStatus;
+    }
+
+    public void setOnlineStatus(boolean onlineStatus) {
+      this.onlineStatus = onlineStatus;
+    }
+  }
+
  private static EPersonOnline newBean(String email) {
    EPersonOnline bean = new EPersonOnline();
    bean.setEmail(email);
@@ -35,11 +35,9 @@ public class TestPersistCascade extends BaseTestCase {
      assertThat(sql.get(23)).contains("insert into pcf_city");
      assertSqlBind(sql, 24, 26);
      assertThat(sql.get(28)).contains("insert into pcf_event");
-      assertSqlBind(sql, 29, 48);
-      assertThat(sql.get(50)).contains("insert into pcf_event");
-      assertSqlBind(sql, 51, 70);
-      assertThat(sql.get(72)).contains("insert into pcf_event");
-      assertSqlBind(sql, 73, 87);
+      assertSqlBind(sql, 29, 128);
+      assertThat(sql.get(130)).contains("insert into pcf_event");
+      assertSqlBind(sql, 131, 150);
    }

    country.deletePermanent();
@@ -1,5 +1,6 @@
 package org.tests.level.test;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -19,8 +20,7 @@ public class ManyToManyTest extends BaseTestCase {
  @Test
  public void test() {

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      Level4 i = new Level4("i");
      Level4 ii = new Level4("ii");
      Level4 iii = new Level4("iii");
@@ -92,9 +92,6 @@ public class ManyToManyTest extends BaseTestCase {
        .findList();

      validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things);
-
-    } finally {
-      DB.endTransaction();
    }
  }

@@ -54,7 +54,6 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {

  @Test
  public void testCascadeDelete2() {
-
    init();

    try (Transaction txn = DB.beginTransaction()) {
@@ -68,18 +67,14 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {

  @Test
  public void testCascadeDelete3() {
-
    init();

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      EdExtendedParent extendedParent = DB.find(EdExtendedParent.class).where()
        .eq("name", "My second computer").findOne();
      extendedParent.getChildren().size();
      DB.delete(extendedParent);
-      DB.commitTransaction();
-    } finally {
-      DB.endTransaction();
+      txn.commit();
    }
  }

@@ -49,7 +49,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
      // nothing flushed yet
      assertThat(LoggedSql.start()).isEmpty();

-      DB.commitTransaction();
+      txn.commit();

      // insert statements for EdExtendedParent
      List<String> loggedSql2 = LoggedSql.start();
@@ -44,7 +44,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
      parent.setName("MyDesk");
      DB.save(parent);

-      DB.commitTransaction();
+      txn.commit();

      // insert statements for EdExtendedParent
      List<String> loggedSql = LoggedSql.stop();
@@ -87,7 +87,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
      DB.save(parent);

      // flush
-      DB.commitTransaction();
+      txn.commit();

      // insert statements for EdExtendedParent
      List<String> loggedSql = LoggedSql.stop();
@@ -58,7 +58,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
      // insert statements for EdParent
      List<String> loggedSql1 = LoggedSql.start();

-      DB.commitTransaction();
+      txn.commit();

      assertEquals(0, loggedSql1.size());

@@ -1,5 +1,6 @@
 package org.tests.persistencecontext;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
@@ -12,12 +13,9 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase {

  @Test
  public void test() {
-
    Database server = DB.getDefault();

-    server.beginTransaction();
-    try {
-
+    try (Transaction txn = server.beginTransaction()) {
      EBasic bean1 = new EBasic();
      bean1.setName("hello");

@@ -33,11 +31,7 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase {
      EBasic loadedEntity = server.find(EBasic.class, bean1.getId());

      assertThat(loadedEntity.getName()).isEqualTo("hello-changed");
-
-    } finally {
-      server.endTransaction();
    }
-
  }

 }
@@ -1,5 +1,6 @@
 package org.tests.persistencecontext;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -7,25 +8,22 @@ import org.tests.model.basic.EBasicVer;

 import static io.ebean.PersistenceContextScope.QUERY;
 import static io.ebean.PersistenceContextScope.TRANSACTION;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.*;


-public class TestPersistenceContextQueryScope extends BaseTestCase {
+class TestPersistenceContextQueryScope extends BaseTestCase {

  @Test
-  public void test() {
+  void test() {

    EBasicVer bean = new EBasicVer("first");
    DB.save(bean);

-    //DB.cacheManager().setCaching(EBasicVer.class, true);
-
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId());

      // do an update of the name in the DB
+      // With #3295 this now automatically clears the persistence context for BasicVer.class
      int rowCount = DB.sqlUpdate("update e_basicver set name=? where id=?")
        .setParameter("second")
        .setParameter(bean.getId())
@@ -33,22 +31,21 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {

      assertEquals(1, rowCount);

-      // fetch the bean again... but doesn't hit DB as it
-      // is in the PersistenceContext which is transaction scoped
+      // Prior to #3295 this returns the same bean via transaction scoped Persistence Context
+      // With #3295 this is now a fresh bean
      EBasicVer bean2 = DB.find(EBasicVer.class)
        .setId(bean.getId())
        .setUseCache(false) // ignore L2 cache
        .findOne();

      // QUERY scope hits the DB (doesn't use the existing transactions persistence context)
-      // ... also explicitly not use bean cache
      EBasicVer bean3 = DB.find(EBasicVer.class)
        .setId(bean.getId())
        .setUseCache(false) // ignore L2 cache
        .setPersistenceContextScope(QUERY)
        .findOne();

-      // TRANsACTION scope ... same as bean2 and does not hit the DB
+      // TRANSACTION scope ... same as bean2 and does not hit the DB
      EBasicVer bean5 = DB.find(EBasicVer.class)
        .setId(bean.getId())
        .setUseCache(false) // ignore L2 cache
@@ -57,18 +54,180 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {

      assertEquals("first", bean.getName());
      assertEquals("first", bean1.getName());
-      assertEquals("first", bean2.getName());
-      assertEquals("first", bean5.getName());
-      assertSame(bean1, bean2);
-      assertSame(bean1, bean5);
-
+      assertEquals("second", bean2.getName());
      assertEquals("second", bean3.getName());
+      assertEquals("second", bean5.getName());
+      assertNotSame(bean1, bean2);
+      assertNotSame(bean1, bean5);
+      assertSame(bean2, bean5);
+      assertNotSame(bean3, bean5);
+
      DB.delete(bean3);

-      DB.commitTransaction();
+      txn.commit();
+    }
+  }

-    } finally {
-      DB.endTransaction();
+  @Test
+  void ormUpdateQuery_expect_clearsContext() {
+
+    EBasicVer bean = new EBasicVer("first");
+    DB.save(bean);
+
+    try (Transaction txn = DB.beginTransaction()) {
+      EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId());
+
+      // do an update of the name in the DB
+      // With #3295 this now automatically clears the persistence context for BasicVer.class
+      int rowCount = DB.update(EBasicVer.class)
+        .set("name", "second")
+        .where().idEq(bean.getId())
+        .update();
+      assertEquals(1, rowCount);
+
+      // Prior to #3295 this returns the same bean via transaction scoped Persistence Context
+      // With #3295 this is now a fresh bean
+      EBasicVer bean2 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .findOne();
+
+      // QUERY scope hits the DB (doesn't use the existing transactions persistence context)
+      EBasicVer bean3 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(QUERY)
+        .findOne();
+
+      // TRANSACTION scope ... same as bean2 and does not hit the DB
+      EBasicVer bean5 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(TRANSACTION)
+        .findOne();
+
+      assertEquals("first", bean.getName());
+      assertEquals("first", bean1.getName());
+      assertEquals("second", bean2.getName());
+      assertEquals("second", bean3.getName());
+      assertEquals("second", bean5.getName());
+      assertNotSame(bean1, bean2);
+      assertNotSame(bean1, bean5);
+      assertSame(bean2, bean5);
+      assertNotSame(bean3, bean5);
+
+      DB.delete(bean3);
+      txn.commit();
+    }
+  }
+
+  @Test
+  void ormUpdate_expect_clearsContext() {
+
+    EBasicVer bean = new EBasicVer("first");
+    DB.save(bean);
+
+    try (Transaction txn = DB.beginTransaction()) {
+      EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId());
+
+      // do an update of the name in the DB
+      // With #3295 this now automatically clears the persistence context for BasicVer.class
+      int rowCount = DB.createUpdate(EBasicVer.class, "update ebasicver set name = ? where id = ?")
+        .setParameter(1, "second")
+        .setParameter(2, bean.getId())
+        .execute();
+      assertEquals(1, rowCount);
+
+      // fetch the bean again...
+      // Prior to #3295 this returns the same bean via transaction scoped Persistence Context
+      // With #3295 this is now a fresh bean
+      EBasicVer bean2 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .findOne();
+
+      // QUERY scope hits the DB (doesn't use the existing transactions persistence context)
+      EBasicVer bean3 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(QUERY)
+        .findOne();
+
+      // TRANSACTION scope ... same as bean2 and does not hit the DB
+      EBasicVer bean5 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(TRANSACTION)
+        .findOne();
+
+      assertEquals("first", bean.getName());
+      assertEquals("first", bean1.getName());
+      assertEquals("second", bean2.getName());
+      assertEquals("second", bean3.getName());
+      assertEquals("second", bean5.getName());
+      assertNotSame(bean1, bean2);
+      assertNotSame(bean1, bean5);
+      assertSame(bean2, bean5);
+      assertNotSame(bean3, bean5);
+
+      DB.delete(bean3);
+      txn.commit();
+    }
+  }
+
+
+  @Test
+  void ormUpdateQueryWithAutoPersist_expect_clearsContext() {
+
+    EBasicVer bean = new EBasicVer("first");
+    DB.save(bean);
+
+    try (Transaction txn = DB.beginTransaction()) {
+      txn.setAutoPersistUpdates(true);
+      EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId());
+
+      // do an update of the name in the DB
+      // With #3295 this now automatically clears the persistence context for BasicVer.class
+      int rowCount = DB.update(EBasicVer.class)
+        .set("name", "second")
+        .where().idEq(bean.getId())
+        .update();
+      assertEquals(1, rowCount);
+
+      // Prior to #3295 this returns the same bean via transaction scoped Persistence Context
+      // With #3295 this is now a fresh bean
+      EBasicVer bean2 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .findOne();
+
+      // QUERY scope hits the DB (doesn't use the existing transactions persistence context)
+      EBasicVer bean3 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(QUERY)
+        .findOne();
+
+      // TRANSACTION scope ... same as bean2 and does not hit the DB
+      EBasicVer bean5 = DB.find(EBasicVer.class)
+        .setId(bean.getId())
+        .setUseCache(false) // ignore L2 cache
+        .setPersistenceContextScope(TRANSACTION)
+        .findOne();
+
+      assertEquals("first", bean.getName());
+      assertEquals("first", bean1.getName());
+      assertEquals("first", bean2.getName()); // This is still first
+      assertEquals("second", bean3.getName());
+      assertEquals("first", bean5.getName()); // This is still first
+      assertSame(bean1, bean2); // Now the same
+      assertSame(bean1, bean5); // Now the same
+      assertSame(bean2, bean5);
+      assertNotSame(bean3, bean5);
+
+      DB.delete(bean3);
+
+      txn.commit();
    }
  }
 }
@@ -1,5 +1,6 @@
 package org.tests.query;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
@@ -50,23 +51,18 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase {

    try {
      for (int i = 0; i < 100; i++) {
-        DB.beginTransaction();
-        try {
+        try (Transaction txn = DB.beginTransaction()) {
          Query<Customer> q0 = DB.find(Customer.class).where().icontains("namexxx", "Rob")
            .query();

          q0.findList();
-          DB.commitTransaction();
+          txn.commit();
        } catch (Exception e) {
          if (e.getMessage().contains("Unsuccessfully waited")) {
            fail("No connections found while only one thread is running. (after " + i + " queries)");
          } else {
            e.printStackTrace();
          }
-        } finally {
-          if (DB.currentTransaction().isActive()) {
-            DB.rollbackTransaction();
-          }
        }
      }

@@ -219,8 +219,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
    // kinda not normal but just wrap in a transaction to assert
    // the background fetch does not occur (which explicitly creates
    // its own transaction) ... so a bit naughty with the test here
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {

      List<Order> orders = pagedList.getList();
      int totalRowCount = pagedList.getTotalCount();
@@ -238,13 +237,9 @@ public class TestQueryFindPagedList extends BaseTestCase {
      String secTxn = loggedSql.get(1).substring(0, 10);

      assertEquals(firstTxn, secTxn);
-
-    } finally {
-      DB.endTransaction();
    }
  }

-
  @Test
  public void test_usingAlias() {

@@ -84,15 +84,10 @@ public class TestCustomerFinder extends BaseTestCase {

  @Test
  public void currentTransaction() {
-
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      Transaction t1 = DB.currentTransaction();
      Transaction t2 = Customer.find.currentTransaction();
      assertThat(t2).isSameAs(t1);
-
-    } finally {
-      DB.endTransaction();
    }
  }

@@ -1,9 +1,10 @@
 package org.tests.query.joins;

-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Expr;
 import io.ebean.Query;
+import io.ebean.Transaction;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.basic.one2one.Wheel;
 import org.tests.model.basic.MRole;
@@ -18,8 +19,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
  @Test
  public void test() {

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {

      MRole r1 = new MRole();
      r1.setRoleName("role1B");
@@ -63,8 +63,6 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
      assertSqlOuterJoins(sql);
      assertThat(sql).contains(".role_name = ?");

-    } finally {
-      DB.rollbackTransaction();
    }
  }

@@ -76,7 +74,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
      .eq("roles.roleid", roleid)
      .endOr().query();

-      query.findList();
+    query.findList();

    String sql = sqlOf(query);
    assertSqlOuterJoins(sql);
@@ -85,19 +83,16 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {

  @Test
  public void testSelectOneToOneDisjunction() {
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      Query<Wheel> query = DB.find(Wheel.class)
-              .select("id")
-              .where().or()
-              .ge("tire.id", 100)
-              .lt("tire.id", 100)
-              .endOr().query();
+        .select("id")
+        .where().or()
+        .ge("tire.id", 100)
+        .lt("tire.id", 100)
+        .endOr().query();
      query.findList();
      String sql = sqlOf(query);
      assertThat(sql).contains("join");
-    } finally {
-      DB.rollbackTransaction();
    }
  }

@@ -1,5 +1,6 @@
 package org.tests.query.other;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -44,8 +45,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {


    // start transaction to keep PC going to lazy query
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      DB.find(Order.class, 1);

      SpiQuery<?> query0 = (SpiQuery<?>) DB.find(OrderDetail.class);
@@ -57,9 +57,6 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {
      query0.findList();
      assertThat(query0.getGeneratedSql()).contains(" from o_order_detail t0 where (t0.order_id) ");
      platformAssertIn(query0.getGeneratedSql(), "where (t0.order_id)");
-
-    } finally {
-      DB.endTransaction();
    }

    List<OrderDetail> details = DB.find(OrderDetail.class)
@@ -62,8 +62,7 @@ public class TestBatchPersistCascade extends BaseTestCase {

    List<UTMaster> list = server.find(UTMaster.class).fetch("details").findList();

-    Transaction txn = server.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      txn.setBatchMode(true);
      txn.setBatchOnCascade(true);

@@ -103,11 +102,8 @@ public class TestBatchPersistCascade extends BaseTestCase {

      logger.info("commit ------------ ");

-      server.commitTransaction();
-    } finally {
-      server.endTransaction();
+      txn.commit();
    }
-
  }

  private UTDetail createUTDetail(String master, int count) {
@@ -1,5 +1,6 @@
 package org.tests.transaction;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiTransaction;
@@ -19,9 +20,8 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase {
    EBasicVer bean = new EBasicVer("Please Delete Me");
    DB.save(bean);

-    SpiTransaction transaction = (SpiTransaction) DB.beginTransaction();
-    try {
-
+    try (Transaction txn = DB.beginTransaction()) {
+      SpiTransaction spiTransaction = (SpiTransaction)txn;
      EBasicVer bean2 = DB.find(EBasicVer.class, bean.getId());
      assertNotSame(bean, bean2);

@@ -29,18 +29,15 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase {
      // same instance from PersistenceContext
      assertSame(bean2, bean3);

-      Object bean4 = transaction.persistenceContext().get(EBasicVer.class, bean.getId());
+      Object bean4 = spiTransaction.persistenceContext().get(EBasicVer.class, bean.getId());
      assertSame(bean2, bean4);

      DB.delete(bean2);

-      Object bean5 = transaction.persistenceContext().get(EBasicVer.class, bean.getId());
+      Object bean5 = spiTransaction.persistenceContext().get(EBasicVer.class, bean.getId());
      assertNull(bean5);

-      DB.commitTransaction();
-
-    } finally {
-      DB.endTransaction();
+      txn.commit();
    }

    EBasicVer bean6 = DB.find(EBasicVer.class).where().eq("id", bean.getId()).findOne();
@@ -1,11 +1,14 @@
 package org.tests.transaction;

-import io.ebean.*;
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.xtest.ForPlatform;
+import io.ebean.DB;
+import io.ebean.DataIntegrityException;
+import io.ebean.Transaction;
+import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebeaninternal.api.SpiTransaction;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
@@ -43,7 +46,7 @@ public class TestExecuteComplete extends BaseTestCase {

    try {
      DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () ->
-      DB.execute(() -> {
+        DB.execute(() -> {

          Customer customer = DB.reference(Customer.class, 42424242L);
          Order order = new Order();
@@ -158,4 +161,26 @@ public class TestExecuteComplete extends BaseTestCase {
    assertThat(getInScopeTransaction()).isNull();
  }

+  @ForPlatform(Platform.H2)
+  @Test
+  public void test_nested_userobjects() {
+
+    try (Transaction txn1 = DB.beginTransaction()) {
+      assertThat(getInScopeTransaction()).isNotNull();
+      getInScopeTransaction().putUserObject("foo", "bar");
+
+      try (Transaction txn2 = DB.beginTransaction()) {
+        assertThat(getInScopeTransaction().getUserObject("foo")).isEqualTo("bar");
+        getInScopeTransaction().putUserObject("foo", "xxx");
+        getInScopeTransaction().putUserObject("test", "xxx");
+        assertThat(getInScopeTransaction().getUserObject("foo")).isEqualTo("xxx");
+        txn2.commit();
+      }
+      // CHECKME: What would we expect here? I would expect "bar" but get "xxx"
+      // NOTE: with TxScope.requiresNew() - I'll get "bar"
+      assertThat(getInScopeTransaction().getUserObject("test")).isNull();
+      assertThat(getInScopeTransaction().getUserObject("foo")).isEqualTo("bar");
+    }
+  }
+
 }
@@ -37,8 +37,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
      try (Transaction txn1 = server.beginTransaction()) {
        bean.setName("x2");
        server.save(bean);
-        //txn1.commit();
-        server.commitTransaction();
+        txn1.commit();
      }

      EBasic fresh = server.find(EBasic.class, bean.getId());
@@ -48,8 +47,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
      try (Transaction txn2 = server.beginTransaction()) {
        bean.setName("barney");
        DB.save(bean);
-        //txn2.commit();
-        server.commitTransaction();
+        txn2.commit();
      }

      fresh = server.find(EBasic.class)
@@ -1,5 +1,6 @@
 package org.tests.transaction;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -12,10 +13,7 @@ public class TestStatelessUpdateClearPC extends BaseTestCase {

  @Test
  public void test() {
-
-
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      EBasic newUser = new EBasic();
      newUser.setName("any@email.com");
      DB.save(newUser);
@@ -32,8 +30,6 @@ public class TestStatelessUpdateClearPC extends BaseTestCase {

      EBasic loadedUser = DB.find(EBasic.class, newUser.getId());
      assertEquals("anyNew@email.com", loadedUser.getName());
-    } finally {
-      DB.rollbackTransaction();
    }
  }
 }
@@ -31,11 +31,8 @@ public class TestTransactionCallback extends BaseTestCase {
    assertEquals(0, countPreRollback);
    assertEquals(0, countPostRollback);

-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      DB.register(new MyCallback());
-    } finally {
-      DB.rollbackTransaction();
    }

    assertEquals(1, countPreCommit);
@@ -32,8 +32,7 @@ public class TestTransactionalNotSupports extends BaseTestCase {
  public void withOuterTransaction_expect_currentTransaction_null_and_originalTxnRestored() {

    outerTxn = null;
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      currentTxn = DB.currentTransaction();
      assertNotNull(currentTxn);
      new SomeTransactionalWithNotSupported().doStuff();
@@ -44,8 +43,6 @@ public class TestTransactionalNotSupports extends BaseTestCase {
      // the original transaction was restored
      Transaction restored = DB.currentTransaction();
      assertSame(currentTxn, restored);
-    } finally {
-      DB.endTransaction();
    }
  }

@@ -40,8 +40,7 @@ public class TestTransactionalRequired extends BaseTestCase {
  public void withOuterBegin() {

    outerTxn = null;
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      currentTxn = DB.currentTransaction();
      assertNotNull(currentTxn);
      new OuterTransactionalWithRequired().doOuter();
@@ -51,8 +50,6 @@ public class TestTransactionalRequired extends BaseTestCase {
      assertSame(currentTxn, restored);
      assertSame(currentTxn, innerTxn);
      assertSame(currentTxn, outerTxn);
-    } finally {
-      DB.endTransaction();
    }

    assertNull(DB.currentTransaction());
@@ -68,11 +68,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
    Database server = server();
    try(Transaction txn = server.beginTransaction()) {
      String txnName = txn.toString();
-      DB.beginTransaction(TxScope.requiresNew());
-      try {
-        DB.commitTransaction();
-      } finally {
-        DB.endTransaction();
+      try (Transaction txn2 = DB.beginTransaction(TxScope.requiresNew())) {
+        txn2.commit();
      }
      assertThat(txn.toString()).isEqualTo(txnName);
    }
@@ -83,11 +80,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
    Database server = server();
    try (Transaction txn = server.beginTransaction()) {
      String txnName = txn.toString();
-      server.beginTransaction(TxScope.requiresNew());
-      try {
-        server.commitTransaction();
-      } finally {
-        server.endTransaction();
+      try (Transaction txn2 = server.beginTransaction(TxScope.requiresNew())) {
+        txn2.commit();
      }
      assertThat(txn.toString()).isEqualTo(txnName);
    }
@@ -98,11 +92,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
    Database server = server();
    try (Transaction txn = server.beginTransaction()) {
      String txnName = txn.toString();
-      Transaction txn2 = DB.beginTransaction(TxScope.requiresNew());
-      try {
+      try (Transaction txn2 = DB.beginTransaction(TxScope.requiresNew())) {
        txn2.commit();
-      } finally {
-        txn2.end();
      }
      assertThat(txn.toString()).isEqualTo(txnName);
    }
@@ -33,12 +33,9 @@ public class TestTransactionalSupports extends BaseTestCase {
  public void withOuterTransaction_expect_currentTransactionAvailable() {

    outerTxn = null;
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      new SomeTransactionalWithSupports().doStuff();
      assertNotNull(outerTxn);
-    } finally {
-      DB.endTransaction();
    }
  }

@@ -177,9 +177,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
    assertEquals("foo3", log4.getDescription());
    assertEquals("mod1", log4.getModifiedDescription());

-
-    DB.beginTransaction();
-    try {
+    try (Transaction txn = DB.beginTransaction()) {
      SqlUpdate update = DB.sqlUpdate(updateDml);
      update.setParameter("desc", "foo4");
      update.setParameter("id", id);
@@ -189,9 +187,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
      updateMod.setParameter("desc", "mod2");
      updateMod.execute();

-      DB.commitTransaction();
-    } finally {
-      DB.endTransaction();
+      txn.commit();
    }
    AuditLog log5 = DB.find(AuditLog.class, log.getId());
    assertEquals("foo4", log5.getDescription());
@@ -71,18 +71,18 @@ datasource.db.password=
 datasource.db.databaseUrl=jdbc:h2:file:~/tests
 datasource.db.databaseDriver=org.h2.Driver

-datasource.h2.username=sa
-datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=KEY,VALUE
-datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
-#datasource.h2.minConnections=1
-#datasource.h2.maxConnections=25
-#datasource.h2.capturestacktrace=true
-#datasource.h2.maxStackTraceSize=20
-#datasource.h2.driver=org.h2.Driver
-#datasource.h2.heartbeatsql=select 1
-#datasource.h2.isolationlevel=read_committed
-#datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle;
+datasource.db.username=sa
+datasource.db.password=
+datasource.db.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=KEY,VALUE
+datasource.db.poolListener=org.tests.basic.MyTestDataSourcePoolListener
+#datasource.db.minConnections=1
+#datasource.db.maxConnections=25
+#datasource.db.capturestacktrace=true
+#datasource.db.maxStackTraceSize=20
+#datasource.db.driver=org.h2.Driver
+#datasource.db.heartbeatsql=select 1
+#datasource.db.isolationlevel=read_committed
+#datasource.db.customProperties=IGNORECASE=TRUE;MODE=Oracle;


 datasource.h2multitenant.username=sa
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -56,14 +56,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,67 +15,67 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.26.1-jakarta</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.26.1-jakarta</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	6b2cdc14aa	Version 14.0.0	2024-02-15 22:48:38 +13:00
Rob Bygrave	6d712a92a0	Bump ebean-agent to 14.0.0, no functional change	2024-02-15 22:21:09 +13:00
Rob BygraveandGitHub	ea11b0c3b6	Merge pull request #3289 from FOCONIS/fix-nested-user-objects Change semantic of userObjects in nested transaction	2024-02-15 22:10:45 +13:00
Rob BygraveandGitHub	08e8402d05	Merge pull request #3301 from ebean-orm/feature/3295-PC-clear-on-bulk-update #3295 Clear PersistenceContext on execution of bulk updates or deletes	2024-02-15 22:09:16 +13:00
Rob BygraveandGitHub	006ad79379	Merge branch 'master' into feature/3295-PC-clear-on-bulk-update	2024-02-15 22:09:03 +13:00
Rob BygraveandGitHub	0e063549cd	Merge pull request #3327 from ebean-orm/feature/remove-deprecated-commitTransaction Remove deprecated database.commitTransaction(), migrate to transaction.commit()	2024-02-15 22:07:32 +13:00
Rob BygraveandGitHub	4f0d2cabfb	Merge pull request #3325 from ebean-orm/feature/default-batchSize-100 Change default persistBatchSize from 20 to 100 (as a better default value)	2024-02-15 22:07:14 +13:00
Rob Bygrave	80b2d9f983	Remove deprecated database.commitTransaction(), migrate to transaction.commit() Remove the deprecated methods: - DB.commitTransaction() - DB.rollbackTransaction() - DB.endTransaction() - database.commitTransaction() - database.rollbackTransaction() - database.endTransaction() Migrate to using try-with-resources and transaction.commit(), transaction.rollback()	2024-02-15 21:56:57 +13:00
Rob Bygrave	287d0c467d	#3326 Update the test example of Postgres DML with RETURNING clause to use explicit transactions and transaction.addModification()	2024-02-11 14:25:01 +13:00
Rob Bygrave	a8835379e7	#3326 Add test as example of Postgres DML with RETURNING clause	2024-02-11 13:18:19 +13:00
Rob Bygrave	e4df20b9dc	Update test TestPersistCascade with default batch size 100	2024-02-10 13:28:04 +13:00
Rob Bygrave	e6e53e0d93	Change default persistBatchSize from 20 to 100 (as a better default value) This is the batch size used with PreparedStatement executeBatch() with batched inserts, updates and deletes. 20 is really on the low side and bumping this default to 100 seems good and right.	2024-02-10 12:15:50 +13:00
Rob Bygrave	6645e5b9ec	Update the test comments in TestPersistenceContextQueryScope To reflect the behaviour with #3295	2024-01-19 08:58:19 +13:00
Rob Bygrave	3576aafffc	#3295 When isAutoPersistUpdates is used do NOT clear the PersistenceContext Also make improvements to the test asserts in TestPersistenceContextQueryScope	2024-01-10 23:23:47 +13:00
Rob Bygrave	66234249c6	#3295 Clear PersistenceContext on execution of bulk updates or deletes Using SqlUpdate or an ORM Update query clear the appropriate part of the PersistenceContext. The effect is that ORM queries executed after a bulk update will effectively load a fresh copy of the data from the database and will not reuse an instance from the persistence context if the bean in question had already been loaded.	2024-01-09 07:44:27 +13:00
Roland Praml	6f64821584	Change semantic of userObjects in nested transaction	2023-12-08 14:50:30 +01:00