Merge branch 'master' into feature/sequencedSet

Build needs to use Java 21 to support the multi-release jar
Refactor rename method getBeanCollectionAdd() -> collectionAdd()
2024-04-21 10:51:47 +00:00 · 2024-02-10 14:13:21 +13:00 · 2024-02-10 13:29:40 +13:00 · 2024-01-12 16:42:58 +13:00 · 2024-01-12 16:41:32 +13:00 · 2024-01-12 16:14:08 +13:00
614 changed files with 30622 additions and 4980 deletions
@@ -1,10 +1,7 @@

 name: Build

-on:
-  pull_request:
-  push:
-    branches: master
+on: [push, pull_request]

 jobs:
  build:
@@ -16,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [11]
+        java_version: [21]
        os: [ubuntu-latest]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@

  <properties>
    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
+    <postgres.jdbc.version>42.6.0</postgres.jdbc.version>
  </properties>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.1.0</version>
+      <version>13.26.1-jakarta</version>
    </dependency>

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

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

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

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

  <name>ebean api</name>
@@ -39,7 +39,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>3.12</version>
+      <version>3.10</version>
    </dependency>

    <dependency>
@@ -126,6 +126,53 @@
        </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>
@@ -155,4 +155,10 @@ public abstract class BeanFinder<I,T> {
    return db().findNative(type, nativeSql);
  }

+  /**
+   * Creates a query using the ORM query language.
+   */
+  protected Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
 }
@@ -266,6 +266,55 @@ 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.
   */
@@ -741,6 +790,21 @@ public final class DB {
    return getDefault().createUpdate(beanType, ormUpdate);
  }

+
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  public static <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    return getDefault().createNamedQuery(beanType, namedQuery);
+  }
+
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -760,6 +824,43 @@ public final class DB {
    return getDefault().createQuery(beanType);
  }

+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   * <p>
+   * <h3>Example</h3>
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = DB.createQuery(Order.class, eql);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findOne();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param eql      The Ebean query
+   * @param <T>      The type of the entity bean
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
+    return getDefault().createQuery(beanType, eql);
+  }
+
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -3,7 +3,7 @@ package io.ebean;
 import jakarta.persistence.PersistenceException;

 /**
- * Thrown when a foreign key constraint is enforced or a field is too large.
+ * Thrown when a foreign key constraint is enforced.
 */
 public class DataIntegrityException extends PersistenceException {
  private static final long serialVersionUID = -6740171949170180970L;
@@ -14,11 +14,4 @@ public class DataIntegrityException extends PersistenceException {
  public DataIntegrityException(String message, Throwable cause) {
    super(message, cause);
  }
-
-  /**
-   * Create with message only.
-   */
-  public DataIntegrityException(String message) {
-    super(message);
-  }
 }
@@ -88,16 +88,16 @@ public interface Database {

  /**
   * Return a new database builder.
-   * <pre>{@code
-   *
-   *   // build the 'default' database using configuration
-   *   // from application.properties / application.yaml
-   *
-   *   Database db = Database.builder()
-   *     .loadFromProperties()
-   *     .build();
-   *
-   * }</pre>
+    * <pre>{@code
+ *
+ *   // build the 'default' database using configuration
+ *   // from application.properties / application.yaml
+ *
+ *   Database db = Database.builder()
+ *     .loadFromProperties()
+ *     .build();
+ *
+ * }</pre>
   */
  static DatabaseBuilder builder() {
    return new DatabaseConfig();
@@ -242,6 +242,18 @@ public interface Database {
   */
  <T> UpdateQuery<T> update(Class<T> beanType);

+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery);
+
  /**
   * Create a query for an entity bean and synonym for {@link #find(Class)}.
   *
@@ -249,6 +261,41 @@ public interface Database {
   */
  <T> Query<T> createQuery(Class<T> beanType);

+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   * <p>
+   * <h3>Example</h3>
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String ormQuery = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = DB.createQuery(Order.class, ormQuery);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findOne();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param ormQuery The Ebean ORM query
+   * @param <T>      The type of the entity bean
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  <T> Query<T> createQuery(Class<T> beanType, String ormQuery);
+
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -412,6 +459,18 @@ public interface Database {
   */
  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);

+  /**
+   * Create a named Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with DB before use.
+   *
+   * @param dtoType    The type of the DTO bean the rows will be mapped into.
+   * @param namedQuery The name of the query
+   * @param <T>        The type of the DTO bean.
+   */
+  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
+
  /**
   * Look to execute a native sql query that does not return beans but instead
   * returns SqlRow or direct access to ResultSet.
@@ -607,6 +666,49 @@ 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>
@@ -1326,6 +1428,109 @@ public interface Database {
   */
  ScriptRunner script();

+  /**
+   * Return the Document store.
+   */
+  DocumentStore docStore();
+
+  /**
+   * Publish a single bean given its type and id returning the resulting live bean.
+   * <p>
+   * The values are published from the draft to the live bean.
+   *
+   * @param <T>         the type of the entity bean
+   * @param beanType    the type of the entity bean
+   * @param id          the id of the entity bean
+   * @param transaction the transaction the publish process should use (can be null)
+   */
+  @Nullable
+  <T> T publish(Class<T> beanType, Object id, Transaction transaction);
+
+  /**
+   * Publish a single bean given its type and id returning the resulting live bean.
+   * This will use the current transaction or create one if required.
+   * <p>
+   * The values are published from the draft to the live bean.
+   *
+   * @param <T>      the type of the entity bean
+   * @param beanType the type of the entity bean
+   * @param id       the id of the entity bean
+   */
+  @Nullable
+  <T> T publish(Class<T> beanType, Object id);
+
+  /**
+   * Publish the beans that match the query returning the resulting published beans.
+   * <p>
+   * The values are published from the draft beans to the live beans.
+   *
+   * @param <T>         the type of the entity bean
+   * @param query       the query used to select the draft beans to publish
+   * @param transaction the transaction the publish process should use (can be null)
+   */
+  <T> List<T> publish(Query<T> query, Transaction transaction);
+
+  /**
+   * Publish the beans that match the query returning the resulting published beans.
+   * This will use the current transaction or create one if required.
+   * <p>
+   * The values are published from the draft beans to the live beans.
+   *
+   * @param <T>   the type of the entity bean
+   * @param query the query used to select the draft beans to publish
+   */
+  <T> List<T> publish(Query<T> query);
+
+  /**
+   * Restore the draft bean back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   *
+   * @param <T>         the type of the entity bean
+   * @param beanType    the type of the entity bean
+   * @param id          the id of the entity bean to restore
+   * @param transaction the transaction the restore process should use (can be null)
+   */
+  @Nullable
+  <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);
+
+  /**
+   * Restore the draft bean back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   *
+   * @param <T>      the type of the entity bean
+   * @param beanType the type of the entity bean
+   * @param id       the id of the entity bean to restore
+   */
+  @Nullable
+  <T> T draftRestore(Class<T> beanType, Object id);
+
+  /**
+   * Restore the draft beans matching the query back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   *
+   * @param <T>         the type of the entity bean
+   * @param query       the query used to select the draft beans to restore
+   * @param transaction the transaction the restore process should use (can be null)
+   */
+  <T> List<T> draftRestore(Query<T> query, Transaction transaction);
+
+  /**
+   * Restore the draft beans matching the query back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   *
+   * @param <T>   the type of the entity bean
+   * @param query the query used to select the draft beans to restore
+   */
+  <T> List<T> draftRestore(Query<T> query);
+
  /**
   * Returns the set of properties/paths that are unknown (do not map to known properties or paths).
   * <p>
@@ -13,6 +13,8 @@ import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
 import jakarta.persistence.EnumType;

 import javax.sql.DataSource;
@@ -85,7 +87,6 @@ public interface DatabaseBuilder {
    }
    return this;
  }
-
  /**
   * Set the name of the Database.
   */
@@ -689,6 +690,38 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setChangeLogAsync(boolean changeLogAsync);

+  /**
+   * Set the ReadAuditLogger to use. If not set the default implementation is used
+   * which logs the read events in JSON format to a standard named SLF4J logger
+   * (which can be configured in say logback to log to a separate log file).
+   */
+  default DatabaseBuilder readAuditLogger(ReadAuditLogger readAuditLogger) {
+    return setReadAuditLogger(readAuditLogger);
+  }
+
+  /**
+   * @deprecated migrate to {@link #readAuditLogger(ReadAuditLogger)}.
+   */
+  @Deprecated
+  DatabaseBuilder setReadAuditLogger(ReadAuditLogger readAuditLogger);
+
+  /**
+   * Set the ReadAuditPrepare to use.
+   * <p>
+   * It is expected that an implementation is used that read user context information
+   * (user id, user ip address etc) and sets it on the ReadEvent bean before it is sent
+   * to the ReadAuditLogger.
+   */
+  default DatabaseBuilder readAuditPrepare(ReadAuditPrepare readAuditPrepare) {
+    return setReadAuditPrepare(readAuditPrepare);
+  }
+
+  /**
+   * @deprecated migrate to {@link #readAuditPrepare(ReadAuditPrepare)}.
+   */
+  @Deprecated
+  DatabaseBuilder setReadAuditPrepare(ReadAuditPrepare readAuditPrepare);
+
  /**
   * Set the configuration for profiling.
   */
@@ -971,6 +1004,16 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setAllQuotedIdentifiers(boolean allQuotedIdentifiers);

+  /**
+   * Set to true if this Database is Document store only instance (has no JDBC DB).
+   */
+  DatabaseBuilder setDocStoreOnly(boolean docStoreOnly);
+
+  /**
+   * Set the configuration for the ElasticSearch integration.
+   */
+  DatabaseBuilder setDocStoreConfig(DocStoreConfig docStoreConfig);
+
  /**
   * Set the constraint naming convention used in DDL generation.
   */
@@ -2165,15 +2208,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setLoadModuleInfo(boolean loadModuleInfo);

-  /**
-   * Set if generated SQL SELECT should include the query label as an
-   * inline SQL comment (to help reference back from the SQL to the code
-   * that executed the query.
-   *
-   * @param includeLabelInSql When true include a SQL inline comment in generated SELECT queries.
-   */
-  DatabaseConfig includeLabelInSql(boolean includeLabelInSql);
-
  /**
   * Set the naming convention to apply to metrics names.
   */
@@ -2187,11 +2221,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setMetricNaming(Function<String, String> metricNaming);

-  /**
-   * Sets the length check mode.
-   */
-  DatabaseConfig lengthCheck(LengthCheck lengthCheck);
-
  /**
   * Provides read access (getters) for the DatabaseBuilder configuration
   * that has been set.
@@ -2413,6 +2442,16 @@ public interface DatabaseBuilder {
     */
    boolean isChangeLogAsync();

+    /**
+     * Return the ReadAuditLogger to use.
+     */
+    ReadAuditLogger getReadAuditLogger();
+
+    /**
+     * Return the ReadAuditPrepare to use.
+     */
+    ReadAuditPrepare getReadAuditPrepare();
+
    /**
     * Return the tenancy catalog provider.
     */
@@ -2551,6 +2590,16 @@ public interface DatabaseBuilder {
     */
    boolean isAllQuotedIdentifiers();

+    /**
+     * Return true if this Database is a Document store only instance (has no JDBC DB).
+     */
+    boolean isDocStoreOnly();
+
+    /**
+     * Return the configuration for the ElasticSearch integration.
+     */
+    DocStoreConfig getDocStoreConfig();
+
    /**
     * Return the constraint naming convention used in DDL generation.
     */
@@ -3049,20 +3098,10 @@ public interface DatabaseBuilder {
     */
    boolean isLoadModuleInfo();

-    /**
-     * Return true if generated sql select query should include an inline sql comment with the
-     * query label or profile location label.
-     */
-    boolean isIncludeLabelInSql();
-
    /**
     * Return the naming convention to apply to metrics names.
     */
    Function<String, String> getMetricNaming();

-    /**
-     * Returns the length check mode.
-     */
-    LengthCheck getLengthCheck();
  }
 }
@@ -0,0 +1,94 @@
+package io.ebean;
+
+/**
+ * Bean holding the details to update the document store.
+ */
+public final class DocStoreQueueEntry {
+
+  /**
+   * Action to either update or delete a document from the index.
+   */
+  public enum Action {
+
+    /**
+     * Action is to update a document in the doc store.
+     */
+    INDEX(1),
+
+    /**
+     * Action is to delete a document from the doc store..
+     */
+    DELETE(2),
+
+    /**
+     * An update is required based on a change to a nested/embedded object at a given path.
+     */
+    NESTED(3);
+
+    int value;
+
+    Action(int value) {
+      this.value = value;
+    }
+
+    /**
+     * Return the value associated with this action type.
+     */
+    public int getValue() {
+      return value;
+    }
+  }
+
+  private final Action type;
+
+  private final String queueId;
+
+  private final String path;
+
+  private final Object beanId;
+
+  /**
+   * Construct for an INDEX or DELETE action.
+   */
+  public DocStoreQueueEntry(Action type, String queueId, Object beanId) {
+    this(type, queueId, null, beanId);
+  }
+
+  /**
+   * Construct for an NESTED/embedded path invalidation action.
+   */
+  public DocStoreQueueEntry(Action type, String queueId, String path, Object beanId) {
+    this.type = type;
+    this.queueId = queueId;
+    this.path = path;
+    this.beanId = beanId;
+  }
+
+  /**
+   * Return the event type.
+   */
+  public Action getType() {
+    return type;
+  }
+
+  /**
+   * Return the associate queueId.
+   */
+  public String getQueueId() {
+    return queueId;
+  }
+
+  /**
+   * Return the path if this is a nested update.
+   */
+  public String getPath() {
+    return path;
+  }
+
+  /**
+   * Return the bean id (which matches the document id).
+   */
+  public Object getBeanId() {
+    return beanId;
+  }
+}
@@ -0,0 +1,312 @@
+package io.ebean;
+
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
+import io.ebean.docstore.DocQueryContext;
+import io.ebean.docstore.RawDoc;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Document storage operations.
+ */
+@NonNullApi
+public interface DocumentStore {
+
+  /**
+   * Update the associated document store using the result of the query.
+   * <p>
+   * This will execute the query against the database creating a document for each
+   * bean graph and sending this to the document store.
+   * </p>
+   * <p>
+   * Note that the select and fetch paths of the query is set for you to match the
+   * document structure needed based on <code>@DocStore</code> and <code>@DocStoreEmbedded</code>
+   * so what this query requires is the predicates only.
+   * </p>
+   * <p>
+   * This query will be executed using findEach so it is safe to use a query
+   * that will fetch a lot of beans. The default bulkBatchSize is used.
+   * </p>
+   *
+   * @param query The query that selects object to send to the document store.
+   */
+  <T> void indexByQuery(Query<T> query);
+
+  /**
+   * Update the associated document store index using the result of the query additionally specifying a
+   * bulkBatchSize to use for sending the messages to ElasticSearch.
+   *
+   * @param query         The query that selects object to send to the document store.
+   * @param bulkBatchSize The batch size to use when bulk sending to the document store.
+   */
+  <T> void indexByQuery(Query<T> query, int bulkBatchSize);
+
+  /**
+   * Update the document store for all beans of this type.
+   * <p>
+   * This is the same as indexByQuery where the query has no predicates and so fetches all rows.
+   * </p>
+   */
+  void indexAll(Class<?> beanType);
+
+  /**
+   * Return the bean by fetching it's content from the document store.
+   * If the document is not found null is returned.
+   * <p>
+   * Typically this is called indirectly by findOne() on the query.
+   * </p>
+   * <pre>{@code
+   *
+   * Customer customer =
+   *   database.find(Customer.class)
+   *     .setUseDocStore(true)
+   *     .setId(42)
+   *     .findOne();
+   *
+   * }</pre>
+   */
+  @Nullable
+  <T> T find(DocQueryContext<T> request);
+
+  /**
+   * Execute the find list query. This request is prepared to execute secondary queries.
+   * <p>
+   * Typically this is called indirectly by findList() on the query that has setUseDocStore(true).
+   * </p>
+   * <pre>{@code
+   *
+   * List<Customer> newCustomers =
+   *  database.find(Customer.class)
+   *    .setUseDocStore(true)
+   *    .where().eq("status, Customer.Status.NEW)
+   *    .findList();
+   *
+   * }</pre>
+   */
+  <T> List<T> findList(DocQueryContext<T> request);
+
+  /**
+   * Execute the query against the document store returning the paged list.
+   * <p>
+   * The query should have <code>firstRow</code> or <code>maxRows</code> set prior to calling this method.
+   * </p>
+   * <p>
+   * Typically this is called indirectly by findPagedList() on the query that has setUseDocStore(true).
+   * </p>
+   * <pre>{@code
+   *
+   * PagedList<Customer> newCustomers =
+   *  database.find(Customer.class)
+   *    .setUseDocStore(true)
+   *    .where().eq("status, Customer.Status.NEW)
+   *    .setMaxRows(50)
+   *    .findPagedList();
+   *
+   * }</pre>
+   */
+  <T> PagedList<T> findPagedList(DocQueryContext<T> request);
+
+  /**
+   * Execute the query against the document store with the expectation of a large set of results
+   * that are processed in a scrolling resultSet fashion.
+   * <p>
+   * For example, with the ElasticSearch doc store this uses SCROLL.
+   * </p>
+   * <p>
+   * Typically this is called indirectly by findEach() on the query that has setUseDocStore(true).
+   * </p>
+   * <pre>{@code
+   *
+   *  database.find(Order.class)
+   *    .setUseDocStore(true)
+   *    .where()... // perhaps add predicates
+   *    .findEach((Order order) -> {
+   *      // process the bean ...
+   *    });
+   *
+   * }</pre>
+   */
+  <T> void findEach(DocQueryContext<T> query, Consumer<T> consumer);
+
+  /**
+   * Execute the query against the document store with the expectation of a large set of results
+   * that are processed in a scrolling resultSet fashion.
+   * <p>
+   * Unlike findEach() this provides the opportunity to stop iterating through the large query.
+   * </p>
+   * <p>
+   * For example, with the ElasticSearch doc store this uses SCROLL.
+   * </p>
+   * <p>
+   * Typically this is called indirectly by findEachWhile() on the query that has setUseDocStore(true).
+   * </p>
+   * <pre>{@code
+   *
+   *  database.find(Order.class)
+   *    .setUseDocStore(true)
+   *    .where()... // perhaps add predicates
+   *    .findEachWhile(new Predicate<Order>() {
+   *      @Override
+   *      public void accept(Order bean) {
+   *        // process the bean
+   *
+   *        // return true to continue, false to stop
+   *        // boolean shouldContinue = ...
+   *        return shouldContinue;
+   *      }
+   *    });
+   *
+   * }</pre>
+   */
+  <T> void findEachWhile(DocQueryContext<T> query, Predicate<T> consumer);
+
+  /**
+   * Find each processing raw documents.
+   *
+   * @param indexNameType The full index name and type
+   * @param rawQuery      The query to execute
+   * @param consumer      Consumer to process each document
+   */
+  void findEach(String indexNameType, String rawQuery, Consumer<RawDoc> consumer);
+
+  /**
+   * Find each processing raw documents stopping when the predicate returns false.
+   *
+   * @param indexNameType The full index name and type
+   * @param rawQuery      The query to execute
+   * @param consumer      Consumer to process each document until false is returned
+   */
+  void findEachWhile(String indexNameType, String rawQuery, Predicate<RawDoc> consumer);
+
+  /**
+   * Process the queue entries sending updates to the document store or queuing them for later processing.
+   */
+  long process(List<DocStoreQueueEntry> queueEntries) throws IOException;
+
+  /**
+   * Drop the index from the document store (similar to DDL drop table).
+   * <pre>{@code
+   *
+   *   DocumentStore documentStore = database.docStore();
+   *
+   *   documentStore.dropIndex("product_copy");
+   *
+   * }</pre>
+   */
+  void dropIndex(String indexName);
+
+  /**
+   * Create an index given a mapping file as a resource in the classPath (similar to DDL create table).
+   * <pre>{@code
+   *
+   *   DocumentStore documentStore = database.docStore();
+   *
+   *   // uses product_copy.mapping.json resource
+   *   // ... to define mappings for the index
+   *
+   *   documentStore.createIndex("product_copy", null);
+   *
+   * }</pre>
+   *
+   * @param indexName the name of the new index
+   * @param alias     the alias of the index
+   */
+  void createIndex(String indexName, String alias);
+
+  /**
+   * Modify the settings on an index.
+   * <p>
+   * For example, this can be used be used to set elasticSearch refresh_interval
+   * on an index before a bulk update.
+   * </p>
+   * <pre>{@code
+   *
+   *   // refresh_interval -1 ... disable refresh while bulk loading
+   *
+   *   Map<String,Object> settings = new LinkedHashMap<>();
+   *   settings.put("refresh_interval", "-1");
+   *
+   *   documentStore.indexSettings("product", settings);
+   *
+   * }</pre>
+   * <pre>{@code
+   *
+   *   // refresh_interval 1s ... restore after bulk loading
+   *
+   *   Map<String,Object> settings = new LinkedHashMap<>();
+   *   settings.put("refresh_interval", "1s");
+   *
+   *   documentStore.indexSettings("product", settings);
+   *
+   * }</pre>
+   *
+   * @param indexName the name of the index to update settings on
+   * @param settings  the settings to set on the index
+   */
+  void indexSettings(String indexName, Map<String, Object> settings);
+
+  /**
+   * Copy the index to a new index.
+   * <p>
+   * This copy process does not use the database but instead will copy from the source index to a destination index.
+   * </p>
+   * <pre>{@code
+   *
+   *  long copyCount = documentStore.copyIndex(Product.class, "product_copy");
+   *
+   * }</pre>
+   *
+   * @param beanType The bean type of the source index
+   * @param newIndex The name of the index to copy to
+   * @return the number of documents copied to the new index
+   */
+  long copyIndex(Class<?> beanType, String newIndex);
+
+  /**
+   * Copy entries from an index to a new index but limiting to documents that have been
+   * modified since the sinceEpochMillis time.
+   * <p>
+   * To support this the document needs to have a <code>@WhenModified</code> property.
+   * </p>
+   * <pre>{@code
+   *
+   *  long copyCount = documentStore.copyIndex(Product.class, "product_copy", sinceMillis);
+   *
+   * }</pre>
+   *
+   * @param beanType The bean type of the source index
+   * @param newIndex The name of the index to copy to
+   * @return the number of documents copied to the new index
+   */
+  long copyIndex(Class<?> beanType, String newIndex, long sinceEpochMillis);
+
+  /**
+   * Copy from a source index to a new index taking only the documents
+   * matching the given query.
+   * <pre>{@code
+   *
+   *  // predicates to select the source documents to copy
+   *  Query<Product> query = database.find(Product.class)
+   *    .where()
+   *      .ge("whenModified", new Timestamp(since))
+   *      .ge("name", "A")
+   *      .lt("name", "D")
+   *      .query();
+   *
+   *  // copy from the source index to "product_copy" index
+   *  long copyCount = documentStore.copyIndex(query, "product_copy", 1000);
+   *
+   * }</pre>
+   *
+   * @param query         The query to select the source documents to copy
+   * @param newIndex      The target index to copy the documents to
+   * @param bulkBatchSize The ElasticSearch bulk batch size, if 0 uses the default.
+   * @return The number of documents copied to the new index.
+   */
+  long copyIndex(Query<?> query, String newIndex, int bulkBatchSize);
+}
@@ -1,5 +1,7 @@
 package io.ebean;

+import io.ebean.search.*;
+
 import java.util.Collection;
 import java.util.Map;

@@ -623,6 +625,31 @@ public interface ExpressionFactory {
   */
  Expression raw(String raw);

+  /**
+   * Create a Text Match expression (currently doc store/Elastic only).
+   */
+  Expression textMatch(String propertyName, String search, Match options);
+
+  /**
+   * Create a Text Multi match expression (currently doc store/Elastic only).
+   */
+  Expression textMultiMatch(String query, MultiMatch options);
+
+  /**
+   * Create a text simple query expression (currently doc store/Elastic only).
+   */
+  Expression textSimple(String search, TextSimple options);
+
+  /**
+   * Create a text query string expression (currently doc store/Elastic only).
+   */
+  Expression textQueryString(String search, TextQueryString options);
+
+  /**
+   * Create a text common terms expression (currently doc store/Elastic only).
+   */
+  Expression textCommonTerms(String search, TextCommonTerms options);
+
  /**
   * And - join two expressions with a logical and.
   */
@@ -666,4 +693,12 @@ public interface ExpressionFactory {
   */
  <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent);

+  /**
+   * Add the expressions to the given expression list.
+   *
+   * @param where       The expression list to add the expressions to
+   * @param expressions The expressions that are parsed
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  <T> void where(ExpressionList<T> where, String expressions, Object[] params);
 }
@@ -2,6 +2,7 @@ package io.ebean;

 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
+import io.ebean.search.*;

 import jakarta.persistence.NonUniqueResultException;
 import java.sql.Connection;
@@ -105,6 +106,11 @@ public interface ExpressionList<T> {
   */
  Query<T> asOf(Timestamp asOf);

+  /**
+   * Execute the query against the draft set of tables.
+   */
+  Query<T> asDraft();
+
  /**
   * Convert the query to a DTO bean query.
   * <p>
@@ -216,8 +222,6 @@ public interface ExpressionList<T> {
  int delete();

  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
   * Execute as a delete query deleting the 'root level' beans that match the predicates
   * in the query.
   * <p>
@@ -227,7 +231,6 @@ public interface ExpressionList<T> {
   *
   * @return the number of rows that were deleted.
   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
  int delete(Transaction transaction);

  /**
@@ -239,14 +242,11 @@ public interface ExpressionList<T> {
  int update();

  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
   * Execute as a update query with the given transaction.
   *
   * @return the number of rows that were updated.
   * @see UpdateQuery
   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
  int update(Transaction transaction);

  /**
@@ -507,6 +507,28 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> filterMany(String manyProperty);

+  /**
+   * @deprecated for removal - migrate to {@link #filterManyRaw(String, String, Object...)}.
+   * <p>
+   * Add filter expressions to the many property.
+   *
+   * <pre>{@code
+   *
+   *   DB.find(Customer.class)
+   *   .where()
+   *   .eq("name", "Rob")
+   *   .filterMany("orders", "status = ?", Status.NEW)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   * @param manyProperty The many property
+   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
+   * @param params       Bind parameters used in the expressions
+   */
+  @Deprecated(forRemoval = true)
+  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);
+
  /**
   * Add filter expressions for the many path. The expressions can include SQL functions if
   * desired and the property names are translated to column names.
@@ -558,6 +580,19 @@ public interface ExpressionList<T> {
   */
  Query<T> setDistinct(boolean distinct);

+  /**
+   * Set the index(es) to search for a document store which uses partitions.
+   * <p>
+   * For example, when executing a query against ElasticSearch with daily indexes we can
+   * explicitly specify the indexes to search against.
+   * </p>
+   *
+   * @param indexName The index or indexes to search against
+   * @return This query
+   * @see Query#setDocIndexName(String)
+   */
+  Query<T> setDocIndexName(String indexName);
+
  /**
   * Set the first row to fetch.
   *
@@ -641,6 +676,14 @@ public interface ExpressionList<T> {
    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
  }

+  /**
+   * Set to true if this query should execute against the doc store.
+   * <p>
+   * When setting this you may also consider disabling lazy loading.
+   * </p>
+   */
+  Query<T> setUseDocStore(boolean useDocsStore);
+
  /**
   * Set true if you want to disable lazy loading.
   * <p>
@@ -649,6 +692,16 @@ public interface ExpressionList<T> {
   */
  Query<T> setDisableLazyLoading(boolean disableLazyLoading);

+  /**
+   * Disable read auditing for this query.
+   * <p>
+   * This is intended to be used when the query is not a user initiated query and instead
+   * part of the internal processing in an application to load a cache or document store etc.
+   * In these cases we don't want the query to be part of read auditing.
+   * </p>
+   */
+  Query<T> setDisableReadAuditing();
+
  /**
   * Set a label on the query (to help identify query execution statistics).
   */
@@ -668,6 +721,14 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> where();

+  /**
+   * Add the expressions to this expression list.
+   *
+   * @param expressions The expressions that are parsed and added to this expression list
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  ExpressionList<T> where(String expressions, Object... params);
+
  /**
   * Path exists - for the given path in a JSON document.
   * <pre>{@code
@@ -1562,6 +1623,47 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);

+  /**
+   * Add a match expression.
+   *
+   * @param propertyName The property name for the match
+   * @param search       The search value
+   */
+  ExpressionList<T> match(String propertyName, String search);
+
+  /**
+   * Add a match expression with options.
+   *
+   * @param propertyName The property name for the match
+   * @param search       The search value
+   */
+  ExpressionList<T> match(String propertyName, String search, Match options);
+
+  /**
+   * Add a multi-match expression.
+   */
+  ExpressionList<T> multiMatch(String search, String... properties);
+
+  /**
+   * Add a multi-match expression using options.
+   */
+  ExpressionList<T> multiMatch(String search, MultiMatch options);
+
+  /**
+   * Add a simple query string expression.
+   */
+  ExpressionList<T> textSimple(String search, TextSimple options);
+
+  /**
+   * Add a query string expression.
+   */
+  ExpressionList<T> textQueryString(String search, TextQueryString options);
+
+  /**
+   * Add common terms expression.
+   */
+  ExpressionList<T> textCommonTerms(String search, TextCommonTerms options);
+
  /**
   * And - join two expressions with a logical and.
   */
@@ -1704,6 +1806,42 @@ public interface ExpressionList<T> {
   */
  Junction<T> disjunction();

+  /**
+   * Start a list of expressions that will be joined by MUST.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to and().
+   * </p>
+   */
+  Junction<T> must();
+
+  /**
+   * Start a list of expressions that will be joined by SHOULD.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to or().
+   * </p>
+   */
+  Junction<T> should();
+
+  /**
+   * Start a list of expressions that will be joined by MUST NOT.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to not().
+   * </p>
+   */
+  Junction<T> mustNot();
+
  /**
   * End a junction returning the parent expression list.
   * <p>
@@ -213,4 +213,11 @@ public class Finder<I, T> {
    return db().findNative(type, nativeSql);
  }

+  /**
+   * Creates a query using the ORM query language.
+   */
+  public Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
+
 }
@@ -1,903 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Build and execute an ORM query.
- *
- * @param <SELF> The type of the builder
- * @param <T>    The entity bean type
- */
-public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Set root table alias.
-   */
-  SELF alias(String alias);
-
-  /**
-   * Apply changes to the query conditional on the supplied predicate.
-   * <p>
-   * Typically, the changes are extra predicates etc.
-   *
-   * @param predicate The predicate which when true the changes are applied
-   * @param apply     The changes to apply to the query
-   */
-  SELF alsoIf(BooleanSupplier predicate, Consumer<SELF> apply);
-
-  /**
-   * Perform an 'As of' query using history tables to return the object graph
-   * as of a time in the past.
-   * <p>
-   * To perform this query the DB must have underlying history tables.
-   *
-   * @param asOf the date time in the past at which you want to view the data
-   */
-  SELF asOf(Timestamp asOf);
-
-  /**
-   * Convert the query to a DTO bean query.
-   * <p>
-   * We effectively use the underlying ORM query to build the SQL and then execute
-   * and map it into DTO beans.
-   */
-  <D> DtoQuery<D> asDto(Class<D> dtoClass);
-
-  /**
-   * Convert the query to a UpdateQuery.
-   * <p>
-   * Typically this is used with query beans to covert a query bean
-   * query into an UpdateQuery like the examples below.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *  int rowsUpdated = new QCustomer()
-   *       .name.startsWith("Rob")
-   *       .asUpdate()
-   *       .set("active", false)
-   *       .update();;
-   *
-   * }</pre>
-   *
-   * <pre>{@code
-   *
-   *   int rowsUpdated = new QContact()
-   *       .notes.note.startsWith("Make Inactive")
-   *       .email.endsWith("@foo.com")
-   *       .customer.id.equalTo(42)
-   *       .asUpdate()
-   *       .set("inactive", true)
-   *       .setRaw("email = lower(email)")
-   *       .update();
-   *
-   * }</pre>
-   */
-  UpdateQuery<T> asUpdate();
-
-  /**
-   * Return a copy of the query.
-   * <p>
-   * This is so that you can use a Query as a "prototype" for creating other
-   * query instances. You could create a Query with various where expressions
-   * and use that as a "prototype" - using this copy() method to create a new
-   * instance that you can then add other expressions then execute.
-   * </p>
-   */
-  SELF copy();
-
-  /**
-   * Execute the query using the given transaction.
-   */
-  SELF usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  SELF usingConnection(Connection connection);
-
-  /**
-   * Execute the query using the given database.
-   */
-  SELF usingDatabase(Database database);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SELF usingMaster();
-
-  /**
-   * Set the base table to use for this query.
-   * <p>
-   * Typically this is used when a table has partitioning and we wish to specify a specific
-   * partition/table to query against.
-   * </p>
-   * <pre>{@code
-   *
-   *   QOrder()
-   *   .setBaseTable("order_2019_05")
-   *   .status.equalTo(Status.NEW)
-   *   .findList();
-   *
-   * }</pre>
-   */
-  SELF setBaseTable(String baseTable);
-
-  /**
-   * Specify the PersistenceContextScope to use for this query.
-   * <p>
-   * When this is not set the 'default' configured on {@link io.ebean.config.DatabaseConfig#setPersistenceContextScope(PersistenceContextScope)}
-   * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}.
-   * <p>
-   * Note that the same persistence Context is used for subsequent lazy loading and query join queries.
-   * <p>
-   * Note that #findEach uses a 'per object graph' PersistenceContext so this scope is ignored for
-   * queries executed as #findIterate, #findEach, #findEachWhile.
-   *
-   * @param scope The scope to use for this query and subsequent lazy loading.
-   */
-  SELF setPersistenceContextScope(PersistenceContextScope scope);
-
-  /**
-   * Explicitly specify whether to use AutoTune for this query.
-   * <p>
-   * If you do not call this method on a query the "Implicit AutoTune mode" is
-   * used to determine if AutoTune should be used for a given query.
-   * <p>
-   * AutoTune can add additional fetch paths to the query and specify which
-   * properties are included for each path. If you have explicitly defined some
-   * fetch paths AutoTune will not remove them.
-   */
-  SELF setAutoTune(boolean autoTune);
-
-  /**
-   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
-   * <pre>{@code
-   *
-   *   // fetch a bean with JSON content
-   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
-   *       .setId(42)
-   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
-   *       .findOne();
-   *
-   *
-   *   // get the invalid JSON errors from the bean state
-   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
-   *
-   *   // If this map is not empty tell we have invalid JSON
-   *   // and should try and fix the JSON content or inform the user
-   *
-   * }</pre>
-   */
-  SELF setAllowLoadErrors();
-
-  /**
-   * Set the default lazy loading batch size to use.
-   * <p>
-   * When lazy loading is invoked on beans loaded by this query then this sets the
-   * batch size used to load those beans.
-   *
-   * @param lazyLoadBatchSize the number of beans to lazy load in a single batch
-   */
-  SELF setLazyLoadBatchSize(int lazyLoadBatchSize);
-
-  /**
-   * Set a label on the query.
-   * <p>
-   * This label can be used to help identify query performance metrics but we can also use
-   * profile location enhancement on Finders so for some that would be a better option.
-   */
-  SELF setLabel(String label);
-
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  SELF setHint(String hint);
-
-   /**
-   * Execute the query including soft deleted rows.
-   * <p>
-   * This means that Ebean will not add any predicates to the query for filtering out
-   * soft deleted rows. You can still add your own predicates for the deleted properties
-   * and effectively you have full control over the query to include or exclude soft deleted
-   * rows as needed for a given use case.
-   */
-  SELF setIncludeSoftDeletes();
-
-  /**
-   * Set true if you want to disable lazy loading.
-   * <p>
-   * That is, once the object graph is returned further lazy loading is disabled.
-   */
-  SELF setDisableLazyLoading(boolean disableLazyLoading);
-
-  /**
-   * Set whether this query uses DISTINCT.
-   */
-  SELF setDistinct(boolean distinct);
-
-  /**
-   * Set the first row to return for this query.
-   *
-   * @param firstRow the first row to include in the query result.
-   */
-  SELF setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of rows to return in the query.
-   *
-   * @param maxRows the maximum number of rows to return in the query.
-   */
-  SELF setMaxRows(int maxRows);
-
-  /**
-   * Set RawSql to use for this query.
-   */
-  SELF setRawSql(RawSql rawSql);
-
-  /**
-   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   *
-   * <pre>{@code
-   *
-   *  List<CountedValue<Order.Status>> orderStatusCount =
-   *
-   *     DB.find(Order.class)
-   *      .select("status")
-   *      .where()
-   *      .gt("orderDate", LocalDate.now().minusMonths(3))
-   *
-   *      // fetch as single attribute with a COUNT
-   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
-   *      .findSingleAttributeList();
-   *
-   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
-   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
-   *     }
-   *
-   *   // produces
-   *
-   *   count:3 orderStatus:NEW
-   *   count:1 orderStatus:SHIPPED
-   *   count:1 orderStatus:COMPLETE
-   *
-   * }</pre>
-   */
-  SELF setCountDistinct(CountDistinctOrder orderBy);
-
-  /**
-   * Set the property to use as keys for a map.
-   * <p>
-   * If no property is set then the id property is used.
-   * </p>
-   * <pre>{@code
-   *
-   * // Assuming sku is unique for products...
-   *
-   * Map<String,Product> productMap = DB.find(Product.class)
-   *     .setMapKey("sku")  // sku map keys...
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @param mapKey the property to use as keys for a map.
-   */
-  SELF setMapKey(String mapKey);
-
-  /**
-   * When set to true when you want the returned beans to be read only.
-   */
-  SELF setReadOnly(boolean readOnly);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  SELF setTimeout(int secs);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   * <p>
-   * Note that internally findEach and findEachWhile will set the fetch size
-   * if it has not already as these queries expect to process a lot of rows.
-   * If we didn't then Postgres and MySql for example would eagerly pull back
-   * all the row data and potentially consume a lot of memory in the process.
-   * </p>
-   * <p>
-   * As findEach and findEachWhile automatically set the fetch size we don't have
-   * to do so generally but we might still wish to for tuning a specific use case.
-   * </p>
-   */
-  SELF setBufferFetchSizeHint(int fetchSize);
-
-  /**
-   * Set the mode to use the bean cache when executing this query.
-   * <p>
-   * By default, "find by id" and "find by natural key" will use the bean cache
-   * when bean caching is enabled. Setting this to false means that the query
-   * will not use the bean cache and instead hit the database.
-   * <p>
-   * By default, findList() with natural keys will not use the bean cache. In that
-   * case we need to explicitly use the bean cache.
-   */
-  SELF setBeanCacheMode(CacheMode beanCacheMode);
-
-  /**
-   * Set the {@link CacheMode} to use the query for executing this query.
-   */
-  SELF setUseQueryCache(CacheMode cacheMode);
-
-  /**
-   * Set this to false to not use the bean cache.
-   * <p>
-   * This method is now superseded by {@link #setBeanCacheMode(CacheMode)}
-   * which provides more explicit options controlled bean cache use.
-   * <p>
-   * This method is likely to be deprecated in the future with migration
-   * over to setUseBeanCache().
-   */
-  default SELF setUseCache(boolean useCache) {
-    return setBeanCacheMode(useCache ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
-   */
-  default SELF setUseQueryCache(boolean enabled) {
-    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
-   */
-  SELF orderBy(String orderByClause);
-
-  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
-   */
-  SELF setOrderBy(OrderBy<T> orderBy);
-
-  /**
-   * Controls, if paginated queries should always append an 'order by id' statement at the end to
-   * guarantee a deterministic sort result. This may affect performance.
-   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
-   * this query provides a deterministic result.
-   */
-  SELF orderById(boolean orderById);
-
-  /**
-   * Execute the query with the given lock type and WAIT.
-   * <p>
-   * Note that <code>forUpdate()</code> is the same as
-   * <code>withLock(LockType.UPDATE)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType);
-
-  /**
-   * Execute the query with the given lock type and lock wait.
-   * <p>
-   * Note that <code>forUpdateNoWait()</code> is the same as
-   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType, Query.LockWait lockWait);
-
-  /**
-   * Execute using "for update" clause which results in the DB locking the record.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
-   */
-  SELF forUpdate();
-
-  /**
-   * Execute using "for update" clause with "no wait" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   */
-  SELF forUpdateNoWait();
-
-  /**
-   * Execute using "for update" clause with "skip locked" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
-   */
-  SELF forUpdateSkipLocked();
-
-  /**
-   * Returns the set of properties or paths that are unknown (do not map to known properties or paths).
-   * <p>
-   * Validate the query checking the where and orderBy expression paths to confirm if
-   * they represent valid properties or paths for the given bean type.
-   */
-  Set<String> validate();
-
-  /**
-   * Return the sql that was generated for executing this query.
-   * <p>
-   * This is only available after the query has been executed and provided only
-   * for informational purposes.
-   */
-  String getGeneratedSql();
-
-  /**
-   * Return the type of beans being queried.
-   */
-  Class<T> getBeanType();
-
-  /**
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  int delete();
-
-  /**
-   * Execute the query returning true if a row is found.
-   * <p>
-   * The query is executed using max rows of 1 and will only select the id property.
-   * This method is really just a convenient way to optimise a query to perform a
-   * 'does a row exist in the db' check.
-   *
-   * <h2>Example using a query bean:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists =
-   *     new QContact()
-   *       .email.equalTo("rob@foo.com")
-   *       .exists();
-   *
-   * }</pre>
-   *
-   * <h2>Example:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists = query()
-   *     .where().eq("email", "rob@foo.com")
-   *     .exists();
-   *
-   * }</pre>
-   *
-   * @return True if the query finds a matching row in the database
-   */
-  boolean exists();
-
-  /**
-   * Execute the query returning either a single bean or null (if no matching
-   * bean is found).
-   * <p>
-   * If more than 1 row is found for this query then a PersistenceException is
-   * thrown.
-   * <p>
-   * This is useful when your predicates dictate that your query should only
-   * return 0 or 1 results.
-   * <p>
-   * <pre>{@code
-   *
-   * // assuming the sku of products is unique...
-   * Product product =
-   *     new QProduct()
-   *         .sku.equalTo("aa113")
-   *         .findOne();
-   * ...
-   * }</pre>
-   * <p>
-   * It is also useful with finding objects by their id when you want to specify
-   * further join information to optimise the query.
-   * <p>
-   * <pre>{@code
-   *
-   * // Fetch order 42 and additionally fetch join its order details...
-   * Order order =
-   *     new QOrder()
-   *         .fetch("details") // eagerly load the order details
-   *         .id.equalTo(42)
-   *         .findOne();
-   *
-   * // the order details were eagerly loaded
-   * List<OrderDetail> details = order.getDetails();
-   * ...
-   * }</pre>
-   */
-  @Nullable
-  T findOne();
-
-  /**
-   * Execute the query returning an optional bean.
-   */
-  Optional<T> findOneOrEmpty();
-
-  /**
-   * Execute the query returning the list of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * List<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findList();
-   *
-   * }</pre>
-   *
-   * @see Query#findList()
-   */
-  List<T> findList();
-
-  /**
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating
-   * any number of results. To do so internally it can use
-   * multiple persistence contexts.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  Stream<T> findStream();
-
-  /**
-   * Execute the query returning the set of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * Set<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findSet();
-   *
-   * }</pre>
-   *
-   * @see Query#findSet()
-   */
-  Set<T> findSet();
-
-  /**
-   * Execute the query returning the list of Id's.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   *
-   * @see Query#findIds()
-   */
-  <A> List<A> findIds();
-
-  /**
-   * Execute the query returning a map of the objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * You can use setMapKey() or asMapKey() to specify the property to be used as keys
-   * on the map. If one is not specified then the id property is used.
-   * <p>
-   * <pre>{@code
-   *
-   * Map<String, Product> map =
-   *   new QProduct()
-   *     .sku.asMapKey()
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @see Query#findMap()
-   */
-  <K> Map<K, T> findMap();
-
-  /**
-   * Execute the query iterating over the results.
-   * <p>
-   * Note that findIterate (and findEach and findEachWhile) uses a "per graph"
-   * persistence context scope and adjusts jdbc fetch buffer size for large
-   * queries. As such it is better to use findList for small queries.
-   * <p>
-   * Remember that with {@link QueryIterator} you must call {@link QueryIterator#close()}
-   * when you have finished iterating the results (typically in a finally block).
-   * <p>
-   * findEach() and findEachWhile() are preferred to findIterate() as they ensure
-   * the jdbc statement and resultSet are closed at the end of the iteration.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * </p>
-   * <pre>{@code
-   *
-   *  Query<Customer> query =
-   *    new QCustomer()
-   *     .status.equalTo(Customer.Status.NEW)
-   *     .orderBy()
-   *       id.asc()
-   *     .query();
-   *
-   *  try (QueryIterator<Customer> it = query.findIterate()) {
-   *    while (it.hasNext()) {
-   *      Customer customer = it.next();
-   *      // do something with customer ...
-   *    }
-   *  }
-   *
-   * }</pre>
-   */
-  QueryIterator<T> findIterate();
-
-  /**
-   * Execute the query returning a list of values for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    new QCustomer()
-   *      .setDistinct(true)
-   *      .select(name)
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   *
-   * @return the list of values for the selected property
-   */
-  <A> List<A> findSingleAttributeList();
-
-  /**
-   * Execute the query returning a single value or null for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  LocalDate maxDate =
-   *    new QCustomer()
-   *      .select("max(startDate)")
-   *      .findSingleAttribute();
-   *
-   * }</pre>
-   *
-   * @return a single value or null for the selected property
-   */
-  @Nullable
-  <A> A findSingleAttribute();
-
-  /**
-   * Execute the query returning a single optional attribute value.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  Optional<String> maybeName =
-   *    new QCustomer()
-   *      .select(name)
-   *      .id.eq(42)
-   *      .status.eq(NEW)
-   *      .findSingleAttributeOrEmpty();
-   *
-   * }</pre>
-   *
-   * @return an optional value for the selected property
-   */
-  <A> Optional<A> findSingleAttributeOrEmpty();
-
-  /**
-   * Execute the query returning a hashset of values for a single property.
-   */
-  <A> Set<A> findSingleAttributeSet();
-
-  /**
-   * Execute the query processing the beans one at a time.
-   * <p>
-   * This method is appropriate to process very large query results as the
-   * beans are consumed one at a time and do not need to be held in memory
-   * (unlike #findList #findSet etc)
-   * <p>
-   * Note that internally Ebean can inform the JDBC driver that it is expecting larger
-   * resultSet and specifically for MySQL this hint is required to stop it's JDBC driver
-   * from buffering the entire resultSet. As such, for smaller resultSets findList() is
-   * generally preferable.
-   * <p>
-   * Compared with #findEachWhile this will always process all the beans where as
-   * #findEachWhile provides a way to stop processing the query result early before
-   * all the beans have been read.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEach((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEach(Consumer<T> consumer);
-
-  /**
-   * Execute findEach streaming query batching the results for consuming.
-   * <p>
-   * This query execution will stream the results and is suited to consuming
-   * large numbers of results from the database.
-   * <p>
-   * Typically, we use this batch consumer when we want to do further processing on
-   * the beans and want to do that processing in batch form, for example - 100 at
-   * a time.
-   *
-   * @param batch    The number of beans processed in the batch
-   * @param consumer Process the batch of beans
-   */
-  void findEach(int batch, Consumer<List<T>> consumer);
-
-  /**
-   * Execute the query using callbacks to a visitor to process the resulting
-   * beans one at a time.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEachWhile((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *
-   *       // return true to continue processing or false to stop
-   *       return (customer.getId() < 40);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEachWhile(Predicate<T> consumer);
-
-  /**
-   * Return versions of a @History entity bean.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersions();
-
-  /**
-   * Return versions of a @History entity bean between a start and end timestamp.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);
-
-  /**
-   * Return the count of entities this query should return.
-   * <p>
-   * This is the number of 'top level' or 'root level' entities.
-   */
-  int findCount();
-
-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the row count query
-   */
-  FutureRowCount<T> findFutureCount();
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the list of Id's
-   */
-  FutureIds<T> findFutureIds();
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   *
-   * @return a Future object for the list result of the query
-   */
-  FutureList<T> findFutureList();
-
-  /**
-   * Return a PagedList for this query using firstRow and maxRows.
-   * <p>
-   * The benefit of using this over findList() is that it provides functionality to get the
-   * total row count etc.
-   * <p>
-   * If maxRows is not set on the query prior to calling findPagedList() then a
-   * PersistenceException is thrown.
-   * <p>
-   * <pre>{@code
-   *
-   *  PagedList<Order> pagedList =
-   *    new QOrder()
-   *       .setFirstRow(50)
-   *       .setMaxRows(20)
-   *       .findPagedList();
-   *
-   *       // fetch the total row count in the background
-   *       pagedList.loadRowCount();
-   *
-   *       List<Order> orders = pagedList.getList();
-   *       int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList();
-
-}
@@ -1,242 +0,0 @@
-package io.ebean;
-
-/**
- * Builder for ORM Query projection (the select and fetch part).
- *
- * @param <SELF> The builder type
- * @param <T>    The entity bean type
- */
-public interface QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Apply the path properties replacing the select and fetch clauses.
-   * <p>
-   * This is typically used when the FetchPath is applied to both the query and the JSON output.
-   */
-  SELF apply(FetchPath fetchPath);
-
-  /**
-   * Specify the properties to fetch on the root level entity bean in comma delimited format.
-   * <p>
-   * The Id property is automatically included in the properties to fetch unless setDistinct(true)
-   * is set on the query.
-   * </p>
-   * <p>
-   * Use {@link #fetch(String, String)} to specify specific properties to fetch
-   * on other non-root level paths of the object graph.
-   * </p>
-   * <pre>{@code
-   *
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // Only fetch the customer id, name and status.
-   *     // This is described as a "Partial Object"
-   *     .select("name, status")
-   *     .where.ilike("name", "rob%")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param fetchProperties the properties to fetch for this bean (* = all properties).
-   */
-  SELF select(String fetchProperties);
-
-  /**
-   * Apply the fetchGroup which defines what part of the object graph to load.
-   */
-  SELF select(FetchGroup<T> fetchGroup);
-
-  /**
-   * Specify a path to fetch eagerly including specific properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // query orders...
-   * List<Order> orders = DB.find(Order.class)
-   *       // fetch the customer...
-   *       // ... getting the customers name and phone number
-   *       .fetch("customer", "name, phoneNumber")
-   *
-   *       // ... also fetch the customers billing address (* = all properties)
-   *       .fetch("customer.billingAddress", "*")
-   *       .findList();
-   * }</pre>
-   * <p>
-   * If columns is null or "*" then all columns/properties for that path are fetched.
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetch(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchQuery(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using L2 bean cache.
-   *
-   * @param path            The path of the beans we are fetching from L2 cache.
-   * @param fetchProperties The properties that should be loaded.
-   */
-  SELF fetchCache(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   *
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path            the property path we wish to fetch lazily.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchLazy(String path, String fetchProperties);
-
-  /**
-   * Additionally specify a FetchConfig to use a separate query or lazy loading
-   * to load this path.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path, String fetchProperties, FetchConfig fetchConfig);
-
-  /**
-   * Specify a path to fetch eagerly including all its properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // eager fetch the contacts
-   *     .fetch("contacts")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path);
-
-  /**
-   * Fetch the path eagerly using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path the property path we wish to fetch eagerly
-   */
-  SELF fetchQuery(String path);
-
-  /**
-   * Fetch the path eagerly using L2 cache.
-   */
-  SELF fetchCache(String path);
-
-  /**
-   * Fetch the path lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * </p>
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path the property path we wish to fetch lazily.
-   */
-  SELF fetchLazy(String path);
-
-  /**
-   * Additionally specify a JoinConfig to specify a "query join" and or define
-   * the lazy loading query.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", FetchConfig.ofLazy(100))
-   *     .findList();
-   *
-   * }</pre>
-   */
-  SELF fetch(String path, FetchConfig fetchConfig);
-
-}
@@ -1,7 +1,9 @@
 package io.ebean;

+import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
+import io.ebean.config.DocStoreConfig;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -209,6 +211,29 @@ public interface Transaction extends AutoCloseable {
   */
  boolean isActive();

+  /**
+   * Set the behavior for document store updates on this transaction.
+   * <p>
+   * For example, set the mode to DocStoreEvent.IGNORE for this transaction and
+   * then any changes via this transaction are not sent to the doc store. This
+   * would be used when doing large bulk inserts into the database and we want
+   * to control how that is sent to the document store.
+   * </p>
+   */
+  void setDocStoreMode(DocStoreMode mode);
+
+  /**
+   * Set the batch size to use for sending messages to the document store.
+   * <p>
+   * You might set this if you know the changes in this transaction result in especially large or
+   * especially small payloads and want to adjust the batch size to match.
+   * </p>
+   * <p>
+   * Setting this overrides the default of {@link DocStoreConfig#getBulkBatchSize()}
+   * </p>
+   */
+  void setDocStoreBatchSize(int batchSize);
+
  /**
   * Explicitly turn off or on the cascading nature of save() and delete(). This
   * gives the developer exact control over what beans are saved and deleted
@@ -141,14 +141,16 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
    }
  }

-  /**
-   * 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;
+  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();
  }

  /**
@@ -1,9 +1,6 @@
 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 io.ebean.bean.*;

 import java.util.*;

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

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

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

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

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

@@ -3,10 +3,7 @@ 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.Set;
+import java.util.*;

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

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

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

-  /**
-   * Set the underlying set (used for lazy fetch).
-   */
-  @SuppressWarnings("unchecked")
-  public void setActualSet(Set<?> set) {
-    this.set = (Set<E>) set;
+  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 Set<E> actualSet() {
+  public LinkedHashSet<E> actualSet() {
    return set;
  }

@@ -1,5 +1,8 @@
 package io.ebean.config;

+import io.avaje.config.Config;
+import io.avaje.config.Configuration;
+
 import java.util.Properties;

 /**
@@ -16,6 +19,16 @@ public class ContainerConfig {
  private String podName;
  private int port;
  private Properties properties;
+  private Configuration configuration;
+
+  public ContainerConfig() {
+    this.configuration = Config.asConfiguration();
+    this.active = configuration.getBool("ebean.cluster.active", active);
+    this.serviceName = configuration.getNullable("ebean.cluster.serviceName", serviceName);
+    this.namespace = configuration.getNullable("ebean.cluster.namespace", namespace);
+    this.podName = configuration.getNullable("ebean.cluster.podName", podName);
+    this.port = configuration.getInt("ebean.cluster.port", 0);
+  }

  /**
   * Return the service name.
@@ -91,7 +104,7 @@ public class ContainerConfig {
   * Return the deployment properties.
   */
  public Properties getProperties() {
-    return properties;
+    return properties != null ? properties : configuration.asProperties();
  }

  /**
@@ -101,25 +114,4 @@ public class ContainerConfig {
    this.properties = properties;
  }

-  /**
-   * Load the settings from properties.
-   */
-  public void loadFromProperties(Properties properties) {
-    this.properties = properties;
-    this.active = getProperty(properties, "ebean.cluster.active", active);
-    this.serviceName = properties.getProperty("ebean.cluster.serviceName", serviceName);
-    this.namespace = properties.getProperty("ebean.cluster.namespace", namespace);
-    this.podName = properties.getProperty("ebean.cluster.podName", podName);
-    String portParam = properties.getProperty("ebean.cluster.port");
-    if (portParam != null) {
-      this.port = Integer.parseInt(portParam);
-    }
-  }
-
-  /**
-   * Return the boolean property setting.
-   */
-  protected boolean getProperty(Properties properties, String key, boolean defaultValue) {
-    return "true".equalsIgnoreCase(properties.getProperty(key, Boolean.toString(defaultValue)));
-  }
 }
@@ -16,6 +16,8 @@ import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricNamingMatch;
 import io.ebean.util.StringHelper;
 import jakarta.persistence.EnumType;
@@ -123,12 +125,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private boolean loadModuleInfo = true;

-  /**
-   * When true then include a sql comment in generated SELECT queries with the query
-   * label or profile location label.
-   */
-  private boolean includeLabelInSql;
-
  /**
   * Interesting classes such as entities, embedded, ScalarTypes,
   * Listeners, Finders, Controllers, AttributeConverters etc.
@@ -141,6 +137,16 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private List<String> packages = new ArrayList<>();

+  /**
+   * Configuration for the ElasticSearch integration.
+   */
+  private DocStoreConfig docStoreConfig = new DocStoreConfig();
+
+  /**
+   * Set to true when the Database only uses Document store.
+   */
+  private boolean docStoreOnly;
+
  /**
   * This is used to populate @WhoCreated, @WhoModified and
   * support other audit features (who executed a query etc).
@@ -230,7 +236,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private PersistBatch persistBatchOnCascade = PersistBatch.INHERIT;

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

  private EnumType defaultEnumType = EnumType.ORDINAL;

@@ -415,6 +421,8 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
  private ChangeLogListener changeLogListener;
  private ChangeLogRegister changeLogRegister;
  private boolean changeLogAsync = true;
+  private ReadAuditLogger readAuditLogger;
+  private ReadAuditPrepare readAuditPrepare;
  private EncryptKeyManager encryptKeyManager;
  private EncryptDeployManager encryptDeployManager;
  private Encryptor encryptor;
@@ -537,8 +545,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {

  private String dumpMetricsOptions;

-  private LengthCheck lengthCheck = LengthCheck.OFF;
-
  private Function<String, String> metricNaming = MetricNamingMatch.INSTANCE;

  /**
@@ -988,6 +994,28 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

+  @Override
+  public ReadAuditLogger getReadAuditLogger() {
+    return readAuditLogger;
+  }
+
+  @Override
+  public DatabaseConfig setReadAuditLogger(ReadAuditLogger readAuditLogger) {
+    this.readAuditLogger = readAuditLogger;
+    return this;
+  }
+
+  @Override
+  public ReadAuditPrepare getReadAuditPrepare() {
+    return readAuditPrepare;
+  }
+
+  @Override
+  public DatabaseConfig setReadAuditPrepare(ReadAuditPrepare readAuditPrepare) {
+    this.readAuditPrepare = readAuditPrepare;
+    return this;
+  }
+
  @Override
  public ProfilingConfig getProfilingConfig() {
    return profilingConfig;
@@ -1262,6 +1290,28 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    }
  }

+  @Override
+  public boolean isDocStoreOnly() {
+    return docStoreOnly;
+  }
+
+  @Override
+  public DatabaseConfig setDocStoreOnly(boolean docStoreOnly) {
+    this.docStoreOnly = docStoreOnly;
+    return this;
+  }
+
+  @Override
+  public DocStoreConfig getDocStoreConfig() {
+    return docStoreConfig;
+  }
+
+  @Override
+  public DatabaseConfig setDocStoreConfig(DocStoreConfig docStoreConfig) {
+    this.docStoreConfig = docStoreConfig;
+    return this;
+  }
+
  @Override
  public DbConstraintNaming getConstraintNaming() {
    return platformConfig.getConstraintNaming();
@@ -2034,6 +2084,13 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    readOnlyDataSourceConfig.loadSettings(p.properties, name + "-ro");
  }

+  /**
+   * This is broken out to allow overridden behaviour.
+   */
+  protected void loadDocStoreSettings(PropertiesWrapper p) {
+    docStoreConfig.loadSettings(p);
+  }
+
  /**
   * This is broken out to allow overridden behaviour.
   */
@@ -2065,11 +2122,15 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    }
    loadDataSourceSettings(p);

+    if (docStoreConfig == null) {
+      docStoreConfig = new DocStoreConfig();
+    }
+    loadDocStoreSettings(p);
+
    defaultServer = p.getBoolean("defaultServer", defaultServer);
    readOnlyDatabase = p.getBoolean("readOnlyDatabase", readOnlyDatabase);
    autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
    loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
-    includeLabelInSql = p.getBoolean("includeLabelInSql", includeLabelInSql);
    maxCallStack = p.getInt("maxCallStack", maxCallStack);
    dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
    dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
@@ -2081,6 +2142,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs);
    queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
    queryPlanCaptureMaxCount = p.getInt("queryPlan.captureMaxCount", queryPlanCaptureMaxCount);
+    docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
    enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
@@ -2133,7 +2195,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    jdbcFetchSizeFindEach = p.getInt("jdbcFetchSizeFindEach", jdbcFetchSizeFindEach);
    jdbcFetchSizeFindList = p.getInt("jdbcFetchSizeFindList", jdbcFetchSizeFindList);
    databasePlatformName = p.get("databasePlatformName", databasePlatformName);
-    lengthCheck = p.getEnum(LengthCheck.class, "lengthCheck", lengthCheck);

    uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
    uuidStateFile = p.get("uuidStateFile", uuidStateFile);
@@ -2483,11 +2544,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return loadModuleInfo;
  }

-  @Override
-  public boolean isIncludeLabelInSql() {
-    return includeLabelInSql;
-  }
-
  /**
   * @deprecated - migrate to {@link #isLoadModuleInfo()}.
   */
@@ -2504,12 +2560,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  @Override
-  public DatabaseConfig includeLabelInSql(boolean includeLabelInSql) {
-    this.includeLabelInSql = includeLabelInSql;
-    return this;
-  }
-
  @Override
  public Function<String, String> getMetricNaming() {
    return metricNaming;
@@ -2521,19 +2571,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  /**
-   * Returns the length check mode.
-   */
-  public LengthCheck getLengthCheck() {
-    return lengthCheck;
-  }
-
-  @Override
-  public DatabaseConfig lengthCheck(LengthCheck lengthCheck) {
-    this.lengthCheck = lengthCheck;
-    return this;
-  }
-
  public enum UuidVersion {
    VERSION4,
    VERSION1,
@@ -0,0 +1,320 @@
+package io.ebean.config;
+
+import io.ebean.Transaction;
+import io.ebean.annotation.DocStoreMode;
+
+/**
+ * Configuration for the Document store integration (e.g. ElasticSearch).
+ */
+public class DocStoreConfig {
+
+  /**
+   * True when the Document store integration is active/on.
+   */
+  protected boolean active;
+
+  /**
+   * Set to true means Ebean will generate mapping files on startup.
+   */
+  protected boolean generateMapping;
+
+  /**
+   * When true the Document store should drop and re-create document indexes.
+   */
+  protected boolean dropCreate;
+
+  /**
+   * When true the Document store should create any document indexes that don't already exist.
+   */
+  protected boolean create;
+
+  /**
+   * The URL of the Document store. For example: http://localhost:9200.
+   */
+  protected String url;
+
+  /**
+   * Credential that be used for authentication to document store.
+   */
+  protected String username;
+
+  /**
+   * Password credential that be used for authentication to document store.
+   */
+  protected String password;
+
+  /**
+   * Set to true such that the client allows connections to invalid/self signed SSL certificates.
+   */
+  protected boolean allowAllCertificates;
+
+  /**
+   * The default mode used by indexes.
+   */
+  protected DocStoreMode persist = DocStoreMode.UPDATE;
+
+  /**
+   * The default batch size to use for the Bulk API calls.
+   */
+  protected int bulkBatchSize = 1000;
+
+  /**
+   * Resource path for the Document store mapping files.
+   */
+  protected String mappingPath;
+
+  /**
+   * Suffix used for mapping files.
+   */
+  protected String mappingSuffix;
+
+  /**
+   * Location of resources that mapping files are generated into.
+   */
+  protected String pathToResources = "src/main/resources";
+
+  /**
+   * Return true if the Document store (ElasticSearch) integration is active.
+   */
+  public boolean isActive() {
+    String systemValue = System.getProperty("ebean.docstore.active");
+    if (systemValue != null) {
+      return Boolean.parseBoolean(systemValue);
+    }
+    return active;
+  }
+
+  /**
+   * Set to true to make the Document store (ElasticSearch) integration active.
+   */
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
+  /**
+   * Return the URL to the Document store.
+   */
+  public String getUrl() {
+    String systemValue = System.getProperty("ebean.docstore.url");
+    if (systemValue != null) {
+      return systemValue;
+    }
+    return url;
+  }
+
+  /**
+   * Return the user credential for connecting to the document store.
+   */
+  public String getUsername() {
+    return username;
+  }
+
+  /**
+   * Set the user credential for connecting to the document store.
+   */
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  /**
+   * Return the password credential for connecting to the document store.
+   */
+  public String getPassword() {
+    return password;
+  }
+
+  /**
+   * Set the password credential for connecting to the document store.
+   */
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  /**
+   * Set the URL to the Document store.
+   * <p>
+   * For a local ElasticSearch server this would be: http://localhost:9200
+   */
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
+  /**
+   * Return true if Ebean should generate mapping files on server startup.
+   */
+  public boolean isGenerateMapping() {
+    String systemValue = System.getProperty("ebean.docstore.generateMapping");
+    if (systemValue != null) {
+      return Boolean.parseBoolean(systemValue);
+    }
+    return generateMapping;
+  }
+
+  /**
+   * Set to true if Ebean should generate mapping files on server startup.
+   */
+  public void setGenerateMapping(boolean generateMapping) {
+    this.generateMapping = generateMapping;
+  }
+
+  /**
+   * Return true if the document store should recreate mapped indexes.
+   */
+  public boolean isDropCreate() {
+    String systemValue = System.getProperty("ebean.docstore.dropCreate");
+    if (systemValue != null) {
+      return Boolean.parseBoolean(systemValue);
+    }
+    return dropCreate;
+  }
+
+  /**
+   * Set to true if the document store should recreate mapped indexes.
+   */
+  public void setDropCreate(boolean dropCreate) {
+    this.dropCreate = dropCreate;
+  }
+
+  /**
+   * Create true if the document store should create mapped indexes that don't yet exist.
+   * This is only used if dropCreate is false.
+   */
+  public boolean isCreate() {
+    String systemValue = System.getProperty("ebean.docstore.create");
+    if (systemValue != null) {
+      return Boolean.parseBoolean(systemValue);
+    }
+    return create;
+  }
+
+  /**
+   * Set to true if the document store should create mapped indexes that don't yet exist.
+   * This is only used if dropCreate is false.
+   */
+  public void setCreate(boolean create) {
+    this.create = create;
+  }
+
+  /**
+   * Return true if the client allows connections to invalid/self signed SSL certificates.
+   */
+  public boolean isAllowAllCertificates() {
+    return allowAllCertificates;
+  }
+
+  /**
+   * Set to true such that the client allows connections to invalid/self signed SSL certificates.
+   */
+  public void setAllowAllCertificates(boolean allowAllCertificates) {
+    this.allowAllCertificates = allowAllCertificates;
+  }
+
+  /**
+   * Return the default batch size to use for calls to the Bulk API.
+   */
+  public int getBulkBatchSize() {
+    return bulkBatchSize;
+  }
+
+  /**
+   * Set the default batch size to use for calls to the Bulk API.
+   * <p>
+   * The batch size can be set on a transaction via {@link Transaction#setDocStoreBatchSize(int)}.
+   * </p>
+   */
+  public void setBulkBatchSize(int bulkBatchSize) {
+    this.bulkBatchSize = bulkBatchSize;
+  }
+
+  /**
+   * Return the mapping path.
+   */
+  public String getMappingPath() {
+    return mappingPath;
+  }
+
+  /**
+   * Set the mapping path.
+   */
+  public void setMappingPath(String mappingPath) {
+    this.mappingPath = mappingPath;
+  }
+
+  /**
+   * Return the mapping suffix.
+   */
+  public String getMappingSuffix() {
+    return mappingSuffix;
+  }
+
+  /**
+   * Set the mapping suffix.
+   */
+  public void setMappingSuffix(String mappingSuffix) {
+    this.mappingSuffix = mappingSuffix;
+  }
+
+  /**
+   * Return the relative file system path to resources when generating mapping files.
+   */
+  public String getPathToResources() {
+    return pathToResources;
+  }
+
+  /**
+   * Set the relative file system path to resources when generating mapping files.
+   */
+  public void setPathToResources(String pathToResources) {
+    this.pathToResources = pathToResources;
+  }
+
+  /**
+   * Return the default behavior for when Insert, Update and Delete events occur on beans that have an associated
+   * Document store.
+   */
+  public DocStoreMode getPersist() {
+    return persist;
+  }
+
+  /**
+   * Set the default behavior for when Insert, Update and Delete events occur on beans that have an associated
+   * Document store.
+   * <ul>
+   * <li>DocStoreEvent.UPDATE - build and send message to Bulk API</li>
+   * <li>DocStoreEvent.QUEUE - add an entry with the index type and id only into a queue for later processing</li>
+   * <li>DocStoreEvent.IGNORE - ignore. Most likely used when some scheduled batch job handles updating the index</li>
+   * </ul>
+   * <p>
+   * You might choose to use QUEUE if that particular index data is updating very frequently or the cost of indexing
+   * is expensive.  Setting it to QUEUE can mean many changes can be batched together potentially coalescing multiple
+   * updates for an index entry into a single update.
+   * </p>
+   * <p>
+   * You might choose to use IGNORE when you have your own external process for updating the indexes. In this case
+   * you don't want Ebean to do anything when the data changes.
+   * </p>
+   */
+  public void setPersist(DocStoreMode persist) {
+    this.persist = persist;
+  }
+
+  /**
+   * Load settings specified in properties files.
+   */
+  public void loadSettings(PropertiesWrapper properties) {
+
+    active = properties.getBoolean("docstore.active", active);
+    url = properties.get("docstore.url", url);
+    username = properties.get("docstore.username", url);
+    password = properties.get("docstore.password", url);
+    persist = properties.getEnum(DocStoreMode.class, "docstore.persist", persist);
+    bulkBatchSize = properties.getInt("docstore.bulkBatchSize", bulkBatchSize);
+    generateMapping = properties.getBoolean("docstore.generateMapping", generateMapping);
+    dropCreate = properties.getBoolean("docstore.dropCreate", dropCreate);
+    create = properties.getBoolean("docstore.create", create);
+    allowAllCertificates = properties.getBoolean("docstore.allowAllCertificates", allowAllCertificates);
+    mappingPath = properties.get("docstore.mappingPath", mappingPath);
+    mappingSuffix = properties.get("docstore.mappingSuffix", mappingSuffix);
+    pathToResources = properties.get("docstore.pathToResources", pathToResources);
+  }
+}
@@ -1,22 +0,0 @@
-package io.ebean.config;
-
-/**
- * Defines the length-check mode.
- *
- * @author Roland Praml, FOCONIS AG
- */
-public enum LengthCheck {
-  /**
-   * By default, length checking is off. This means, strings/jsons and files are passed to the DB and the DB might or might not check the length.
-   * The DB has to check the data length. Note this is not possible for certain datatypes (e.g. clob without size)
-   */
-  OFF,
-  /**
-   * When enabling length check, ebean validates strings/json strings and files before saving them to DB.
-   */
-  ON,
-  /**
-   * Same as "ON", but take the UTF8-bytelength for validation. This may be useful, if you have an UTF8 based charset (default for DB2)
-   */
-  UTF8
-}
@@ -1,29 +1,50 @@
 package io.ebean.config;

-import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;

-import java.util.List;
-
 /**
- * The data for the slow query.
+ * Slow query event.
 */
-public interface SlowQueryEvent {
+public class SlowQueryEvent {
+
+  private final String sql;
+
+  private final long timeMillis;
+
+  private final int rowCount;
+
+  private final ObjectGraphNode originNode;
+
+  /**
+   * Construct with the SQL and execution time in millis.
+   */
+  public SlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode) {
+    this.sql = sql;
+    this.timeMillis = timeMillis;
+    this.rowCount = rowCount;
+    this.originNode = originNode;
+  }

  /**
   * Return the SQL for the slow query.
   */
-  String getSql();
+  public String getSql() {
+    return sql;
+  }

  /**
   * Return the execution time in millis.
   */
-  long getTimeMillis();
+  public long getTimeMillis() {
+    return timeMillis;
+  }

  /**
   * Return the total row count associated with the query.
   */
-  int getRowCount();
+  public int getRowCount() {
+    return rowCount;
+  }

  /**
   * Return the origin point for the root query.
@@ -32,20 +53,7 @@ public interface SlowQueryEvent {
   * shows the code that invoked the query.
   * </p>
   */
-  ObjectGraphNode getOriginNode();
-
-  /**
-   * Return the bind parameters.
-   */
-  List<Object> getBindParams();
-
-  /**
-   * Return the label.
-   */
-  String getLabel();
-
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
+  public ObjectGraphNode getOriginNode() {
+    return originNode;
+  }
 }
@@ -769,15 +769,4 @@ public class DatabasePlatform {
  public boolean supportsNativeJavaTime() {
    return supportsNativeJavaTime;
  }
-
-  public String inlineSqlComment(String label) {
-    if (label == null) {
-      return "";
-    }
-    return "/* " + label + " */ ";
-  }
-
-  public String inlineSqlHint(String hint) {
-    return "/*+ " + hint + " */ ";
-  }
 }
@@ -0,0 +1,7 @@
+package io.ebean.docstore;
+
+/**
+ * Document Mapping for a bean marker interface.
+ */
+public interface DocMapping {
+}
@@ -0,0 +1,7 @@
+package io.ebean.docstore;
+
+/**
+ * Document query request context marker interface.
+ */
+public interface DocQueryContext<T> {
+}
@@ -0,0 +1,7 @@
+package io.ebean.docstore;
+
+/**
+ * Document update context marker interface.
+ */
+public interface DocUpdateContext {
+}
@@ -0,0 +1,102 @@
+package io.ebean.docstore;
+
+import java.util.Map;
+
+/**
+ * Raw document.
+ */
+public class RawDoc {
+
+  private Map<String, Object> source;
+  private String id;
+  private double score;
+  private String index;
+  private String type;
+
+  /**
+   * Construct the document with all the meta data.
+   */
+  public RawDoc(Map<String, Object> source, String id, double score, String index, String type) {
+    this.source = source;
+    this.id = id;
+    this.score = score;
+    this.index = index;
+    this.type = type;
+  }
+
+  /**
+   * Construct empty (typically for JSON marshalling).
+   */
+  public RawDoc() {
+  }
+
+  /**
+   * Return the source document as a Map.
+   */
+  public Map<String, Object> getSource() {
+    return source;
+  }
+
+  /**
+   * Return the Id value.
+   */
+  public String getId() {
+    return id;
+  }
+
+  /**
+   * Return the score.
+   */
+  public double getScore() {
+    return score;
+  }
+
+  /**
+   * Return the index name.
+   */
+  public String getIndex() {
+    return index;
+  }
+
+  /**
+   * Return the index type.
+   */
+  public String getType() {
+    return type;
+  }
+
+  /**
+   * Set the source document.
+   */
+  public void setSource(Map<String, Object> source) {
+    this.source = source;
+  }
+
+  /**
+   * Set the id value.
+   */
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  /**
+   * Set the score.
+   */
+  public void setScore(double score) {
+    this.score = score;
+  }
+
+  /**
+   * Set the index name.
+   */
+  public void setIndex(String index) {
+    this.index = index;
+  }
+
+  /**
+   * Set the index type.
+   */
+  public void setType(String type) {
+    this.type = type;
+  }
+}
@@ -8,7 +8,6 @@ import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
@@ -24,7 +23,7 @@ public final class ShutdownManager {

  private static final System.Logger log = EbeanVersion.log;
  private static final ReentrantLock lock = new ReentrantLock();
-  private static final List<Database> databases = Collections.synchronizedList(new ArrayList<>());
+  private static final List<Database> databases = new ArrayList<>();
  private static final ShutdownHook shutdownHook = new ShutdownHook();

  private static boolean stopping;
@@ -178,7 +177,12 @@ public final class ShutdownManager {
   * Register an ebeanServer to be shutdown when the JVM is shutdown.
   */
  public static void registerDatabase(Database server) {
-    databases.add(server);
+    lock.lock();
+    try {
+      databases.add(server);
+    } finally {
+      lock.unlock();
+    }
  }

  /**
@@ -188,7 +192,12 @@ public final class ShutdownManager {
   * </p>
   */
  public static void unregisterDatabase(Database server) {
-    databases.remove(server);
+    lock.lock();
+    try {
+      databases.remove(server);
+    } finally {
+      lock.unlock();
+    }
  }

  private static class ShutdownHook extends Thread {
@@ -0,0 +1,37 @@
+package io.ebean.event.readaudit;
+
+/**
+ * Log that the query was executed
+ */
+public interface ReadAuditLogger {
+
+  /**
+   * Called when a new query plan is created.
+   * <p>
+   * The query plan has the full sql and logging the query plan separately means that each of
+   * the bean and many read events can log the query plan key and not the full sql (reducing the
+   * bulk size of the read audit logs).
+   * </p>
+   */
+  void queryPlan(ReadAuditQueryPlan queryPlan);
+
+  /**
+   * Audit a find bean query that returned a bean.
+   * <p>
+   * Finds that did not return a bean are excluded.
+   * </p>
+   */
+  void auditBean(ReadEvent readBean);
+
+  /**
+   * Audit a find many query that returned some beans.
+   * <p>
+   * Finds that did not return any beans are excluded.
+   * </p>
+   * <p>
+   * For large queries executed via findEach() etc the ids are collected in batches
+   * and logged. Hence the ids list has a maximum size of the batch size.
+   * </p>
+   */
+  void auditMany(ReadEvent readMany);
+}
@@ -0,0 +1,23 @@
+package io.ebean.event.readaudit;
+
+/**
+ * Set user context information into the read event prior to it being logged.
+ */
+public interface ReadAuditPrepare {
+
+  /**
+   * Prepare the read event by setting any user context information into the read event such as the
+   * application user id and ip address.
+   * <p>
+   * This method is called prior to the read event being sent to the ReadAuditLogger.
+   * </p>
+   * <p>
+   * Note that for findFutureList() queries prepare() is called early in the foreground thread
+   * prior to the query executing and at that point the ReadEvent bean only has the bean type
+   * and no other details (which are populated later when the query is executed in the background
+   * thread).
+   * </p>
+   */
+  void prepare(ReadEvent readEvent);
+
+}
@@ -0,0 +1,97 @@
+package io.ebean.event.readaudit;
+
+/**
+ * A SQL query and associated keys.
+ * <p>
+ * This is logged as a separate event so that the
+ * </p>
+ */
+public class ReadAuditQueryPlan {
+
+  String beanType;
+
+  String queryKey;
+
+  String sql;
+
+  /**
+   * Construct given the beanType, queryKey and sql.
+   */
+  public ReadAuditQueryPlan(String beanType, String queryKey, String sql) {
+    this.beanType = beanType;
+    this.queryKey = queryKey;
+    this.sql = sql;
+  }
+
+  /**
+   * Construct for JSON tools.
+   */
+  public ReadAuditQueryPlan() {
+  }
+
+  @Override
+  public String toString() {
+    return "beanType:" + beanType + " queryKey:" + queryKey + " sql:" + sql;
+  }
+
+  /**
+   * Return the bean type.
+   */
+  public String getBeanType() {
+    return beanType;
+  }
+
+  /**
+   * Set the bean type.
+   */
+  public void setBeanType(String beanType) {
+    this.beanType = beanType;
+  }
+
+  /**
+   * Return the query key (relative to the bean type).
+   */
+  public String getQueryKey() {
+    return queryKey;
+  }
+
+  /**
+   * Set the query key.
+   */
+  public void setQueryKey(String queryKey) {
+    this.queryKey = queryKey;
+  }
+
+  /**
+   * Return the sql statement.
+   */
+  public String getSql() {
+    return sql;
+  }
+
+  /**
+   * Set the sql statement.
+   */
+  public void setSql(String sql) {
+    this.sql = sql;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    ReadAuditQueryPlan that = (ReadAuditQueryPlan) o;
+    if (!beanType.equals(that.beanType)) return false;
+    if (!queryKey.equals(that.queryKey)) return false;
+    return sql.equals(that.sql);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = beanType.hashCode();
+    result = 92821 * result + queryKey.hashCode();
+    result = 92821 * result + sql.hashCode();
+    return result;
+  }
+}
@@ -0,0 +1,261 @@
+package io.ebean.event.readaudit;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Read event sent to the ReadEventLogger.
+ * <p>
+ * This is a flattened in that it contains either a read bean or list of beans. It is flattened
+ * in this way to simplify logging and processing and simply means that it either contains an
+ * id or a list of ids.
+ * </p>
+ */
+public class ReadEvent {
+
+  /**
+   * User defined 'source' such as the application name.
+   */
+  protected String source;
+
+  /**
+   * Application user id expected to be optionally populated by ChangeLogPrepare.
+   */
+  protected String userId;
+
+  /**
+   * Application user ip address expected to be optionally populated by ChangeLogPrepare.
+   */
+  protected String userIpAddress;
+
+  /**
+   * Arbitrary user context information expected to be optionally populated by ChangeLogPrepare.
+   */
+  protected Map<String, String> userContext;
+
+  /**
+   * The time the bean change was created.
+   */
+  protected long eventTime;
+
+  /**
+   * The type of the bean(s) read.
+   */
+  protected String beanType;
+
+  /**
+   * The query key (relative to the bean type).
+   */
+  protected String queryKey;
+
+  /**
+   * The bind log when the query was executed.
+   */
+  protected String bindLog;
+
+  /**
+   * The id of the bean read.
+   */
+  protected Object id;
+
+  /**
+   * The ids of the beans read.
+   */
+  protected List<Object> ids;
+
+  /**
+   * Common constructor for single bean and multi-bean read events.
+   */
+  protected ReadEvent(String beanType, String queryKey, String bindLog) {
+    this.beanType = beanType;
+    this.queryKey = queryKey;
+    this.bindLog = bindLog;
+    this.eventTime = System.currentTimeMillis();
+  }
+
+  /**
+   * Construct for a single bean read.
+   */
+  public ReadEvent(String beanType, String queryKey, String bindLog, Object id) {
+    this(beanType, queryKey, bindLog);
+    this.id = id;
+  }
+
+  /**
+   * Construct for many beans read.
+   */
+  public ReadEvent(String beanType, String queryKey, String bindLog, List<Object> ids) {
+    this(beanType, queryKey, bindLog);
+    this.ids = ids;
+  }
+
+  /**
+   * Construct for many future list query.
+   */
+  public ReadEvent(String beanType) {
+    this.beanType = beanType;
+    this.eventTime = System.currentTimeMillis();
+  }
+
+  /**
+   * Constructor for JSON tools.
+   */
+  public ReadEvent() {
+  }
+
+  /**
+   * Return a code that identifies the source of the change (like the name of the application).
+   */
+  public String getSource() {
+    return source;
+  }
+
+  /**
+   * Set the source of the change (like the name of the application).
+   */
+  public void setSource(String source) {
+    this.source = source;
+  }
+
+  /**
+   * Return the application user Id.
+   */
+  public String getUserId() {
+    return userId;
+  }
+
+  /**
+   * Set the application user Id.
+   * <p>
+   * This can be set by the ChangeLogListener in the prepare() method which is called
+   * in the foreground thread.
+   * </p>
+   */
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  /**
+   * Return the application users ip address.
+   */
+  public String getUserIpAddress() {
+    return userIpAddress;
+  }
+
+  /**
+   * Set the application users ip address.
+   * <p>
+   * This can be set by the ChangeLogListener in the prepare() method which is called
+   * in the foreground thread.
+   * </p>
+   */
+  public void setUserIpAddress(String userIpAddress) {
+    this.userIpAddress = userIpAddress;
+  }
+
+  /**
+   * Return a user context value - anything you set yourself in ChangeLogListener prepare().
+   */
+  public Map<String, String> getUserContext() {
+    if (userContext == null) {
+      userContext = new LinkedHashMap<>();
+    }
+    return userContext;
+  }
+
+  /**
+   * Set a user context value (anything you like).
+   * <p>
+   * This can be set by the ChangeLogListener in the prepare() method which is called
+   * in the foreground thread.
+   * </p>
+   */
+  public void setUserContext(Map<String, String> userContext) {
+    this.userContext = userContext;
+  }
+
+  /**
+   * Return the type of bean read.
+   */
+  public String getBeanType() {
+    return beanType;
+  }
+
+  /**
+   * Set the type of bean read.
+   */
+  public void setBeanType(String beanType) {
+    this.beanType = beanType;
+  }
+
+  /**
+   * Return the query key (relative to the bean type).
+   */
+  public String getQueryKey() {
+    return queryKey;
+  }
+
+  /**
+   * Set the query key (relative to the bean type).
+   */
+  public void setQueryKey(String queryKey) {
+    this.queryKey = queryKey;
+  }
+
+  /**
+   * Return the bind log used when executing the query.
+   */
+  public String getBindLog() {
+    return bindLog;
+  }
+
+  /**
+   * Set the bind log used when executing the query.
+   */
+  public void setBindLog(String bindLog) {
+    this.bindLog = bindLog;
+  }
+
+  /**
+   * Return the event date time.
+   */
+  public long getEventTime() {
+    return eventTime;
+  }
+
+  /**
+   * Set the event date time.
+   */
+  public void setEventTime(long eventTime) {
+    this.eventTime = eventTime;
+  }
+
+  /**
+   * Return the id of the bean read.
+   */
+  public Object getId() {
+    return id;
+  }
+
+  /**
+   * Set the id of the bean read.
+   */
+  public void setId(Object id) {
+    this.id = id;
+  }
+
+  /**
+   * Return the ids of the beans read.
+   */
+  public List<Object> getIds() {
+    return ids;
+  }
+
+  /**
+   * Set the ids of the beans read.
+   */
+  public void setIds(List<Object> ids) {
+    this.ids = ids;
+  }
+}
@@ -0,0 +1,8 @@
+/**
+ * Provides Auditing of read events including queries and L2 cache.
+ * <p>
+ * Provides a built support for supplied an audit of all the 'read events' for beans annotated
+ * with <code>@ReadAudit</code>
+ * </p>
+ */
+package io.ebean.event.readaudit;
@@ -0,0 +1,72 @@
+package io.ebean.plugin;
+
+import io.ebean.FetchPath;
+import io.ebean.Query;
+import io.ebean.docstore.DocUpdateContext;
+
+import java.io.IOException;
+
+/**
+ * Doc store functions for a specific entity bean type.
+ *
+ * @param <T> The type of entity bean
+ */
+public interface BeanDocType<T> {
+
+  /**
+   * Return the doc store index type for this bean type.
+   */
+  String indexType();
+
+  /**
+   * Return the doc store index name for this bean type.
+   */
+  String indexName();
+
+  /**
+   * Apply the appropriate fetch path to the query such that the query returns beans matching
+   * the document store structure with the expected embedded properties.
+   */
+  void applyPath(Query<T> spiQuery);
+
+  /**
+   * Return the FetchPath for the embedded document.
+   */
+  FetchPath embedded(String path);
+
+  /**
+   * For embedded 'many' properties we need a FetchPath relative to the root which is used to
+   * build and replace the embedded list.
+   */
+  FetchPath embeddedManyRoot(String path);
+
+  /**
+   * Return a 'raw' property mapped for the given property.
+   * If none exists the given property is returned.
+   */
+  String rawProperty(String property);
+
+  /**
+   * Store the bean in the doc store index.
+   * <p>
+   * This somewhat assumes the bean is fetched with appropriate path properties
+   * to match the expected document structure.
+   */
+  void index(Object idValue, T bean, DocUpdateContext txn) throws IOException;
+
+  /**
+   * Add a delete by Id to the doc store.
+   */
+  void deleteById(Object idValue, DocUpdateContext txn) throws IOException;
+
+  /**
+   * Add a embedded document update to the doc store.
+   *
+   * @param idValue            the Id value of the bean holding the embedded document
+   * @param embeddedProperty   the embedded property
+   * @param embeddedRawContent the content of the embedded document in JSON form
+   * @param txn                the doc store transaction to add the update to
+   */
+  void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException;
+
+}
@@ -2,12 +2,15 @@ package io.ebean.plugin;

 import io.ebean.Query;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.docstore.DocMapping;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;

 import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;

 /**
 * Information and methods on BeanDescriptors made available to plugins.
@@ -142,4 +145,73 @@ public interface BeanType<T> {
   */
  IdType idType();

+  /**
+   * Return true if this bean type has doc store backing.
+   */
+  boolean isDocStoreMapped();
+
+  /**
+   * Return the DocumentMapping for this bean type.
+   * <p>
+   * This is the document structure and mapping options for how this bean type is mapped
+   * for the document store.
+   * </p>
+   */
+  DocMapping docMapping();
+
+  /**
+   * Return the doc store queueId for this bean type.
+   */
+  String docStoreQueueId();
+
+  /**
+   * Return the doc store support for this bean type.\
+   */
+  BeanDocType<T> docStore();
+
+  /**
+   * Add the discriminator value to the query if needed.
+   */
+  void addInheritanceWhere(Query<?> query);
+
+  /**
+   * Return the root bean type for an inheritance hierarchy.
+   */
+  BeanType<?> root();
+
+  /**
+   * Return true if this bean type has an inheritance hierarchy.
+   */
+  boolean hasInheritance();
+
+  /**
+   * Return true if this object is the root level object in its entity
+   * inheritance.
+   */
+  boolean isInheritanceRoot();
+
+  /**
+   * Returns all direct children of this beantype
+   */
+  List<BeanType<?>> inheritanceChildren();
+
+  /**
+   * Returns the parent in inheritance hierarchy
+   */
+  BeanType<?> inheritanceParent();
+
+  /**
+   * Visit all children recursively
+   */
+  void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor);
+
+  /**
+   * Return the discriminator column.
+   */
+  String discColumn();
+
+  /**
+   * Create a bean given the discriminator value.
+   */
+  T createBeanUsingDisc(Object discValue);
 }
@@ -38,6 +38,11 @@ public interface SpiServer extends Database {
   */
  List<? extends BeanType<?>> beanTypes(String baseTableName);

+  /**
+   * Return the bean type for a given doc store queueId.
+   */
+  BeanType<?> beanTypeForQueueId(String queueId);
+
  /**
   * Return a BeanLoader.
   */
@@ -0,0 +1,98 @@
+package io.ebean.search;
+
+/**
+ * Options for the text match and multi match expressions.
+ */
+public abstract class AbstractMatch {
+
+  protected boolean operatorAnd;
+
+  protected String analyzer;
+
+  protected double boost;
+
+  protected String minShouldMatch;
+
+  protected int maxExpansions;
+
+  protected String zeroTerms;
+
+  protected double cutoffFrequency;
+
+  protected String fuzziness;
+
+  protected int prefixLength;
+
+  protected String rewrite;
+
+  /**
+   * Return true if using the AND operator otherwise using the OR operator.
+   */
+  public boolean isOperatorAnd() {
+    return operatorAnd;
+  }
+
+  /**
+   * Return the boost.
+   */
+  public double getBoost() {
+    return boost;
+  }
+
+  /**
+   * Return the minimum should match.
+   */
+  public String getMinShouldMatch() {
+    return minShouldMatch;
+  }
+
+  /**
+   * Return the zero terms option.
+   */
+  public String getZeroTerms() {
+    return zeroTerms;
+  }
+
+  /**
+   * Return the cutoff frequency.
+   */
+  public double getCutoffFrequency() {
+    return cutoffFrequency;
+  }
+
+  /**
+   * Return the max expansions.
+   */
+  public int getMaxExpansions() {
+    return maxExpansions;
+  }
+
+  /**
+   * Return the analyzer.
+   */
+  public String getAnalyzer() {
+    return analyzer;
+  }
+
+  /**
+   * Return the fuzziness.
+   */
+  public String getFuzziness() {
+    return fuzziness;
+  }
+
+  /**
+   * Return the prefix length.
+   */
+  public int getPrefixLength() {
+    return prefixLength;
+  }
+
+  /**
+   * Return the rewrite option.
+   */
+  public String getRewrite() {
+    return rewrite;
+  }
+
+}
@@ -0,0 +1,117 @@
+package io.ebean.search;
+
+/**
+ * Options for the text match expression.
+ */
+public class Match extends AbstractMatch {
+
+  protected boolean phrase;
+
+  protected boolean phrasePrefix;
+
+  public Match() {
+  }
+
+  /**
+   * Set this to be a "Phrase" type expression.
+   */
+  public Match phrase() {
+    phrase = true;
+    return this;
+  }
+
+  /**
+   * Set this to be a "Phrase Prefix" type expression.
+   */
+  public Match phrasePrefix() {
+    phrasePrefix = true;
+    return this;
+  }
+
+  /**
+   * Use the AND operator (rather than OR).
+   */
+  public Match opAnd() {
+    operatorAnd = true;
+    return this;
+  }
+
+  /**
+   * Use the OR operator (rather than AND).
+   */
+  public Match opOr() {
+    operatorAnd = false;
+    return this;
+  }
+
+  /**
+   * Set the zero terms.
+   */
+  public Match zeroTerms(String zeroTerms) {
+    this.zeroTerms = zeroTerms;
+    return this;
+  }
+
+  /**
+   * Set the cutoff frequency.
+   */
+  public Match cutoffFrequency(double cutoffFrequency) {
+    this.cutoffFrequency = cutoffFrequency;
+    return this;
+  }
+
+  /**
+   * Set the max expansions (for phrase prefix only).
+   */
+  public Match maxExpansions(int maxExpansions) {
+    this.maxExpansions = maxExpansions;
+    return this;
+  }
+
+  /**
+   * Set the Analyzer to use for this expression.
+   */
+  public Match analyzer(String analyzer) {
+    this.analyzer = analyzer;
+    return this;
+  }
+
+  /**
+   * Set the boost.
+   */
+  public Match boost(double boost) {
+    this.boost = boost;
+    return this;
+  }
+
+  /**
+   * Set the rewrite to use.
+   */
+  public Match minShouldMatch(String minShouldMatch) {
+    this.minShouldMatch = minShouldMatch;
+    return this;
+  }
+
+  /**
+   * Set the rewrite to use.
+   */
+  public Match rewrite(String rewrite) {
+    this.rewrite = rewrite;
+    return this;
+  }
+
+  /**
+   * Return true if this is a phrase query.
+   */
+  public boolean isPhrase() {
+    return phrase;
+  }
+
+  /**
+   * Return true if this is a phrase prefix query.
+   */
+  public boolean isPhrasePrefix() {
+    return phrasePrefix;
+  }
+
+}
@@ -0,0 +1,148 @@
+package io.ebean.search;
+
+/**
+ * Options for the text match expression.
+ */
+public class MultiMatch extends AbstractMatch {
+
+  /**
+   * The MultiMatch type.
+   */
+  public enum Type {
+    BEST_FIELDS,
+    MOST_FIELDS,
+    CROSS_FIELDS,
+    PHRASE,
+    PHRASE_PREFIX
+  }
+
+  protected final String[] fields;
+
+  protected Type type = Type.BEST_FIELDS;
+
+  protected double tieBreaker;
+
+  /**
+   * Create with the given fields.
+   */
+  public static MultiMatch fields(String... fields) {
+    return new MultiMatch(fields);
+  }
+
+  /**
+   * Construct with a set of fields.
+   */
+  public MultiMatch(String... fields) {
+    this.fields = fields;
+  }
+
+  /**
+   * Set the type of query.
+   */
+  public MultiMatch type(Type type) {
+    this.type = type;
+    return this;
+  }
+
+  /**
+   * Set the tieBreaker to use.
+   */
+  public MultiMatch tieBreaker(double tieBreaker) {
+    this.tieBreaker = tieBreaker;
+    return this;
+  }
+
+  /**
+   * Use the AND operator (rather than OR).
+   */
+  public MultiMatch opAnd() {
+    operatorAnd = true;
+    return this;
+  }
+
+  /**
+   * Use the OR operator (rather than AND).
+   */
+  public MultiMatch opOr() {
+    operatorAnd = false;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match value.
+   */
+  public MultiMatch minShouldMatch(String minShouldMatch) {
+    this.minShouldMatch = minShouldMatch;
+    return this;
+  }
+
+  /**
+   * Set the boost.
+   */
+  public MultiMatch boost(double boost) {
+    this.boost = boost;
+    return this;
+  }
+
+  /**
+   * Set the zero terms.
+   */
+  public MultiMatch zeroTerms(String zeroTerms) {
+    this.zeroTerms = zeroTerms;
+    return this;
+  }
+
+  /**
+   * Set the cutoff frequency.
+   */
+  public MultiMatch cutoffFrequency(double cutoffFrequency) {
+    this.cutoffFrequency = cutoffFrequency;
+    return this;
+  }
+
+  /**
+   * Set the max expansions (for phrase prefix only).
+   */
+  public MultiMatch maxExpansions(int maxExpansions) {
+    this.maxExpansions = maxExpansions;
+    return this;
+  }
+
+  /**
+   * Set the Analyzer to use for this expression.
+   */
+  public MultiMatch analyzer(String analyzer) {
+    this.analyzer = analyzer;
+    return this;
+  }
+
+  /**
+   * Set the rewrite to use.
+   */
+  public MultiMatch rewrite(String rewrite) {
+    this.rewrite = rewrite;
+    return this;
+  }
+
+  /**
+   * Return the type.
+   */
+  public Type getType() {
+    return type;
+  }
+
+  /**
+   * Return the fields to search.
+   */
+  public String[] getFields() {
+    return fields;
+  }
+
+  /**
+   * Return the tie breaker.
+   */
+  public double getTieBreaker() {
+    return tieBreaker;
+  }
+
+}
@@ -0,0 +1,139 @@
+package io.ebean.search;
+
+/**
+ * Text common terms query.
+ * <p>
+ * This maps to an ElasticSearch "common terms query".
+ * </p>
+ * <pre>{@code
+ *
+ *  TextCommonTerms options = new TextCommonTerms()
+ *    .cutoffFrequency(0.001)
+ *    .minShouldMatch("50%")
+ *    .lowFreqOperatorAnd(true)
+ *    .highFreqOperatorAnd(true);
+ *
+ *  List<Customer> customers = database.find(Customer.class)
+ *    .text()
+ *    .textCommonTerms("the brown", options)
+ *    .findList();
+ *
+ * }</pre>
+ * <pre>{@code
+ *
+ *   // ElasticSearch expression
+ *
+ *   "common": {
+ *     "body": {
+ *       "query": "the brown",
+ *       "cutoff_frequency": 0.001,
+ *       "low_freq_operator": "and",
+ *       "high_freq_operator": "and",
+ *       "minimum_should_match": "50%"
+ *     }
+ *   }
+ *
+ * }</pre>
+ */
+public class TextCommonTerms {
+
+  protected double cutoffFrequency;
+
+  protected boolean lowFreqOperatorAnd;
+  protected boolean highFreqOperatorAnd;
+
+  protected String minShouldMatch;
+  protected String minShouldMatchLowFreq;
+  protected String minShouldMatchHighFreq;
+
+  /**
+   * Set the cutoff frequency.
+   */
+  public TextCommonTerms cutoffFrequency(double cutoffFrequency) {
+    this.cutoffFrequency = cutoffFrequency;
+    return this;
+  }
+
+  /**
+   * Set to true if low frequency terms should use AND operator.
+   */
+  public TextCommonTerms lowFreqOperatorAnd(boolean opAnd) {
+    this.lowFreqOperatorAnd = opAnd;
+    return this;
+  }
+
+  /**
+   * Set to true if high frequency terms should use AND operator.
+   */
+  public TextCommonTerms highFreqOperatorAnd(boolean opAnd) {
+    this.highFreqOperatorAnd = opAnd;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match.
+   */
+  public TextCommonTerms minShouldMatch(String minShouldMatch) {
+    this.minShouldMatch = minShouldMatch;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match for low frequency terms.
+   */
+  public TextCommonTerms minShouldMatchLowFreq(String minShouldMatchLowFreq) {
+    this.minShouldMatchLowFreq = minShouldMatchLowFreq;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match for high frequency terms.
+   */
+  public TextCommonTerms minShouldMatchHighFreq(String minShouldMatchHighFreq) {
+    this.minShouldMatchHighFreq = minShouldMatchHighFreq;
+    return this;
+  }
+
+  /**
+   * Return true if low freq should use the AND operator.
+   */
+  public boolean isLowFreqOperatorAnd() {
+    return lowFreqOperatorAnd;
+  }
+
+  /**
+   * Return true if high freq should use the AND operator.
+   */
+  public boolean isHighFreqOperatorAnd() {
+    return highFreqOperatorAnd;
+  }
+
+  /**
+   * Return the cutoff frequency.
+   */
+  public double getCutoffFrequency() {
+    return cutoffFrequency;
+  }
+
+  /**
+   * Return the minimum to match.
+   */
+  public String getMinShouldMatch() {
+    return minShouldMatch;
+  }
+
+  /**
+   * Return the minimum to match for high frequency.
+   */
+  public String getMinShouldMatchHighFreq() {
+    return minShouldMatchHighFreq;
+  }
+
+  /**
+   * Return the minimum to match for low frequency.
+   */
+  public String getMinShouldMatchLowFreq() {
+    return minShouldMatchLowFreq;
+  }
+
+}
@@ -0,0 +1,398 @@
+package io.ebean.search;
+
+/**
+ * Text query string options.
+ * <p>
+ * This maps to an ElasticSearch "query string query".
+ * </p>
+ * <pre>{@code
+ *
+ *  TextQueryString options = new TextQueryString()
+ *       .analyzeWildcard(true)
+ *       .fields("name")
+ *       .lenient(true)
+ *       .opAnd();
+ *
+ *   List<Customer> customers = database.find(Customer.class)
+ *       .text()
+ *       .textSimple("quick brown", options)
+ *       .findList();
+ *
+ * }</pre>
+ * <pre>{@code
+ *
+ *  // just use default options
+ *  TextQueryString options = new TextQueryString();
+ *
+ *   List<Customer> customers = database.find(Customer.class)
+ *       .text()
+ *       .textSimple("quick brown", options)
+ *       .findList();
+ *
+ * }</pre>
+ */
+public class TextQueryString {
+
+  public static final int DEFAULT_FUZZY_MAX_EXPANSIONS = 50;
+
+  protected final String[] fields;
+
+  /**
+   * Only used when multiple fields set.
+   */
+  protected boolean useDisMax = true;
+
+  /**
+   * Only used when multiple fields set.
+   */
+  protected double tieBreaker;
+
+  protected String defaultField;
+
+  protected boolean operatorAnd;
+
+  protected String analyzer;
+
+  protected boolean allowLeadingWildcard = true;
+
+  protected boolean lowercaseExpandedTerms = true;
+
+  protected int fuzzyMaxExpansions = DEFAULT_FUZZY_MAX_EXPANSIONS;
+
+  protected String fuzziness;
+
+  protected int fuzzyPrefixLength;
+
+  protected double phraseSlop;
+
+  protected double boost;
+
+  protected boolean analyzeWildcard;
+
+  protected boolean autoGeneratePhraseQueries;
+
+  protected String minShouldMatch;
+
+  protected boolean lenient;
+
+  protected String locale;
+
+  protected String timeZone;
+
+  protected String rewrite;
+
+  /**
+   * Create with given fields.
+   */
+  public static TextQueryString fields(String... fields) {
+    return new TextQueryString(fields);
+  }
+
+  /**
+   * Construct with the fields to use.
+   */
+  public TextQueryString(String... fields) {
+    this.fields = fields;
+  }
+
+  /**
+   * Use the AND operator (rather than OR).
+   */
+  public TextQueryString opAnd() {
+    this.operatorAnd = true;
+    return this;
+  }
+
+  /**
+   * Use the OR operator (rather than AND).
+   */
+  public TextQueryString opOr() {
+    this.operatorAnd = false;
+    return this;
+  }
+
+  /**
+   * Set the locale.
+   */
+  public TextQueryString locale(String locale) {
+    this.locale = locale;
+    return this;
+  }
+
+  /**
+   * Set lenient mode.
+   */
+  public TextQueryString lenient(boolean lenient) {
+    this.lenient = lenient;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match.
+   */
+  public TextQueryString minShouldMatch(String minShouldMatch) {
+    this.minShouldMatch = minShouldMatch;
+    return this;
+  }
+
+  /**
+   * Set the analyzer.
+   */
+  public TextQueryString analyzer(String analyzer) {
+    this.analyzer = analyzer;
+    return this;
+  }
+
+  /**
+   * Set useDisMax option (when multiple fields only).
+   */
+  public TextQueryString useDisMax(boolean useDisMax) {
+    this.useDisMax = useDisMax;
+    return this;
+  }
+
+  /**
+   * Set tieBreaker option (when multiple fields only).
+   */
+  public TextQueryString tieBreaker(double tieBreaker) {
+    this.tieBreaker = tieBreaker;
+    return this;
+  }
+
+  /**
+   * Set the default field.
+   */
+  public TextQueryString defaultField(String defaultField) {
+    this.defaultField = defaultField;
+    return this;
+  }
+
+  /**
+   * Set allow leading wildcard mode.
+   */
+  public TextQueryString allowLeadingWildcard(boolean allowLeadingWildcard) {
+    this.allowLeadingWildcard = allowLeadingWildcard;
+    return this;
+  }
+
+  /**
+   * Set lowercase expanded terms mode.
+   */
+  public TextQueryString lowercaseExpandedTerms(boolean lowercaseExpandedTerms) {
+    this.lowercaseExpandedTerms = lowercaseExpandedTerms;
+    return this;
+  }
+
+  /**
+   * Set fuzzy max expansions.
+   */
+  public TextQueryString fuzzyMaxExpansions(int fuzzyMaxExpansions) {
+    this.fuzzyMaxExpansions = fuzzyMaxExpansions;
+    return this;
+  }
+
+  /**
+   * Set fuzziness.
+   */
+  public TextQueryString fuzziness(String fuzziness) {
+    this.fuzziness = fuzziness;
+    return this;
+  }
+
+  /**
+   * Set the fuzzy prefix length.
+   */
+  public TextQueryString fuzzyPrefixLength(int fuzzyPrefixLength) {
+    this.fuzzyPrefixLength = fuzzyPrefixLength;
+    return this;
+  }
+
+  /**
+   * Set the phrase slop.
+   */
+  public TextQueryString phraseSlop(double phraseSlop) {
+    this.phraseSlop = phraseSlop;
+    return this;
+  }
+
+  /**
+   * Set the boost.
+   */
+  public TextQueryString boost(double boost) {
+    this.boost = boost;
+    return this;
+  }
+
+  /**
+   * Set the analyze wildcard mode.
+   */
+  public TextQueryString analyzeWildcard(boolean analyzeWildcard) {
+    this.analyzeWildcard = analyzeWildcard;
+    return this;
+  }
+
+  /**
+   * Set the auto generate phrase queries mode.
+   */
+  public TextQueryString autoGeneratePhraseQueries(boolean autoGeneratePhraseQueries) {
+    this.autoGeneratePhraseQueries = autoGeneratePhraseQueries;
+    return this;
+  }
+
+  /**
+   * Set the time zone.
+   */
+  public TextQueryString timeZone(String timeZone) {
+    this.timeZone = timeZone;
+    return this;
+  }
+
+  /**
+   * Set the rewrite option.
+   */
+  public TextQueryString rewrite(String rewrite) {
+    this.rewrite = rewrite;
+    return this;
+  }
+
+  /**
+   * Return the rewrite option.
+   */
+  public String getRewrite() {
+    return rewrite;
+  }
+
+  /**
+   * Return the fields.
+   */
+  public String[] getFields() {
+    return fields;
+  }
+
+  /**
+   * Return true if AND is the default operator.
+   */
+  public boolean isOperatorAnd() {
+    return operatorAnd;
+  }
+
+  /**
+   * Return the analyzer.
+   */
+  public String getAnalyzer() {
+    return analyzer;
+  }
+
+  /**
+   * Return the locale.
+   */
+  public String getLocale() {
+    return locale;
+  }
+
+  /**
+   * Return lenient mode.
+   */
+  public boolean isLenient() {
+    return lenient;
+  }
+
+  /**
+   * Return the minimum should match.
+   */
+  public String getMinShouldMatch() {
+    return minShouldMatch;
+  }
+
+  /**
+   * Return the useDixMax mode.
+   */
+  public boolean isUseDisMax() {
+    return useDisMax;
+  }
+
+  /**
+   * Return the tie breaker.
+   */
+  public double getTieBreaker() {
+    return tieBreaker;
+  }
+
+  /**
+   * Return the default field.
+   */
+  public String getDefaultField() {
+    return defaultField;
+  }
+
+  /**
+   * Return the allow leading wildcard mode.
+   */
+  public boolean isAllowLeadingWildcard() {
+    return allowLeadingWildcard;
+  }
+
+  /**
+   * Return the lowercase expanded terms mode.
+   */
+  public boolean isLowercaseExpandedTerms() {
+    return lowercaseExpandedTerms;
+  }
+
+  /**
+   * Return the fuzzy max expansions.
+   */
+  public int getFuzzyMaxExpansions() {
+    return fuzzyMaxExpansions;
+  }
+
+  /**
+   * Return the fuzziness.
+   */
+  public String getFuzziness() {
+    return fuzziness;
+  }
+
+  /**
+   * Return the fuzzy prefix length.
+   */
+  public int getFuzzyPrefixLength() {
+    return fuzzyPrefixLength;
+  }
+
+  /**
+   * Return the phrase slop.
+   */
+  public double getPhraseSlop() {
+    return phraseSlop;
+  }
+
+  /**
+   * Return the analyze wildcard mode.
+   */
+  public boolean isAnalyzeWildcard() {
+    return analyzeWildcard;
+  }
+
+  /**
+   * Return the boost.
+   */
+  public double getBoost() {
+    return boost;
+  }
+
+  /**
+   * Return the auto generate phase queries mode.
+   */
+  public boolean isAutoGeneratePhraseQueries() {
+    return autoGeneratePhraseQueries;
+  }
+
+  /**
+   * Return the time zone.
+   */
+  public String getTimeZone() {
+    return timeZone;
+  }
+
+}
@@ -0,0 +1,193 @@
+package io.ebean.search;
+
+/**
+ * Simple text query options.
+ * <p>
+ * This maps to an ElasticSearch "simple text query".
+ * </p>
+ * <pre>{@code
+ *
+ *  TextSimple options = new TextSimple()
+ *       .analyzeWildcard(true)
+ *       .fields("name")
+ *       .lenient(true)
+ *       .opAnd();
+ *
+ *   List<Customer> customers = database.find(Customer.class)
+ *       .text()
+ *       .textSimple("quick brown", options)
+ *       .findList();
+ *
+ * }</pre>
+ */
+public class TextSimple {
+
+  protected String[] fields;
+
+  protected boolean operatorAnd;
+
+  protected String analyzer;
+
+  protected String flags;
+
+  protected boolean lowercaseExpandedTerms = true;
+
+  protected boolean analyzeWildcard;
+
+  protected String locale;
+
+  protected boolean lenient;
+
+  protected String minShouldMatch;
+
+  /**
+   * Construct
+   */
+  public TextSimple() {
+  }
+
+  /**
+   * Set the fields.
+   */
+  public TextSimple fields(String... fields) {
+    this.fields = fields;
+    return this;
+  }
+
+  /**
+   * Use AND as the default operator.
+   */
+  public TextSimple opAnd() {
+    this.operatorAnd = true;
+    return this;
+  }
+
+  /**
+   * Use OR as the default operator.
+   */
+  public TextSimple opOr() {
+    this.operatorAnd = false;
+    return this;
+  }
+
+  /**
+   * Set the analyzer
+   */
+  public TextSimple analyzer(String analyzer) {
+    this.analyzer = analyzer;
+    return this;
+  }
+
+  /**
+   * Set the flags.
+   */
+  public TextSimple flags(String flags) {
+    this.flags = flags;
+    return this;
+  }
+
+
+  /**
+   * Set the false to not use lowercase expanded terms.
+   */
+  public TextSimple lowercaseExpandedTerms(boolean lowercaseExpandedTerms) {
+    this.lowercaseExpandedTerms = lowercaseExpandedTerms;
+    return this;
+  }
+
+  /**
+   * Set to true to use analyze wildcard.
+   */
+  public TextSimple analyzeWildcard(boolean analyzeWildcard) {
+    this.analyzeWildcard = analyzeWildcard;
+    return this;
+  }
+
+  /**
+   * Set the locale.
+   */
+  public TextSimple locale(String locale) {
+    this.locale = locale;
+    return this;
+  }
+
+  /**
+   * Set the lenient mode.
+   */
+  public TextSimple lenient(boolean lenient) {
+    this.lenient = lenient;
+    return this;
+  }
+
+  /**
+   * Set the minimum should match.
+   */
+  public TextSimple minShouldMatch(String minShouldMatch) {
+    this.minShouldMatch = minShouldMatch;
+    return this;
+  }
+
+  /**
+   * Return lenient mode.
+   */
+  public boolean isLenient() {
+    return lenient;
+  }
+
+  /**
+   * Return true to analyse wildcard.
+   */
+  public boolean isAnalyzeWildcard() {
+    return analyzeWildcard;
+  }
+
+  /**
+   * Return lowercase expanded terms mode.
+   */
+  public boolean isLowercaseExpandedTerms() {
+    return lowercaseExpandedTerms;
+  }
+
+  /**
+   * Return true if the default operator should be AND.
+   */
+  public boolean isOperatorAnd() {
+    return operatorAnd;
+  }
+
+  /**
+   * Return the analyzer to use.
+   */
+  public String getAnalyzer() {
+    return analyzer;
+  }
+
+  /**
+   * Return the fields.
+   */
+  public String[] getFields() {
+    return fields;
+  }
+
+  /**
+   * Return the locale.
+   */
+  public String getLocale() {
+    return locale;
+  }
+
+  /**
+   * Return the flags.
+   */
+  public String getFlags() {
+    return flags;
+  }
+
+  /**
+   * Return the minimum should match.
+   */
+  public String getMinShouldMatch() {
+    return minShouldMatch;
+  }
+
+}
@@ -0,0 +1,4 @@
+/**
+ * Provides text search expressions like Match, TextQueryString etc.
+ */
+package io.ebean.search;
@@ -22,8 +22,6 @@ public class JsonWriteOptions {

  protected JsonConfig.Include include;

-  protected boolean includeLoadedImplicit = true;
-
  protected Map<String, JsonWriteBeanVisitor<?>> visitorMap;

  /**
@@ -75,20 +73,6 @@ public class JsonWriteOptions {
    this.include = include;
  }

-  /**
-   * Should loaded properties be included implicit, if no other fetch path is specified (default = true).
-   */
-  public boolean isIncludeLoadedImplicit() {
-    return includeLoadedImplicit;
-  }
-
-  /**
-   * Set include loaded properties implicit (default = true).
-   */
-  public void setIncludeLoadedImplicit(boolean includeLoadedImplicit) {
-    this.includeLoadedImplicit = includeLoadedImplicit;
-  }
-
  /**
   * Register a JsonWriteBeanVisitor for the root level.
   */
@@ -30,10 +30,13 @@ module io.ebean.api {
  exports io.ebean.config;
  exports io.ebean.config.dbplatform;
  exports io.ebean.event;
+  exports io.ebean.event.readaudit;
  exports io.ebean.event.changelog;
  exports io.ebean.common;
+  exports io.ebean.docstore;
  exports io.ebean.plugin;
  exports io.ebean.metric;
+  exports io.ebean.search;
  exports io.ebean.service;
  exports io.ebean.text;
  exports io.ebean.text.json;
@@ -0,0 +1,450 @@
+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();
+  }
+}
@@ -0,0 +1,460 @@
+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>(Collections.emptySet()))).isEqualTo("[]");
+    assertThat(toStringFor(new BeanSet<String>(new LinkedHashSet<>()))).isEqualTo("[]");
  }

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

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

  @Test
  void beanMap_some() {
-    Map<String, Recurse> under = new LinkedHashMap<>();
+    var under = new LinkedHashMap<String, Recurse>();
    under.put("a", new Recurse(1, "a"));
    under.put("b", new Recurse(2, "b"));
    BeanMap<String, Recurse> list = new BeanMap<>(under);
@@ -75,8 +75,6 @@ class DatabaseConfigTest {
    props.setProperty("defaultServer", "false");
    props.setProperty("skipDataSourceCheck", "true");
    props.setProperty("readOnlyDatabase", "true");
-    props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");

    props.setProperty("queryPlan.enable", "true");
    props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,8 +95,6 @@ class DatabaseConfigTest {
    assertTrue(settings.isLoadModuleInfo());
    assertTrue(settings.skipDataSourceCheck());
    assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
-    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);

    assertTrue(settings.isIdGeneratorAutomatic());
    assertFalse(settings.getPlatformConfig().isCaseSensitiveCollation());
@@ -132,11 +128,8 @@ class DatabaseConfigTest {

    assertThat(settings.getMappingLocations()).containsExactly("classpath:/foo","bar");

-    config.persistBatch(PersistBatch.NONE)
-      .persistBatchOnCascade(PersistBatch.NONE)
-      .lengthCheck(LengthCheck.ON)
-      .lengthCheck(LengthCheck.UTF8);
-
+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);

    Properties props1 = new Properties();
    props1.setProperty("ebean.persistBatch", "ALL");
@@ -153,7 +146,6 @@ class DatabaseConfigTest {

    assertEquals(PersistBatch.ALL, settings.getPersistBatch());
    assertEquals(PersistBatch.ALL, settings.getPersistBatchOnCascade());
-    assertEquals(LengthCheck.UTF8, settings.getLengthCheck());

    config.setEnabledL2Regions("r0,orgs");
    assertEquals("r0,orgs", settings.getEnabledL2Regions());
@@ -182,8 +174,6 @@ class DatabaseConfigTest {
    assertEquals(600, config.getQueryPlanCapturePeriodSecs());
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
-    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());

    config.setLoadModuleInfo(false);
    assertFalse(config.isAutoLoadModuleInfo());
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.26.1-jakarta</version>
  </parent>

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

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

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

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>14.0.0</version>
+        <version>13.24.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>14.0.0</version>
+        <version>13.24.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.1.0</version>
+        <version>13.26.1-jakarta</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <dependency>
@@ -30,7 +30,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

@@ -174,9 +174,4 @@ public interface DataBinder {
   */
  String popJson();

-  /**
-   * Returns the last bound object (e.g. for BindValidation). Note for InputStreams you'll get an InputStreamInfo.
-   */
-  Object popLastObject();
-
 }
@@ -1,27 +0,0 @@
-package io.ebean.core.type;
-
-import java.io.InputStream;
-
-/**
- * Helper to transports length info of DataBind.setBinaryStream(stream, length) to BindValidation
- *
- * @author Roland Praml, FOCONIS AG
- */
-public final class InputStreamInfo {
-
-  private final InputStream stream;
-  private final long length;
-
-  public InputStreamInfo(InputStream stream, long length) {
-    this.stream = stream;
-    this.length = length;
-  }
-
-  public InputStream stream() {
-    return stream;
-  }
-
-  public long length() {
-    return length;
-  }
-}
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.26.1-jakarta</version>
  </parent>

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

    <dependency>
@@ -46,7 +46,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>13.26.1-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-externalmapping-api</artifactId>
+      <version>13.18.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.13.1</version>
    </dependency>

    <!--
@@ -139,7 +151,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

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

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

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

@@ -222,6 +234,26 @@
        </configuration>
      </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doctitle>Ebean 12</doctitle>
+          <overview>src/main/java/io/ebean/overview.html</overview>
+          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
+          <linksource>true</linksource>
+          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
    </plugins>

  </build>
@@ -51,4 +51,8 @@ public interface LoadContext {
   */
  void register(String path, BeanPropertyAssocMany<?> many, BeanCollection<?> bc);

+  /**
+   * Use soft-references for streaming queries, so unreachable entries can be garbage collected.
+   */
+  void useReferences(boolean useReferences);
 }
@@ -43,4 +43,5 @@ public interface LoadManyBuffer {

  void configureQuery(SpiQuery<?> query);

+  boolean isUseDocStore();
 }
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.CacheMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -58,22 +57,17 @@ public final class LoadManyRequest extends LoadRequest {
    return loadContext.fullPath();
  }

-  private List<Object> parentIdList(SpiEbeanServer server, BeanPropertyAssocMany<?> many, PersistenceContext pc) {
-    final var idList = new ArrayList<>(loadContext.size());
-    final var descriptor = many.descriptor();
+  private List<Object> parentIdList(SpiEbeanServer server) {
+    List<Object> idList = new ArrayList<>();
+    BeanPropertyAssocMany<?> many = many();
    for (int i = 0; i < loadContext.size(); i++) {
-      final BeanCollection<?> bc = loadContext.get(i);
+      BeanCollection<?> bc = loadContext.get(i);
      if (bc != null) {
-        final var parent = bc.owner();
-        final var parentId = descriptor.getId(parent);
-        idList.add(parentId);
-        bc.setLoader(server); // don't use the load buffer again
-        if (lazy) {
-          descriptor.contextPutIfAbsent(pc, parentId, parent);
-          if (!originIncluded && bc == originCollection) {
-            originIncluded = true;
-          }
+        if (lazy && !originIncluded && bc == originCollection) {
+          originIncluded = true;
        }
+        idList.add(many.parentId(bc.owner()));
+        bc.setLoader(server); // don't use the load buffer again
      }
    }
    if (originCollection != null && !originIncluded) {
@@ -81,7 +75,7 @@ public final class LoadManyRequest extends LoadRequest {
      idList.add(many.parentId(originCollection.owner()));
      originCollection.setLoader(server); // don't use the load buffer again
    }
-    if (descriptor.isPadInExpression()) {
+    if (many.targetDescriptor().isPadInExpression()) {
      BindPadding.padIds(idList);
    }
    return idList;
@@ -105,9 +99,8 @@ public final class LoadManyRequest extends LoadRequest {
      query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
    }
    query.setLazyLoadForParents(many);
-    final var pc = loadContext.persistenceContext();
-    many.addWhereParentIdIn(query, parentIdList(server, many, pc));
-    query.setPersistenceContext(pc);
+    many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
+    query.setPersistenceContext(loadContext.persistenceContext());
    query.setLoadDescription(lazy ? "lazy" : "query", description());
    if (lazy) {
      query.setLazyLoadBatchSize(loadContext.batchSize());
@@ -3,8 +3,6 @@ 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.
@@ -49,11 +47,6 @@ 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;
@@ -225,17 +218,4 @@ 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,6 +2,7 @@ package io.ebeaninternal.api;

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

 /**
@@ -172,31 +173,4 @@ 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);
-  }
-
 }
@@ -4,6 +4,8 @@ import io.avaje.lang.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.CallOrigin;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiQuery.Type;
@@ -84,11 +86,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiTransactionManager transactionManager();

-  /**
-   * End the current transaction if it is active.
-   */
-  void endTransaction();
-
  /**
   * Return all the descriptors.
   */
@@ -104,6 +101,11 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  BeanDescriptor<?> descriptorById(String className);

+  /**
+   * Return BeanDescriptor using it's unique doc store queueId.
+   */
+  BeanDescriptor<?> descriptorByQueueId(String queueId);
+
  /**
   * Return BeanDescriptors mapped to this table.
   */
@@ -188,6 +190,17 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  boolean isSupportedType(java.lang.reflect.Type genericType);

+  /**
+   * Return the ReadAuditLogger to use for logging all read audit events.
+   */
+  ReadAuditLogger readAuditLogger();
+
+  /**
+   * Return the ReadAuditPrepare used to populate the read audit events with
+   * user context information (user id, user ip address etc).
+   */
+  ReadAuditPrepare readAuditPrepare();
+
  /**
   * Return the DataTimeZone to use when reading/writing timestamps via JDBC.
   */
@@ -3,6 +3,9 @@ package io.ebeaninternal.api;
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.expression.DocQueryContext;
+
+import java.io.IOException;


 /**
@@ -18,6 +21,16 @@ public interface SpiExpression extends Expression {
   */
  void simplify();

+  /**
+   * Write the expression as an elastic search expression.
+   */
+  void writeDocQuery(DocQueryContext context) throws IOException;
+
+  /**
+   * Return the nested path for this expression.
+   */
+  String nestedPath(BeanDescriptor<?> desc);
+
  /**
   * Process "Many" properties populating ManyWhereJoins.
   * <p>
@@ -71,7 +84,7 @@ public interface SpiExpression extends Expression {
   *
   * @param request the associated request.
   */
-  void addBindValues(SpiExpressionBind request);
+  void addBindValues(SpiExpressionRequest request);

  /**
   * Validate all the properties/paths associated with this expression.
@@ -1,29 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-/**
- * Expression bind values capture.
- */
-public interface SpiExpressionBind {
-
-  /**
-   * Return the bean descriptor for the root type.
-   */
-  BeanDescriptor<?> descriptor();
-
-  /**
-   * Add an encryption key to bind to this request.
-   */
-  void addBindEncryptKey(Object encryptKey);
-
-  /**
-   * Add a bind value to this request.
-   */
-  void addBindValue(Object bindValue);
-
-  /**
-   * Escapes a string to use it as exact match in Like clause.
-   */
-  String escapeLikeString(String value);
-}
@@ -2,6 +2,7 @@ package io.ebeaninternal.api;

 import io.ebean.ExpressionList;
 import io.ebean.Junction;
+import io.ebeaninternal.server.expression.DocQueryContext;

 import java.io.IOException;
 import java.util.List;
@@ -31,6 +32,11 @@ public interface SpiExpressionList<T> extends ExpressionList<T>, SpiExpression {
   */
  boolean isEmpty();

+  /**
+   * Write the top level where expressions taking into account possible extra idEquals expression.
+   */
+  void writeDocQuery(DocQueryContext context, SpiExpression idEquals) throws IOException;
+
  /**
   * Apply firstRow maxRows limits on the filterMany query.
   */
@@ -1,15 +1,15 @@
 package io.ebeaninternal.api;

 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
-import io.ebeaninternal.server.expression.platform.DbExpressionRequest;

 import java.util.List;

 /**
 * Request object used for gathering expression sql and bind values.
 */
-public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionRequest {
+public interface SpiExpressionRequest {

  /**
   * Return the DB specific handler for JSON and ARRAY expressions.
@@ -21,6 +21,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  String parseDeploy(String logicalProp);

+  /**
+   * Return the bean descriptor for the root type.
+   */
+  BeanDescriptor<?> descriptor();
+
  /**
   * Return the associated QueryRequest.
   */
@@ -29,13 +34,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
  /**
   * Append to the expression sql without any parsing.
   */
-  @Override
  SpiExpressionRequest append(String expression);

  /**
   * Append to the expression sql without any parsing.
   */
-  @Override
  SpiExpressionRequest append(char c);

  /**
@@ -44,7 +47,6 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   * This is a fast path case when expression is a bean property path and falls back to using parse()
   * when that isn't the case.
   */
-  @Override
  SpiExpressionRequest property(String expression);

  /**
@@ -52,6 +54,16 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  SpiExpressionRequest parse(String expression);

+  /**
+   * Add an encryption key to bind to this request.
+   */
+  void addBindEncryptKey(Object encryptKey);
+
+  /**
+   * Add a bind value to this request.
+   */
+  void addBindValue(Object bindValue);
+
  /**
   * Return the accumulated expression sql for all expressions in this request.
   */
@@ -72,6 +84,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  void appendLike(boolean rawLikeExpression);

+  /**
+   * Escapes a string to use it as exact match in Like clause.
+   */
+  String escapeLikeString(String value);
+
  /**
   * Append IN expression taking into account platform and type support for Multi-value.
   */
@@ -1,10 +1,17 @@
 package io.ebeaninternal.api;

 import io.ebean.Junction;
+import io.ebeaninternal.server.expression.DocQueryContext;
+
+import java.io.IOException;

 /**
 * SPI methods for Junction.
 */
 public interface SpiJunction<T> extends Junction<T> {

+  /**
+   * Write the Junction taking into account it is implied.
+   */
+  void writeDocQueryJunction(DocQueryContext context) throws IOException;
 }
@@ -11,6 +11,7 @@ import io.ebean.Query;
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
@@ -169,6 +170,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     */
    SOFT_DELETED(false),

+    /**
+     * Query runs against draft tables.
+     */
+    DRAFT(false),
+
    /**
     * Query runs against current data (normal).
     */
@@ -220,11 +226,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  ProfileLocation profileLocation();

-  /**
-   * Return the SQL hint to include in the query.
-   */
-  String hint();
-
  /**
   * Return the label set on the query.
   */
@@ -291,6 +292,17 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  SpiRawSql rawSql();

+  /**
+   * Return true if this query should be executed against the doc store.
+   */
+  boolean isUseDocStore();
+
+  /**
+   * For doc store query return the document index name to search against.
+   * This is for partitioned indexes (like daily logstash indexes etc).
+   */
+  String getDocIndexName();
+
  /**
   * Return the PersistenceContextScope that this query should use.
   * <p>
@@ -365,6 +377,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean isAsOfQuery();

+  /**
+   * Return true if this is a 'As Draft' query.
+   */
+  boolean isAsDraft();
+
  /**
   * Return true if this query includes soft deleted rows.
   */
@@ -493,6 +510,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  NaturalKeyBindParam naturalKeyBindParam();

+  /**
+   * Prepare the query for docstore execution with nested paths.
+   */
+  void prepareDocNested();
+
  /**
   * Set the query to be a delete query.
   */
@@ -708,6 +730,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  SpiExpressionList<T> havingExpressions();

+  /**
+   * Return the text expressions.
+   */
+  SpiExpressionList<T> textExpression();
+
  /**
   * Returns true if either firstRow or maxRows has been set.
   */
@@ -774,6 +801,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean tuneFetchProperties(OrmQueryDetail detail);

+  /**
+   * If this is a RawSql based entity set the default RawSql if not set.
+   */
+  void setDefaultRawSqlIfRequired();
+
  /**
   * Set to true if this query has been tuned by autoTune.
   */
@@ -851,6 +883,21 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  int bufferFetchSizeHint();

+  /**
+   * Return true if read auditing is disabled on this query.
+   */
+  boolean isDisableReadAudit();
+
+  /**
+   * Set the readEvent for future queries (as prepared in foreground thread).
+   */
+  void setFutureFetchAudit(ReadEvent event);
+
+  /**
+   * Read the readEvent for future queries (null otherwise).
+   */
+  ReadEvent futureFetchAudit();
+
  /**
   * Return the base table to use if user defined on the query.
   */
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
+import io.ebeanservice.docstore.api.DocStoreTransaction;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -102,6 +103,19 @@ public interface SpiTransaction extends Transaction {
   */
  Boolean isUpdateAllLoadedProperties();

+  /**
+   * Return the batchSize specifically set for this transaction or 0.
+   * <p>
+   * Returning 0 implies to use the system wide default batch size.
+   */
+  DocStoreMode docStoreMode();
+
+  /**
+   * Return the batch size to us for ElasticSearch Bulk API calls
+   * as a result of this transaction.
+   */
+  int getDocStoreBatchSize();
+
  /**
   * Return the batchSize specifically set for this transaction or 0.
   * <p>
@@ -273,6 +287,11 @@ public interface SpiTransaction extends Transaction {
   */
  void sendChangeLog(ChangeSet changeSet);

+  /**
+   * Return a document store transaction.
+   */
+  DocStoreTransaction docStoreTransaction();
+
  /**
   * Set the current Tenant Id.
   */
@@ -2,12 +2,14 @@ package io.ebeaninternal.api;

 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
+import io.ebean.annotation.DocStoreMode;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
+import io.ebeanservice.docstore.api.DocStoreTransaction;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -110,6 +112,32 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
    return transaction.tenantId();
  }

+  @Override
+  public DocStoreTransaction docStoreTransaction() {
+    return transaction.docStoreTransaction();
+  }
+
+  @Override
+  public DocStoreMode docStoreMode() {
+    return transaction.docStoreMode();
+  }
+
+  @Override
+  public void setDocStoreMode(DocStoreMode mode) {
+    transaction.setDocStoreMode(mode);
+  }
+
+  @Override
+  public int getDocStoreBatchSize() {
+    return transaction.getDocStoreBatchSize();
+  }
+
+  @Override
+  public void setDocStoreBatchSize(int batchSize) {
+    transaction.setDocStoreBatchSize(batchSize);
+  }
+
+
  @Override
  public boolean isLogSql() {
    return transaction.isLogSql();
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.transaction.DeleteByIdMap;
 import io.ebeaninternal.server.transaction.TransactionManager;
+import io.ebeanservice.docstore.api.DocStoreUpdates;

 import java.io.Serializable;
 import java.util.ArrayList;
@@ -124,6 +125,18 @@ public final class TransactionEvent implements Serializable {
    return changeSet;
  }

+  /**
+   * Add any relevant PersistRequestBean's to DocStoreUpdates for later processing.
+   */
+  public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates) {
+    List<PersistRequestBean<?>> requests = listenerNotify();
+    if (requests != null) {
+      for (PersistRequestBean<?> persistRequestBean : requests) {
+        persistRequestBean.addDocStoreUpdates(docStoreUpdates);
+      }
+    }
+  }
+
  /**
   * Return the CacheChangeSet that we add cache notification messages to.
   * <p>
@@ -1,14 +1,10 @@
 package io.ebeaninternal.server.bind;

 import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.InputStreamInfo;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;

-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
+import java.io.*;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.ArrayList;
@@ -27,8 +23,6 @@ public class DataBind implements DataBinder {
  protected int pos;
  private String json;

-  private Object lastObject = null;
-
  public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
    this.dataTimeZone = dataTimeZone;
    this.pstmt = pstmt;
@@ -71,19 +65,16 @@ public class DataBind implements DataBinder {
  @Override
  public void setObject(Object value) throws SQLException {
    pstmt.setObject(++pos, value);
-    lastObject = value;
  }

  @Override
  public final void setObject(Object value, int sqlType) throws SQLException {
    pstmt.setObject(++pos, value, sqlType);
-    lastObject = value;
  }

  @Override
  public void setNull(int jdbcType) throws SQLException {
    pstmt.setNull(++pos, jdbcType);
-    lastObject = null;
  }

  @Override
@@ -105,7 +96,7 @@ public class DataBind implements DataBinder {
    }
  }

-  public void closeInputStreams() {
+  private void closeInputStreams() {
    if (inputStreams != null) {
      for (InputStream inputStream : inputStreams) {
        try {
@@ -126,43 +117,36 @@ public class DataBind implements DataBinder {
  @Override
  public void setString(String value) throws SQLException {
    pstmt.setString(++pos, value);
-    lastObject = value;
  }

  @Override
  public final void setInt(int value) throws SQLException {
    pstmt.setInt(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setLong(long value) throws SQLException {
    pstmt.setLong(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setShort(short value) throws SQLException {
    pstmt.setShort(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setFloat(float value) throws SQLException {
    pstmt.setFloat(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setDouble(double value) throws SQLException {
    pstmt.setDouble(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setBigDecimal(BigDecimal value) throws SQLException {
    pstmt.setBigDecimal(++pos, value);
-    lastObject = null;
  }

  @Override
@@ -173,7 +157,6 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setDate(++pos, value);
    }
-    lastObject = null;
  }

  @Override
@@ -184,7 +167,6 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setTimestamp(++pos, value);
    }
-    lastObject = null;
  }

  @Override
@@ -195,31 +177,26 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setTime(++pos, value);
    }
-    lastObject = null;
  }

  @Override
  public void setBoolean(boolean value) throws SQLException {
    pstmt.setBoolean(++pos, value);
-    lastObject = null;
  }

  @Override
  public void setBytes(byte[] value) throws SQLException {
    pstmt.setBytes(++pos, value);
-    lastObject = value;
  }

  @Override
  public void setByte(byte value) throws SQLException {
    pstmt.setByte(++pos, value);
-    lastObject = null;
  }

  @Override
  public void setChar(char value) throws SQLException {
    pstmt.setString(++pos, String.valueOf(value));
-    lastObject = null;
  }

  @Override
@@ -234,31 +211,21 @@ public class DataBind implements DataBinder {
    }
    inputStreams.add(inputStream);
    pstmt.setBinaryStream(++pos, inputStream, length);
-    lastObject = new InputStreamInfo(inputStream, length);
  }

  @Override
  public void setBlob(byte[] bytes) throws SQLException {
    pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
-    lastObject = bytes;
  }

  @Override
  public void setClob(String content) throws SQLException {
    pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
-    lastObject = content;
  }

  @Override
  public void setArray(String arrayType, Object[] elements) throws SQLException {
    pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
-    lastObject = null;
  }

-  @Override
-  public Object popLastObject() {
-    Object ret = lastObject;
-    lastObject = null;
-    return ret;
-  }
 }
@@ -15,6 +15,7 @@ public final class CachedBeanData implements Externalizable {

  private long whenCreated;
  private long version;
+  private String discValue;
  private Map<String, Object> data;
  /**
   * The sharable bean is effectively transient (near cache only).
@@ -24,9 +25,10 @@ public final class CachedBeanData implements Externalizable {
  /**
   * Construct from a loaded bean.
   */
-  public CachedBeanData(Object sharableBean, Map<String, Object> data, long version) {
+  public CachedBeanData(Object sharableBean, String discValue, Map<String, Object> data, long version) {
    this.whenCreated = System.currentTimeMillis();
    this.sharableBean = sharableBean;
+    this.discValue = discValue;
    this.data = data;
    this.version = version;
  }
@@ -41,6 +43,11 @@ public final class CachedBeanData implements Externalizable {
  public void writeExternal(ObjectOutput out) throws IOException {
    out.writeLong(version);
    out.writeLong(whenCreated);
+    boolean hasDisc = discValue != null;
+    out.writeBoolean(hasDisc);
+    if (hasDisc) {
+      out.writeUTF(discValue);
+    }
    out.writeInt(data.size());
    for (Map.Entry<String, Object> entry : data.entrySet()) {
      out.writeUTF(entry.getKey());
@@ -52,6 +59,9 @@ public final class CachedBeanData implements Externalizable {
  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
    version = in.readLong();
    whenCreated = in.readLong();
+    if (in.readBoolean()) {
+      discValue = in.readUTF();
+    }
    data = new LinkedHashMap<>();
    int count = in.readInt();
    for (int i = 0; i < count; i++) {
@@ -75,7 +85,7 @@ public final class CachedBeanData implements Externalizable {
    Map<String, Object> copy = new HashMap<>();
    copy.putAll(data);
    copy.putAll(changes);
-    return new CachedBeanData(null, copy, version);
+    return new CachedBeanData(null, discValue, copy, version);
  }

  /**
@@ -92,6 +102,13 @@ public final class CachedBeanData implements Externalizable {
    return version;
  }

+  /**
+   * Return the raw discriminator value.
+   */
+  public String getDiscValue() {
+    return discValue;
+  }
+
  /**
   * Return a sharable (immutable read only) bean. Near cache only use.
   */
@@ -41,7 +41,7 @@ public final class CachedBeanDataFromBean {

    long version = desc.getVersion(bean);
    EntityBean sharableBean = createSharableBean(desc, bean, ebi);
-    return new CachedBeanData(sharableBean, data, version);
+    return new CachedBeanData(sharableBean, desc.discValue(), data, version);
  }

  private static EntityBean createSharableBean(BeanDescriptor<?> desc, EntityBean bean, EntityBeanIntercept beanEbi) {
@@ -14,6 +14,9 @@ public final class CachedBeanDataToBean {
    // any future lazy loading skips L2 bean cache
    ebi.setLoadedFromCache(true);
    BeanProperty idProperty = desc.idProperty();
+    if (desc.inheritInfo() != null) {
+        desc = desc.inheritInfo().readType(bean.getClass()).desc();
+    }
    if (idProperty != null) {
      // load the id property
      loadProperty(bean, cacheBeanData, ebi, idProperty, context);
@@ -0,0 +1,54 @@
+package io.ebeaninternal.server.cache;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * Bean Id value plus discriminator type.
+ * <p>
+ * Put into L2 cache such that we know the type of a bean with inheritance.
+ */
+public final class CachedBeanId implements Externalizable {
+
+  private String discValue;
+  private Object id;
+
+  public CachedBeanId(String discValue, Object id) {
+    this.discValue = discValue;
+    this.id = id;
+  }
+
+  /**
+   * Construct from serialisation.
+   */
+  public CachedBeanId() {
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    out.writeUTF(discValue);
+    out.writeObject(id);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    discValue = in.readUTF();
+    id = in.readObject();
+  }
+
+  @Override
+  public String toString() {
+    return discValue + ":" + id;
+  }
+
+  public String getDiscValue() {
+    return discValue;
+  }
+
+  public Object getId() {
+    return id;
+  }
+
+}
@@ -1,70 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.ProfileLocation;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.config.SlowQueryEvent;
-
-import java.util.List;
-
-/**
- * Slow query event.
- */
-final class DSlowQueryEvent implements SlowQueryEvent {
-
-  private final String sql;
-  private final long timeMillis;
-  private final int rowCount;
-  private final ObjectGraphNode originNode;
-  private final List<Object> bindParams;
-  private final String label;
-  private final ProfileLocation profileLocation;
-
-  /**
-   * Construct with the SQL and execution time in millis.
-   */
-  DSlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode,
-                         List<Object> bindParams, String label, ProfileLocation profileLocation) {
-    this.sql = sql;
-    this.timeMillis = timeMillis;
-    this.rowCount = rowCount;
-    this.originNode = originNode;
-    this.bindParams = bindParams;
-    this.profileLocation = profileLocation;
-    this.label = label != null ? label : profileLocation == null ? null : profileLocation.label();
-  }
-
-  @Override
-  public String getSql() {
-    return sql;
-  }
-
-  @Override
-  public long getTimeMillis() {
-    return timeMillis;
-  }
-
-  @Override
-  public int getRowCount() {
-    return rowCount;
-  }
-
-  @Override
-  public ObjectGraphNode getOriginNode() {
-    return originNode;
-  }
-
-  @Override
-  public List<Object> getBindParams() {
-    return bindParams;
-  }
-
-  @Override
-  public String getLabel() {
-    return label;
-  }
-
-  @Override
-  public ProfileLocation getProfileLocation() {
-    return profileLocation;
-  }
-}
@@ -63,8 +63,8 @@ final class DefaultBeanLoader {
    Object parentId = parentDesc.getId(parentBean);
    if (pc == null) {
      pc = new DefaultPersistenceContext();
+      parentDesc.contextPut(pc, parentId, parentBean);
    }
-    parentDesc.contextPutIfAbsent(pc, parentId, parentBean);
    boolean useManyIdCache = beanCollection != null && parentDesc.isManyPropCaching() && many.isUseCache();
    if (useManyIdCache) {
      Boolean readOnly = null;
@@ -178,11 +178,12 @@ final class DefaultBeanLoader {
      desc.contextPut(pc, id, bean);
      ebi.setPersistenceContext(pc);
    }
+    boolean draft = desc.isDraftInstance(bean);
    if (embeddedOwnerIndex == -1) {
      if (desc.lazyLoadMany(ebi)) {
        return;
      }
-      if (Mode.LAZYLOAD_BEAN == mode && desc.isBeanCaching()) {
+      if (!draft && Mode.LAZYLOAD_BEAN == mode && desc.isBeanCaching()) {
        // lazy loading and the bean cache is active
        if (desc.cacheBeanLoad(bean, ebi, id, pc)) {
          return;
@@ -191,7 +192,9 @@ final class DefaultBeanLoader {
    }
    SpiQuery<?> query = server.createQuery(desc.type());
    query.setLazyLoadProperty(ebi.lazyLoadProperty());
-    if (mode == SpiQuery.Mode.LAZYLOAD_BEAN && desc.isSoftDelete()) {
+    if (draft) {
+      query.asDraft();
+    } else if (mode == SpiQuery.Mode.LAZYLOAD_BEAN && desc.isSoftDelete()) {
      query.setIncludeSoftDeletes();
    }
    if (embeddedOwnerIndex > -1) {
@@ -92,12 +92,16 @@ public final class DefaultContainer implements SpiContainer {
      BootupClasses bootupClasses = bootupClasses(config);

      boolean online = true;
-      TenantMode tenantMode = config.getTenantMode();
-      if (TenantMode.DB != tenantMode) {
-        setDataSource(config);
-        if (!tenantMode.isDynamicDataSource()) {
-          // check the autoCommit and Transaction Isolation
-          online = checkDataSource(config);
+      if (config.isDocStoreOnly()) {
+        config.databasePlatform(new DatabasePlatform());
+      } else {
+        TenantMode tenantMode = config.getTenantMode();
+        if (TenantMode.DB != tenantMode) {
+          setDataSource(config);
+          if (!tenantMode.isDynamicDataSource()) {
+            // check the autoCommit and Transaction Isolation
+            online = checkDataSource(config);
+          }
        }
      }

@@ -13,6 +13,8 @@ import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.ShutdownManager;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.*;
 import io.ebean.migration.auto.AutoMigrationRunner;
 import io.ebean.plugin.BeanType;
@@ -28,9 +30,11 @@ import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.dto.DtoBeanDescriptor;
 import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.el.ElFilter;
+import io.ebeaninternal.server.grammer.EqlParser;
 import io.ebeaninternal.server.query.*;
 import io.ebeaninternal.server.querydefn.*;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -39,6 +43,7 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
+import io.ebeanservice.docstore.api.DocStoreIntegration;

 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.NonUniqueResultException;
@@ -88,6 +93,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  private final DtoBeanManager dtoBeanManager;
  private final BeanDescriptorManager descriptorManager;
  private final AutoTuneService autoTuneService;
+  private final ReadAuditPrepare readAuditPrepare;
+  private final ReadAuditLogger readAuditLogger;
  private final CQueryEngine cqueryEngine;
  private final List<Plugin> serverPlugins;
  private final SpiDdlGenerator ddlGenerator;
@@ -97,6 +104,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  private final DefaultBeanLoader beanLoader;
  private final EncryptKeyManager encryptKeyManager;
  private final SpiJsonContext jsonContext;
+  private final DocumentStore documentStore;
  private final MetaInfoManager metaInfoManager;
  private final CurrentTenantProvider currentTenantProvider;
  private final SpiLogManager logManager;
@@ -138,12 +146,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    this.relationalQueryEngine = config.createRelationalQueryEngine();
    this.dtoQueryEngine = config.createDtoQueryEngine();
    this.autoTuneService = config.createAutoTuneService(this);
+    this.readAuditPrepare = config.getReadAuditPrepare();
+    this.readAuditLogger = config.getReadAuditLogger();
    this.beanLoader = new DefaultBeanLoader(this);
    this.jsonContext = config.createJsonContext(this);
    this.dataTimeZone = config.getDataTimeZone();
    this.clockService = config.getClockService();

-    this.transactionManager = config.createTransactionManager(this);
+    DocStoreIntegration docStoreComponents = config.createDocStoreIntegration(this);
+    this.transactionManager = config.createTransactionManager(this, docStoreComponents.updateProcessor());
+    this.documentStore = docStoreComponents.documentStore();
    this.queryPlanManager = config.initQueryPlanManager(transactionManager);
    this.metaInfoManager = new DefaultMetaInfoManager(this, this.config.getMetricNaming());
    this.serverPlugins = config.getPlugins();
@@ -177,7 +189,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   * Execute all the plugins with an online flag indicating the DB is up or not.
   */
  public void executePlugins(boolean online) {
-    ddlGenerator.execute(online);
+    if (!config.isDocStoreOnly()) {
+      ddlGenerator.execute(online);
+    }
    for (Plugin plugin : serverPlugins) {
      plugin.online(online);
    }
@@ -269,6 +283,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return transactionManager.readOnlyDataSource();
  }

+  @Override
+  public ReadAuditPrepare readAuditPrepare() {
+    return readAuditPrepare;
+  }
+
+  @Override
+  public ReadAuditLogger readAuditLogger() {
+    return readAuditLogger;
+  }
+
  /**
   * Run any initialisation required before registering with the ClusterManager.
   */
@@ -594,7 +618,25 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
        return (T) existing;
      }
    }
-    return (T) desc.contextRef(pc, null, false, id);
+    InheritInfo inheritInfo = desc.inheritInfo();
+    if (inheritInfo == null || inheritInfo.isConcrete()) {
+      return (T) desc.contextRef(pc, null, false, id);
+    }
+    return referenceFindOne(type, id, desc);
+  }
+
+  private <T> T referenceFindOne(Class<T> type, Object id, BeanDescriptor<?> desc) {
+    BeanProperty idProp = desc.idProperty();
+    if (idProp == null) {
+      throw new PersistenceException("No ID properties for this type? " + desc);
+    }
+    // we actually need to do a query because we don't know the type without the discriminator
+    // value, just select the id property and discriminator column (auto added)
+    T bean = find(type).select(idProp.name()).setId(id).findOne();
+    if (bean == null) {
+      throw new EntityNotFoundException("Could not find reference bean " + id + " for " + desc);
+    }
+    return bean;
  }

  @Override
@@ -714,6 +756,16 @@ 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();
@@ -796,6 +848,29 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return query;
  }

+  @Override
+  public <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    BeanDescriptor<T> desc = desc(beanType);
+    String named = desc.namedQuery(namedQuery);
+    if (named != null) {
+      return createQuery(beanType, named);
+    }
+    SpiRawSql rawSql = desc.namedRawSql(namedQuery);
+    if (rawSql != null) {
+      DefaultOrmQuery<T> query = createQuery(beanType);
+      query.setRawSql(rawSql);
+      return query;
+    }
+    throw new PersistenceException("No named query called " + namedQuery + " for bean:" + beanType.getName());
+  }
+
+  @Override
+  public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType, String eql) {
+    DefaultOrmQuery<T> query = createQuery(beanType);
+    EqlParser.parse(eql, query);
+    return query;
+  }
+
  @Override
  public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType) {
    return new DefaultOrmQuery<>(desc(beanType), this, expressionFactory);
@@ -812,6 +887,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return new DefaultDtoQuery<>(this, descriptor, sql.trim());
  }

+  @Override
+  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
+    DtoBeanDescriptor<T> descriptor = dtoBeanManager.descriptor(dtoType);
+    String sql = descriptor.namedRawSql(namedQuery);
+    if (sql == null) {
+      throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName());
+    }
+    return new DefaultDtoQuery<>(this, descriptor, sql);
+  }
+
  @Override
  public <T> DtoQuery<T> findDto(Class<T> dtoType, SpiQuery<?> ormQuery) {
    DtoBeanDescriptor<T> descriptor = dtoBeanManager.descriptor(dtoType);
@@ -875,6 +960,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      transaction = currentServerTransaction();
    }
    if (!query.isRawSql()) {
+      query.setDefaultRawSqlIfRequired();
      if (!query.isAutoTunable() || !autoTuneService.tuneQuery(query)) {
        // use deployment FetchType.LAZY/EAGER annotations
        // to define the 'default' select clause
@@ -957,6 +1043,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    }
    SpiOrmQueryRequest<T> request = buildQueryRequest(query);
    request.prepareQuery();
+    if (request.isUseDocStore()) {
+      return docStore().find(request);
+    }
    try {
      request.initTransIfRequired();
      return (T) request.findId();
@@ -1225,6 +1314,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    spiQuery.usingFuture();
    // FutureList query always run in it's own persistence content
    spiQuery.setPersistenceContext(new DefaultPersistenceContext());
+    if (!spiQuery.isDisableReadAudit()) {
+      BeanDescriptor<T> desc = descriptorManager.descriptor(spiQuery.getBeanType());
+      desc.readAuditFutureList(spiQuery);
+    }
    // Create a new transaction solely to execute the findList() at some future time
    boolean createdTransaction = false;
    SpiTransaction transaction = query.transaction();
@@ -1247,6 +1340,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    if (maxRows == 0) {
      throw new PersistenceException("maxRows must be specified for findPagedList() query");
    }
+    if (query.isUseDocStore()) {
+      return docStore().findPagedList(createQueryRequest(Type.LIST, query));
+    }
    return new LimitOffsetPagedList<>(this, query);
  }

@@ -1274,6 +1370,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  public <T> void findEach(SpiQuery<T> query, Consumer<T> consumer) {
    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
+    if (request.isUseDocStore()) {
+      docStore().findEach(request, consumer);
+      return;
+    }
    request.initTransIfRequired();
    request.findEach(consumer);
    // no try finally - findEach guarantee's cleanup of the transaction if required
@@ -1282,6 +1382,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  public <T> void findEach(SpiQuery<T> query, int batch, Consumer<List<T>> consumer) {
    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
+//    if (request.isUseDocStore()) {
+//      docStore().findEach(request, consumer);
+//      return;
+//    }
    request.initTransIfRequired();
    request.findEach(batch, consumer);
    // no try finally - findEach guarantee's cleanup of the transaction if required
@@ -1290,6 +1394,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  public <T> void findEachWhile(SpiQuery<T> query, Predicate<T> consumer) {
    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
+    if (request.isUseDocStore()) {
+      docStore().findEachWhile(request, consumer);
+      return;
+    }
    request.initTransIfRequired();
    request.findEachWhile(consumer);
    // no try finally - findEachWhile guarantee's cleanup of the transaction if required
@@ -1324,6 +1432,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    if (result != null) {
      return (List<T>) result;
    }
+    if (request.isUseDocStore()) {
+      return docStore().findList(request);
+    }
    try {
      request.initTransIfRequired();
      return request.findList();
@@ -1592,6 +1703,54 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    }, transaction);
  }

+  @Override
+  public <T> List<T> publish(Query<T> query, @Nullable Transaction transaction) {
+    return executeInTrans((txn) -> persister.publish(query, txn), transaction);
+  }
+
+  @Nullable
+  @Override
+  public <T> T publish(Class<T> beanType, Object id) {
+    return publish(beanType, id, null);
+  }
+
+  @Override
+  public <T> List<T> publish(Query<T> query) {
+    return publish(query, null);
+  }
+
+  @Nullable
+  @Override
+  public <T> T publish(Class<T> beanType, Object id, @Nullable Transaction transaction) {
+    Query<T> query = find(beanType).setId(id);
+    List<T> liveBeans = publish(query, transaction);
+    return (liveBeans.size() == 1) ? liveBeans.get(0) : null;
+  }
+
+  @Override
+  public <T> List<T> draftRestore(Query<T> query, @Nullable Transaction transaction) {
+    return executeInTrans((txn) -> persister.draftRestore(query, txn), transaction);
+  }
+
+  @Nullable
+  @Override
+  public <T> T draftRestore(Class<T> beanType, Object id, @Nullable Transaction transaction) {
+    Query<T> query = find(beanType).setId(id);
+    List<T> beans = draftRestore(query, transaction);
+    return (beans.size() == 1) ? beans.get(0) : null;
+  }
+
+  @Nullable
+  @Override
+  public <T> T draftRestore(Class<T> beanType, Object id) {
+    return draftRestore(beanType, id, null);
+  }
+
+  @Override
+  public <T> List<T> draftRestore(Query<T> query) {
+    return draftRestore(query, null);
+  }
+
  private EntityBean checkEntityBean(Object bean) {
    return (EntityBean) Objects.requireNonNull(bean);
  }
@@ -1900,6 +2059,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return descriptorManager.beanTypes(tableName);
  }

+  @Override
+  public BeanType<?> beanTypeForQueueId(String queueId) {
+    return descriptorByQueueId(queueId);
+  }
+
+  @Override
+  public BeanDescriptor<?> descriptorByQueueId(String queueId) {
+    return descriptorManager.descriptorByQueueId(queueId);
+  }
+
  /**
   * Return the SPI bean types for the given bean class.
   */
@@ -2006,6 +2175,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return callStackFactory.createCallOrigin();
  }

+  @Override
+  public DocumentStore docStore() {
+    return documentStore;
+  }
+
  @Override
  public JsonContext json() {
    // immutable thread safe so return shared instance
@@ -2020,9 +2194,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery<?> query) {
    if (timeMicros > slowQueryMicros && slowQueryListener != null) {
-      List<Object> bindParams = new SlowQueryBindCapture(query).capture();
-      slowQueryListener.process(new DSlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount,
-        query.parentNode(), bindParams, query.label(), query.profileLocation()));
+      slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.parentNode()));
    }
  }

@@ -1,12 +1,10 @@
 package io.ebeaninternal.server.core;

 import io.avaje.applog.AppLog;
-import io.ebean.ProfileLocation;
+import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.SlowQueryEvent;
 import io.ebean.config.SlowQueryListener;

-import java.util.List;
-
 import static java.lang.System.Logger.Level.WARNING;

 /**
@@ -18,10 +16,11 @@ final class DefaultSlowQueryListener implements SlowQueryListener {

  @Override
  public void process(SlowQueryEvent event) {
-    ProfileLocation profileLocation = event.getProfileLocation();
-    String loc = profileLocation == null ? "" : profileLocation.fullLocation();
-    List<Object> bindParams = event.getBindParams();
-    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} location:{2} sql[{3}] params{4}",
-      event.getTimeMillis(), event.getRowCount(), loc, event.getSql(), bindParams);
+    String firstStack = "";
+    ObjectGraphNode node = event.getOriginNode();
+    if (node != null) {
+      firstStack = node.origin().top();
+    }
+    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} caller[{2}] sql[{3}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
  }
 }
@@ -0,0 +1,69 @@
+package io.ebeaninternal.server.core;
+
+import io.ebeaninternal.api.CoreLog;
+import io.ebeaninternal.server.dto.DtoNamedQueries;
+import io.ebeaninternal.xmapping.api.XmapDto;
+import io.ebeaninternal.xmapping.api.XmapEbean;
+import io.ebeaninternal.xmapping.api.XmapRawSql;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.System.Logger.Level.ERROR;
+
+/**
+ * Reads the Xml deployment information.
+ */
+final class InternalConfigXmlMap {
+
+  private final List<XmapEbean> xmlEbeanList;
+  private final ClassLoader classLoader;
+  private final Map<Class<?>, DtoNamedQueries> dtoNamedQueries = new HashMap<>();
+
+  InternalConfigXmlMap(List<XmapEbean> xmlEbeanList, ClassLoader classLoader) {
+    this.xmlEbeanList = xmlEbeanList;
+    this.classLoader = classLoader;
+    initDtoMapping();
+  }
+
+  void initDtoMapping() {
+    if (xmlEbeanList != null) {
+      for (XmapEbean mapping : xmlEbeanList) {
+        List<XmapDto> dtoList = mapping.getDto();
+        for (XmapDto dto : dtoList) {
+          readDtoMapping(dto);
+        }
+      }
+    }
+  }
+
+  /**
+   * Return the XML deployment information for entity beans.
+   */
+  List<XmapEbean> xmlDeployment() {
+    return xmlEbeanList;
+  }
+
+  /**
+   * Return the named queries for Dto beans.
+   */
+  Map<Class<?>, DtoNamedQueries> readDtoMapping() {
+    return dtoNamedQueries;
+  }
+
+  private void readDtoMapping(XmapDto dto) {
+    Class<?> dtoClass;
+    try {
+      dtoClass = Class.forName(dto.getClazz(), false, classLoader);
+    } catch (Exception e) {
+      CoreLog.internal.log(ERROR, "Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
+      return;
+    }
+    DtoNamedQueries namedQueries = dtoNamedQueries.computeIfAbsent(dtoClass, aClass -> new DtoNamedQueries());
+    for (XmapRawSql sql : dto.getRawSql()) {
+      namedQueries.addRawSql(sql.getName(), sql.getQuery());
+    }
+  }
+
+}
@@ -11,6 +11,8 @@ import io.ebean.config.dbplatform.DbHistorySupport;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.*;
@@ -27,6 +29,7 @@ import io.ebeaninternal.server.core.timezone.*;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 import io.ebeaninternal.server.deploy.parse.DeployCreateProperties;
+import io.ebeaninternal.server.deploy.parse.DeployInherit;
 import io.ebeaninternal.server.deploy.parse.DeployUtil;
 import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.expression.DefaultExpressionFactory;
@@ -39,10 +42,18 @@ import io.ebeaninternal.server.persist.DefaultPersister;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind;
 import io.ebeaninternal.server.query.*;
+import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
+import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
 import io.ebeaninternal.server.json.DJsonContext;
 import io.ebeaninternal.server.transaction.*;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.TypeManager;
+import io.ebeaninternal.xmapping.api.XmapEbean;
+import io.ebeaninternal.xmapping.api.XmapService;
+import io.ebeanservice.docstore.api.DocStoreFactory;
+import io.ebeanservice.docstore.api.DocStoreIntegration;
+import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
+import io.ebeanservice.docstore.none.NoneDocStoreFactory;

 import java.util.*;

@@ -61,6 +72,7 @@ public final class InternalConfiguration {
  private final DatabaseBuilder.Settings config;
  private final BootupClasses bootupClasses;
  private final DatabasePlatform databasePlatform;
+  private final DeployInherit deployInherit;
  private final TypeManager typeManager;
  private final DtoBeanManager dtoBeanManager;
  private final ClockService clockService;
@@ -77,6 +89,7 @@ public final class InternalConfiguration {
  private final ExpressionFactory expressionFactory;
  private final SpiBackgroundExecutor backgroundExecutor;
  private final JsonFactory jsonFactory;
+  private final DocStoreFactory docStoreFactory;
  private final List<Plugin> plugins = new ArrayList<>();
  private final MultiValueBind multiValueBind;
  private final SpiLogManager logManager;
@@ -93,6 +106,7 @@ public final class InternalConfiguration {
    this.clockService = new ClockService(config.settings().getClock());
    this.tableModState = new TableModState();
    this.logManager = initLogManager();
+    this.docStoreFactory = initDocStoreFactory(service(DocStoreFactory.class));
    this.jsonFactory = config.getJsonFactory();
    this.clusterManager = clusterManager;
    this.backgroundExecutor = backgroundExecutor;
@@ -101,24 +115,32 @@ public final class InternalConfiguration {
    this.expressionFactory = initExpressionFactory(config);
    this.typeManager = new DefaultTypeManager(config, bootupClasses);
    this.multiValueBind = createMultiValueBind(databasePlatform.platform());
+    this.deployInherit = new DeployInherit(bootupClasses);
    this.deployCreateProperties = new DeployCreateProperties(typeManager);
    this.deployUtil = new DeployUtil(typeManager, config);
    this.serverCachePlugin = initServerCachePlugin();
    this.cacheManager = initCacheManager();

-    this.dtoBeanManager = new DtoBeanManager(typeManager);
+    final InternalConfigXmlMap xmlMap = initExternalMapping();
+    this.dtoBeanManager = new DtoBeanManager(typeManager, xmlMap.readDtoMapping());
    this.beanDescriptorManager = new BeanDescriptorManager(this);
-    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy();
+    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlMap.xmlDeployment());
+    Map<String, String> draftTableMap = beanDescriptorManager.draftTableMap();
    beanDescriptorManager.scheduleBackgroundTrim();
    this.dataTimeZone = initDataTimeZone();
    this.binder = getBinder(typeManager, databasePlatform, dataTimeZone);
-    this.cQueryEngine = new CQueryEngine(config, databasePlatform, binder, asOfTableMapping);
+    this.cQueryEngine = new CQueryEngine(config, databasePlatform, binder, asOfTableMapping, draftTableMap);
  }

  public boolean isJacksonCorePresent() {
    return jacksonCorePresent;
  }

+  private InternalConfigXmlMap initExternalMapping() {
+    final List<XmapEbean> xmEbeans = readExternalMapping();
+    return new InternalConfigXmlMap(xmEbeans, config.getClassLoadConfig().getClassLoader());
+  }
+
  private <S> S service(Class<S> cls) {
    S service = config.getServiceObject(cls);
    if (service != null) {
@@ -128,6 +150,14 @@ public final class InternalConfiguration {
    }
  }

+  private List<XmapEbean> readExternalMapping() {
+    final XmapService xmapService = service(XmapService.class);
+    if (xmapService == null) {
+      return Collections.emptyList();
+    }
+    return xmapService.read(config.getClassLoadConfig().getClassLoader(), config.getMappingLocations());
+  }
+
  private SpiLogManager initLogManager() {
    // allow plugin - i.e. capture executed SQL for testing/asserts
    SpiLoggerFactory loggerFactory = service(SpiLoggerFactory.class);
@@ -148,6 +178,17 @@ public final class InternalConfiguration {
    return new DefaultExpressionFactory(config.isExpressionEqualsWithNullAsNoop(), nativeIlike);
  }

+  private DocStoreFactory initDocStoreFactory(DocStoreFactory service) {
+    return service == null ? new NoneDocStoreFactory() : service;
+  }
+
+  /**
+   * Return the doc store factory.
+   */
+  public DocStoreFactory getDocStoreFactory() {
+    return docStoreFactory;
+  }
+
  ClockService getClockService() {
    return clockService;
  }
@@ -204,6 +245,22 @@ public final class InternalConfiguration {
    return plugin((listener != null) ? listener : jacksonCorePresent ? new DefaultChangeLogListener() : null);
  }

+  /**
+   * Return the ReadAuditLogger implementation to use.
+   */
+  ReadAuditLogger getReadAuditLogger() {
+    ReadAuditLogger found = bootupClasses.getReadAuditLogger();
+    return plugin(found != null ? found : jacksonCorePresent ? new DefaultReadAuditLogger() : null);
+  }
+
+  /**
+   * Return the ReadAuditPrepare implementation to use.
+   */
+  ReadAuditPrepare getReadAuditPrepare() {
+    ReadAuditPrepare found = bootupClasses.getReadAuditPrepare();
+    return plugin(found != null ? found : new DefaultReadAuditPrepare());
+  }
+
  /**
   * For 'As Of' queries return the number of bind variables per predicate.
   */
@@ -290,6 +347,10 @@ public final class InternalConfiguration {
    return beanDescriptorManager;
  }

+  public DeployInherit getDeployInherit() {
+    return deployInherit;
+  }
+
  public DeployCreateProperties getDeployCreateProperties() {
    return deployCreateProperties;
  }
@@ -311,19 +372,29 @@ public final class InternalConfiguration {
    return new GeneratedPropertyFactory(offlineMode, config, bootupClasses.getIdGenerators());
  }

+  /**
+   * Create the DocStoreIntegration components for the given server.
+   */
+  DocStoreIntegration createDocStoreIntegration(SpiServer server) {
+    return plugin(docStoreFactory.create(server));
+  }
+
  /**
   * Create the TransactionManager taking into account autoCommit mode.
   */
-  TransactionManager createTransactionManager(SpiServer server) {
+  TransactionManager createTransactionManager(SpiServer server, DocStoreUpdateProcessor indexUpdateProcessor) {

    TransactionScopeManager scopeManager = createTransactionScopeManager();
    boolean notifyL2CacheInForeground = cacheManager.isLocalL2Caching() || config.isNotifyL2CacheInForeground();

    TransactionManagerOptions options =
      new TransactionManagerOptions(server, notifyL2CacheInForeground, config, scopeManager, clusterManager, backgroundExecutor,
-        beanDescriptorManager, dataSource(), profileHandler(), logManager,
+        indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
        tableModState, cacheNotify, clockService);

+    if (config.isDocStoreOnly()) {
+      return new DocStoreTransactionManager(options);
+    }
    return new TransactionManager(options);
  }

@@ -114,6 +114,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return server.databasePlatform().escapeLikeString(value);
  }

+  @Override
  public void executeSecondaryQueries(boolean forEach) {
    // disable lazy loading leaves loadContext null
    if (loadContext != null) {
@@ -147,6 +148,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return loadContext;
  }

+  @Override
+  public boolean isUseDocStore() {
+    return query.isUseDocStore();
+  }
+
  /**
   * Run BeanQueryAdapter preQuery() if needed.
   */
@@ -219,6 +225,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
      persistenceContext.beginIterate();
    }
    loadContext = new DLoadContext(this, secondaryQueries);
+    loadContext.useReferences(Type.ITERATE == query.type());
  }

  /**
@@ -241,6 +248,23 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    }
  }

+  /**
+   * Return the JsonReadOptions taking into account lazy loading and persistence context.
+   */
+  @Override
+  public JsonReadOptions createJsonReadOptions() {
+    persistenceContext = persistenceContext(query, transaction);
+    if (query.persistenceContext() == null) {
+      query.setPersistenceContext(persistenceContext);
+    }
+    JsonReadOptions jsonRead = new JsonReadOptions();
+    jsonRead.setPersistenceContext(persistenceContext);
+    if (!query.isDisableLazyLoading()) {
+      loadContext = new DLoadContext(this, secondaryQueries);
+      jsonRead.setLoadContext(loadContext);
+    }
+    return jsonRead;
+  }

  /**
   * Get the TransactionContext either explicitly set on the query or
@@ -615,6 +639,17 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    }

    Object cached = beanDescriptor.queryCacheGet(cacheKey);
+    if (cached != null && isAuditReads() && readAuditQueryType()) {
+      if (cached instanceof BeanCollection) {
+        // raw sql can't use L2 cache so normal queries only in here
+        Collection<T> actualDetails = ((BeanCollection<T>) cached).actualDetails();
+        List<Object> ids = new ArrayList<>(actualDetails.size());
+        for (T bean : actualDetails) {
+          ids.add(beanDescriptor.idForJson(bean));
+        }
+        beanDescriptor.readAuditMany(queryPlanKey.partialKey(), "l2-query-cache", ids);
+      }
+    }
    if (Boolean.FALSE.equals(query.isReadOnly())) {
      // return shallow copies if readonly is explicitly set to false
      if (cached instanceof BeanCollection) {
@@ -630,6 +665,24 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return cached;
  }

+  /**
+   * Return true if the query type contains bean data (not just ids etc) and hence we want to include
+   * it in read auditing.  Return false for row count and find ids queries.
+   */
+  private boolean readAuditQueryType() {
+    Type type = query.type();
+    switch (type) {
+      case BEAN:
+      case ITERATE:
+      case LIST:
+      case SET:
+      case MAP:
+        return true;
+      default:
+        return false;
+    }
+  }
+
  public void putToQueryCache(Object result) {
    beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.startNanoTime()));
  }
@@ -656,6 +709,15 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return (batchSize > 0) ? batchSize : server.lazyLoadBatchSize();
  }

+  /**
+   * Return true if read auditing is on for this query request.
+   * <p>
+   * This means that read audit is on for this bean type and that query has not explicitly disabled it.
+   */
+  public boolean isAuditReads() {
+    return beanDescriptor.isReadAuditing() && !query.isDisableReadAudit();
+  }
+
  /**
   * Return the base table alias for this query.
   */
@@ -711,10 +773,4 @@ 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());
-    }
-  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob BygraveandGitHub	d92abbbe9c	Merge branch 'master' into feature/sequencedSet	2024-02-10 14:13:21 +13:00
Rob Bygrave	39500567c3	Build needs to use Java 21 to support the multi-release jar	2024-02-10 13:29:40 +13:00
Rob Bygrave	ded6fd71b2	Refactor rename method getBeanCollectionAdd() -> collectionAdd()	2024-01-12 16:42:58 +13:00
Rob Bygrave	cbc4883672	Refactor BeanSet, BeanList, BeanMap replacing setActualSet\|List\|Map Replace with collectionAdd() and refresh() methods.	2024-01-12 16:41:32 +13:00
Rob Bygrave	64e227117b	Add support for Java 21 SequencedSet and SequencedMap Such that these can be used in place of Set and Map if desired.	2024-01-12 16:14:08 +13:00