ORM Update - add usingTransaction() to support using explicit transaction

2026-09-20 19:17:55 +00:00 · 2026-07-21 10:10:00 +12:00
613 changed files with 28841 additions and 2618 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-pgvector-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -1,39 +1,40 @@
-# Guide: `@DbJson` / `@DbJsonB` mapping support
+# Guide: `@DbJson` / `@DbJsonB` mapping support — built-in vs Jackson ObjectMapper

 ## Purpose

-Ebean can map `@DbJson` and `@DbJsonB` properties in three ways:
+Ebean can map `@DbJson` and `@DbJsonB` properties in two ways:

 - **Built-in** JSON support, backed by **avaje-json-core** — no extra dependency.
- **Jackson `ObjectMapper`**, provided by **`ebean-jackson-mapper`**.
- **Avaje Jsonb**, provided by **`ebean-avajejsonb-mapper`** and its generated adapters.
+- **Jackson `ObjectMapper`**, provided by the **`ebean-jackson-mapper`** module — used
+  for everything the built-in support does not handle.

-The built-in mapper handles the common natural JSON types. Add one mapper module for
-typed collections, POJOs, records, and other custom types.
+This guide lists exactly which property types are handled built-in and which require
+`ebean-jackson-mapper`.

-> If a property type is **not** handled built-in and no mapper module is on the classpath,
-> Ebean fails fast at startup:
+> If a property type is **not** handled built-in and `ebean-jackson-mapper` is not on the
+> classpath, Ebean fails fast at startup:
 >
 > ```text
-> Unsupported @DbJson mapping - missing JSON mapper dependency for <property>
+> Unsupported @DbJson mapping - Missing dependency ebean-jackson-mapper?
+> Jackson ObjectMapper not present for <property>
 > ```

 ---

 ## Quick reference

-| Property type | Built-in (avaje-json-core) | Mapper module |
-|---|:---:|---|
+| Property type | Built-in (avaje-json-core) | Needs `ebean-jackson-mapper` |
+|---|:---:|:---:|
 | `String` | ✅ | |
 | `List<String>`, `List<Long>` | ✅ | |
 | `Set<String>`, `Set<Long>` | ✅ | |
 | `Map<String, Object>`, `Map<String, ?>` | ✅ | |
 | `Map<String, String>` | ✅ | |
 | `Map<Enum, Object>`, `Map<Enum, String>` | ✅ | |
-| `List`/`Set` of any other element type (`Integer`, `Double`, `UUID`, `LocalDate`, an enum, a POJO, …) | | Jackson or Avaje Jsonb |
-| `Map` with a typed value other than `String`/`Object` (`Map<String,Integer>`, `Map<String,UUID>`, …) | | Jackson or Avaje Jsonb |
-| `Map` with a key other than `String` or an enum (`Map<Integer, …>`, `Map<UUID, …>`) | | Jackson or Avaje Jsonb |
-| POJOs, records, or any other type | | Jackson or Avaje Jsonb |
+| `List`/`Set` of any other element type (`Integer`, `Double`, `UUID`, `LocalDate`, an enum, a POJO, …) | | ✅ |
+| `Map` with a typed value other than `String`/`Object` (`Map<String,Integer>`, `Map<String,UUID>`, …) | | ✅ |
+| `Map` with a key other than `String` or an enum (`Map<Integer, …>`, `Map<UUID, …>`) | | ✅ |
+| POJOs, records, or any other type | | ✅ |

 ---

@@ -58,10 +59,10 @@ Postgres `json` / `jsonb` — without `ebean-jackson-mapper`.

 ---

-## Jackson `ObjectMapper`
+## Everything else → Jackson `ObjectMapper`

-`ebean-jackson-mapper` uses a Jackson `ObjectMapper` for the property types not handled
-built-in:
+Any other `@DbJson` / `@DbJsonB` property routes to the Jackson `ObjectMapper` path, which
+requires `ebean-jackson-mapper`:

 - **Typed collections** — `List`/`Set` whose element type is not `String` or `Long`
  (for example `List<Integer>`, `List<UUID>`, `List<LocalDate>`, `List<MyEnum>`, `List<MyPojo>`).
@@ -76,7 +77,7 @@ built-in:

 ---

-### Adding `ebean-jackson-mapper`
+## Adding `ebean-jackson-mapper`

 ```xml
 <dependency>
@@ -91,79 +92,6 @@ registers the mapper-based JSON support automatically.

 ---

-## Avaje Jsonb
-
-`ebean-avajejsonb-mapper` uses Avaje Jsonb adapters. Annotate each JSON payload type with
-`@Json`, or use `@Json.Import`, and configure `avaje-jsonb-generator` as an annotation
-processor.
-
-```xml
-<dependency>
-  <groupId>io.ebean</groupId>
-  <artifactId>ebean-avajejsonb-mapper</artifactId>
-  <version>${ebean.version}</version>
-</dependency>
-```
-
-```xml
-<plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-compiler-plugin</artifactId>
-  <configuration>
-    <annotationProcessorPaths>
-      <path>
-        <groupId>io.avaje</groupId>
-        <artifactId>avaje-jsonb-generator</artifactId>
-        <version>${avaje-jsonb.version}</version>
-      </path>
-    </annotationProcessorPaths>
-  </configuration>
-</plugin>
-```
-
-For example:
-
-```java
-import io.avaje.jsonb.Json;
-
-@Json
-public class Address {
-  public String line1;
-  public String city;
-}
-```
-
-Avaje Jsonb preserves a property's declared generic type, so `List<Address>` and other
-parameterised JSON values use the generated `Address` adapter.
-
-### Avaje JsonNode
-
-`@DbJson` and `@DbJsonB` properties declared as `io.avaje.json.node.JsonNode` are supported
-when the application includes `avaje-json-node`. Its Jsonb component supplies the JSON tree
-adapters; no application-generated adapter is needed for the node hierarchy.
-
-```xml
-<dependency>
-  <groupId>io.avaje</groupId>
-  <artifactId>avaje-json-node</artifactId>
-  <version>${avaje-jsonb.version}</version>
-</dependency>
-```
-
-## Mapper module selection
-
-Use exactly one mapper module in an application: `ebean-jackson-mapper` or
-`ebean-avajejsonb-mapper`. Ebean selects a single `ScalarJsonMapper` service provider, so
-having both modules on the runtime classpath is not supported.
-
-The `ebean` composite dependency includes `ebean-jackson-mapper`. Applications using Avaje
-Jsonb should depend on the individual Ebean modules they need instead of that composite.
-
-To migrate from Jackson to Avaje Jsonb, remove `ebean-jackson-mapper`, add
-`ebean-avajejsonb-mapper`, and generate adapters for each JSON payload type.
-
---
-
 ## Notes

 - **Enum map keys** are serialised using the enum `name()` (for example `ACTIVE`), not any
@@ -174,13 +102,15 @@ To migrate from Jackson to Avaje Jsonb, remove `ebean-jackson-mapper`, add
  (with a JSON fallback on platforms without array support) and supports more element types
  than built-in `@DbJson` collections.
 - The reason typed value/element collections need a real mapper is that the built-in path
-  only produces natural JSON types — for example a JSON number always parses to `Long`.
+  only produces natural JSON types — for example a JSON number always parses to `Long`, so a
+  declared `List<Integer>` or `Map<String,Integer>` could not be populated safely without a
+  type-aware mapper.

 ---

 ## Choosing

 - Prefer the **built-in** mappings for the common cases (`String`, string/long lists and sets,
-  object/string maps) to avoid an additional mapper module.
- Add **`ebean-jackson-mapper`** or **`ebean-avajejsonb-mapper`** when you need rich POJO JSON
-  columns or typed collections / typed-value maps.
+  object/string maps) to avoid pulling in Jackson.
+- Add **`ebean-jackson-mapper`** when you need rich POJO JSON columns or typed collections /
+  typed-value maps.
@@ -376,12 +376,7 @@ public class Customer {
 **Important:**
 - Use `List<>` not `Set<>` for collections (Set calls equals/hashCode before beans have IDs)
 - `mappedBy` means Order.customer is the owner
- Relationships are lazy-loaded by default — **except** `@OneToOne(mappedBy=...)`,
-  which defaults to `FetchType.EAGER` and adds a `left join` to every default
-  select of the owning entity. Explicitly set `fetch = FetchType.LAZY` on
-  `@OneToOne(mappedBy=...)` fields unless the association is needed on
-  (almost) every load. See "`@OneToOne(mappedBy=...)` is EAGER by default" in
-  the query-beans guide for details.
+- Relationships are lazy-loaded by default

 ---

@@ -431,48 +431,6 @@ List<Customer> customers = new QCustomer()
 If the caller needs multiple to-many paths or a paged query, be suspicious of a
 plain `fetch(...)` on those paths. `fetchQuery()` is often the safer default.

-### `@OneToOne(mappedBy=...)` is EAGER by default — mark it LAZY
-
-The non-owning side of a `@OneToOne` (the side with `mappedBy`) defaults to
-`FetchType.EAGER` per JPA, same as `@ManyToOne`. Unlike a `@ManyToOne`
-reference (which is FK-only until `.fetch()`'d), Ebean's default select for an
-EAGER `@OneToOne(mappedBy=...)` still adds a `left join` to the target table
-on **every** query for the owning entity — even a plain `findById()` — because
-there is no local FK column to use as a lazy reference; the only way to know
-the associated row exists is to join to it.
-
-If that association is rarely needed (e.g. a rarely-read child/detail table),
-this join executes on every load of the parent, including in hot-path list
-queries, and can dominate query cost as more such associations accumulate.
-
-**Always set `fetch = FetchType.LAZY` on `@OneToOne(mappedBy=...)`
-associations unless the association is genuinely needed on (almost) every
-load:**
-
-```java
-@OneToOne(mappedBy = "device", fetch = FetchType.LAZY)
-private SensorBoard sensorBoard;
-```
-
-This correctly excludes the join from Ebean's default select clause (verified
-for FK-based, non-shared-primary-key `@OneToOne` relationships — the common
-case). Callers that do need the association can still `.fetch("sensorBoard")`
-explicitly on the query bean.
-
-**Caveat:** the exclusion is driven by Ebean's default-select-clause
-mechanism. It is bypassed if the query has already been switched into an
-"all properties" mode by something other than the deploy-time
-`FetchType.LAZY`/`EAGER` metadata (for example, an active AutoTune profile
-that supplies its own tuned property set). Confirm the join is actually gone
-by checking generated SQL (`LoggedSql` in tests, or query logging) after
-making this change — don't assume it's excluded from the annotation alone.
-
-### Agent rule
-
-Default new `@OneToOne(mappedBy=...)` fields to `fetch = FetchType.LAZY`
-unless there's a clear reason the association is needed on every load. This
-is a one-line, low-risk change that avoids an always-on join.
-
 ---

 ## Step 8 - Use DTO projection when the caller does not need entity beans
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <name>ebean api</name>
@@ -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);
+  }
 }
@@ -745,6 +745,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>
@@ -764,6 +779,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>
@@ -247,6 +247,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)}.
   *
@@ -254,6 +266,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>
@@ -417,6 +464,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.
@@ -1328,6 +1387,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;
@@ -694,6 +696,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 suffix appended to the base table to derive the view that contains the union
   * of the base table and the history table in order to support asOf queries.
@@ -960,7 +994,7 @@ public interface DatabaseBuilder {
   * <p>
   * Use this to override the default known aggregation functions.
   */
-  DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
+  DatabaseBuilder aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);

  /**
   * Set to true if all DB column and table names should use quoted identifiers.
@@ -978,6 +1012,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.
   */
@@ -2430,6 +2474,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.
     */
@@ -2573,6 +2627,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.
     */
@@ -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 org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.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.
+ */
+@NullMarked
+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 org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import io.ebean.search.*;

 import jakarta.persistence.NonUniqueResultException;
 import java.sql.Connection;
@@ -90,6 +91,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>
@@ -525,6 +531,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.
@@ -576,6 +604,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.
   *
@@ -659,6 +700,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>
@@ -667,6 +716,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).
   */
@@ -686,6 +745,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
@@ -1628,6 +1695,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.
   */
@@ -1770,6 +1878,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);
+  }
+
 }
@@ -346,6 +346,23 @@ public interface Query<T> extends QueryBuilder<Query<T>, T> {
   */
  ExpressionList<T> where();

+  /**
+   * Add Full text search expressions for Document store queries.
+   * <p>
+   * This is currently ElasticSearch only and provides the full text
+   * expressions such as Match and Multi-Match.
+   * <p>
+   * This automatically makes this query a "Doc Store" query and will execute
+   * against the document store (ElasticSearch).
+   * <p>
+   * Expressions added here are added to the "query" section of an ElasticSearch
+   * query rather than the "filter" section.
+   * <p>
+   * Expressions added to the where() are added to the "filter" section of an
+   * ElasticSearch query.
+   */
+  ExpressionList<T> text();
+
  /**
   * This applies a filter on the 'many' property list rather than the root
   * level objects.
@@ -440,6 +457,11 @@ public interface Query<T> extends QueryBuilder<Query<T>, T> {
  @Nullable
  LockType getForUpdateLockType();

+  /**
+   * Returns the inherit type. This is normally the same as getBeanType() returns as long as no other type is set.
+   */
+  Class<? extends T> getInheritType();
+
  /**
   * Return the type of query being executed.
   */
@@ -61,6 +61,11 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF asOf(Timestamp asOf);

+  /**
+   * Execute the query against the draft set of tables.
+   */
+  SELF asDraft();
+
  /**
   * Convert the query to a DTO bean query.
   * <p>
@@ -239,7 +244,44 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setHint(String hint);

-   /**
+  /**
+   * 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>
+   * <pre>{@code
+   *
+   *   // explicitly specify the indexes to search
+   *   query.setDocIndexName("logstash-2016.11.5,logstash-2016.11.6")
+   *
+   *   // search today's index
+   *   query.setDocIndexName("$today")
+   *
+   *   // search the last 3 days
+   *   query.setDocIndexName("$last-3")
+   *
+   * }</pre>
+   * <p>
+   * If the indexName is specified with ${daily} e.g. "logstash-${daily}" ... then we can use
+   * $today and $last-x as the search docIndexName like the examples below.
+   * </p>
+   * <pre>{@code
+   *
+   *   // search today's index
+   *   query.setDocIndexName("$today")
+   *
+   *   // search the last 3 days
+   *   query.setDocIndexName("$last-3")
+   *
+   * }</pre>
+   *
+   * @param indexName The index or indexes to search against
+   * @return This query
+   */
+  SELF setDocIndexName(String indexName);
+
+  /**
   * Execute the query including soft deleted rows.
   * <p>
   * This means that Ebean will not add any predicates to the query for filtering out
@@ -249,6 +291,15 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setIncludeSoftDeletes();

+  /**
+   * 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.
+   */
+  SELF setDisableReadAuditing();
+
  /**
   * Set true if you want to disable lazy loading.
   * <p>
@@ -261,6 +312,20 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setDistinct(boolean distinct);

+  /**
+   * Restrict the query to only return subtypes of the given inherit type.
+   * <pre>{@code
+   *
+   *   List<Animal> animals =
+   *     new QAnimal()
+   *       .name.startsWith("Fluffy")
+   *       .setInheritType(Cat.class)
+   *       .findList();
+   *
+   * }</pre>
+   */
+  SELF setInheritType(Class<? extends T> type);
+
  /**
   * Set the first row to return for this query.
   *
@@ -331,6 +396,13 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setMapKey(String mapKey);

+  /**
+   * Set to true if this query should execute against the doc store.
+   * <p>
+   * When setting this you may also consider disabling lazy loading.
+   */
+  SELF setUseDocStore(boolean useDocStore);
+
  /**
   * When set to true when you want the returned beans to be unmodifiable read only.
   * <p>
@@ -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
@@ -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;
@@ -118,6 +120,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).
@@ -395,6 +407,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;
@@ -971,6 +985,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 String getDbSchema() {
    return dbSchema;
@@ -1256,6 +1292,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();
@@ -2039,6 +2097,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.
   */
@@ -2069,6 +2134,11 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    }
    loadDataSourceSettings(p);

+    if (docStoreConfig == null) {
+      docStoreConfig = new DocStoreConfig();
+    }
+    loadDocStoreSettings(p);
+
    defaultServer = p.getBoolean("defaultServer", defaultServer);
    shutdownHook = p.getBoolean("shutdownHook", shutdownHook);
    readOnlyDatabase = p.getBoolean("readOnlyDatabase", readOnlyDatabase);
@@ -2087,6 +2157,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
    queryPlanCaptureMaxCount = p.getInt("queryPlan.captureMaxCount", queryPlanCaptureMaxCount);
    queryPlanExplain = p.get("queryPlan.explain", queryPlanExplain);
+    docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
    enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
@@ -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);
+  }
+}
@@ -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;
+  }
+}
@@ -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;
@@ -5,18 +5,13 @@ package io.ebean.meta;
 */
 public abstract class AbstractMetricVisitor implements MetricVisitor {

-  private final Mode mode;
+  private final boolean reset;
  private final boolean collectTransactionMetrics;
  private final boolean collectQueryMetrics;
  private final boolean collectL2Metrics;

  public AbstractMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
-    this(reset ? Mode.RESET : Mode.CUMULATIVE,
-      collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
-  }
-
-  public AbstractMetricVisitor(Mode mode, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
-    this.mode = mode;
+    this.reset = reset;
    this.collectTransactionMetrics = collectTransactionMetrics;
    this.collectQueryMetrics = collectQueryMetrics;
    this.collectL2Metrics = collectL2Metrics;
@@ -24,12 +19,7 @@ public abstract class AbstractMetricVisitor implements MetricVisitor {

  @Override
  public boolean reset() {
-    return mode == Mode.RESET;
-  }
-
-  @Override
-  public Mode mode() {
-    return mode;
+    return reset;
  }

  @Override
@@ -57,3 +47,4 @@ public abstract class AbstractMetricVisitor implements MetricVisitor {
    // do nothing by default
  }
 }
+
@@ -30,16 +30,7 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
   * Construct specifying reset and what to collect.
   */
  public BasicMetricVisitor(String name, Function<String,String> naming, boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
-    this(name, naming, reset ? Mode.RESET : Mode.CUMULATIVE,
-      collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
-  }
-
-  /**
-   * Construct specifying the collection mode and what to collect.
-   */
-  public BasicMetricVisitor(String name, Function<String,String> naming, Mode mode,
-                            boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
-    super(mode, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
+    super(reset, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
    this.name = name;
    this.naming = naming;
  }
@@ -9,11 +9,6 @@ import java.time.Instant;
 */
 public interface MetaQueryPlan {

-  /**
-   * Return the name of the database for the query.
-   */
-  String dbName();
-
  /**
   * Return the bean type for the query.
   */
@@ -7,12 +7,6 @@ import java.util.function.Function;
 */
 public interface MetricVisitor {

-  enum Mode {
-    RESET,
-    CUMULATIVE,
-    DELTA
-  }
-
  /**
   * Return the naming convention that should be applied to the reported metric names.
   */
@@ -23,13 +17,6 @@ public interface MetricVisitor {
   */
  boolean reset();

-  /**
-   * Return the metric collection mode.
-   */
-  default Mode mode() {
-    return reset() ? Mode.RESET : Mode.CUMULATIVE;
-  }
-
  /**
   * Return true if we should visit the transaction metrics.
   */
@@ -37,16 +37,6 @@ public interface TimedMetric {
   */
  TimedMetricStats collect(boolean reset);

-  /**
-   * Collect a snapshot using the given collection mode.
-   *
-   * <p>Implementations that do not support delta collection use cumulative
-   * collection for {@link MetricVisitor.Mode#DELTA}.</p>
-   */
-  default TimedMetricStats collect(MetricVisitor.Mode mode) {
-    return collect(mode == MetricVisitor.Mode.RESET);
-  }
-
  /**
   * Visit non empty metrics.
   */
@@ -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);
 }
@@ -39,6 +39,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;
@@ -25,11 +25,14 @@ module io.ebean.api {
  exports io.ebean.common;
  exports io.ebean.config;
  exports io.ebean.config.dbplatform;
+  exports io.ebean.docstore;
  exports io.ebean.event;
+  exports io.ebean.event.readaudit;
  exports io.ebean.event.changelog;
  exports io.ebean.plugin;
  exports io.ebean.meta;
  exports io.ebean.metric;
+  exports io.ebean.search;
  exports io.ebean.service;
  exports io.ebean.text;
  exports io.ebean.text.json;
@@ -43,18 +43,4 @@ class MetaInfoManagerTest {

    assertThat(manager.collectMetrics(false)).isSameAs(metrics);
  }
-
-  @Test
-  void basicMetricVisitorSupportsExplicitCollectionModes() {
-    var reset = new BasicMetricVisitor("db", MetricNamingMatch.INSTANCE, MetricVisitor.Mode.RESET, true, true, true);
-    var cumulative = new BasicMetricVisitor("db", MetricNamingMatch.INSTANCE, MetricVisitor.Mode.CUMULATIVE, true, true, true);
-    var delta = new BasicMetricVisitor("db", MetricNamingMatch.INSTANCE, MetricVisitor.Mode.DELTA, true, true, true);
-
-    assertThat(reset.reset()).isTrue();
-    assertThat(reset.mode()).isEqualTo(MetricVisitor.Mode.RESET);
-    assertThat(cumulative.reset()).isFalse();
-    assertThat(cumulative.mode()).isEqualTo(MetricVisitor.Mode.CUMULATIVE);
-    assertThat(delta.reset()).isFalse();
-    assertThat(delta.mode()).isEqualTo(MetricVisitor.Mode.DELTA);
-  }
 }
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>ebean-avajejsonb-mapper</artifactId>
-  <name>ebean-avajejsonb-mapper</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-json-core</artifactId>
-      <version>${avaje-json-core.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsonb</artifactId>
-      <version>${avaje-jsonb.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-json-node</artifactId>
-      <version>${avaje-jsonb.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>${h2database.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-generator</artifactId>
-      <version>18.5.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>io.avaje</groupId>
-              <artifactId>avaje-jsonb-generator</artifactId>
-              <version>${avaje-jsonb.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-maven-plugin</artifactId>
-        <version>${ebean-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>process-test-classes</phase>
-            <configuration>
-              <packages>org/example/avajejsonb/**</packages>
-              <transformArgs>debug=0</transformArgs>
-            </configuration>
-            <goals>
-              <goal>testEnhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
@@ -1,223 +0,0 @@
-package io.ebean.avajejsonb.mapper;
-
-import io.avaje.json.JsonReader;
-import io.avaje.json.JsonWriter;
-import io.avaje.jsonb.JsonType;
-import io.avaje.jsonb.Jsonb;
-import io.ebean.annotation.MutationDetection;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.JsonTrim;
-import io.ebean.core.type.PostgresHelper;
-import io.ebean.core.type.ScalarJsonManager;
-import io.ebean.core.type.ScalarJsonMapper;
-import io.ebean.core.type.ScalarJsonRequest;
-import io.ebean.core.type.ScalarType;
-import io.ebean.core.type.ScalarTypeBase;
-import io.ebean.text.TextException;
-import jakarta.persistence.PersistenceException;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Type;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Supports {@code @DbJson} properties using Avaje Jsonb.
- */
-public final class ScalarJsonAvajeJsonbMapper implements ScalarJsonMapper {
-
-  private final ConcurrentHashMap<Type, JsonType<Object>> jsonTypes = new ConcurrentHashMap<>();
-
-  @Override
-  public <A extends Annotation> Class<A> markerAnnotation() {
-    return null;
-  }
-
-  @Override
-  public ScalarType<?> createType(ScalarJsonRequest request) {
-    Type genericType = genericType(request);
-    JsonType<Object> jsonType = jsonTypes.computeIfAbsent(genericType, type -> jsonb(request.manager()).type(type));
-    if (request.mode() == MutationDetection.NONE) {
-      return new NoMutationDetection(request.manager(), jsonType, request.dbType(), request.docType());
-    }
-    return new GenericObject(request.manager(), jsonType, request.dbType(), request.docType());
-  }
-
-  private Jsonb jsonb(ScalarJsonManager manager) {
-    Object mapper = manager.mapper();
-    return mapper instanceof Jsonb ? (Jsonb) mapper : Jsonb.instance();
-  }
-
-  private Type genericType(ScalarJsonRequest request) {
-    Class<?> type = request.beanType();
-    while (type != null) {
-      try {
-        Field field = type.getDeclaredField(request.name());
-        return field.getGenericType();
-      } catch (NoSuchFieldException e) {
-        type = type.getSuperclass();
-      }
-    }
-    throw new IllegalStateException("Field not found to match " + request.name());
-  }
-
-  private static final class NoMutationDetection extends Base<Object> {
-
-    NoMutationDetection(ScalarJsonManager jsonManager, JsonType<Object> jsonType, int dbType, DocPropertyType docType) {
-      super(Object.class, jsonManager, jsonType, dbType, docType);
-    }
-  }
-
-  private static final class GenericObject extends Base<Object> {
-
-    private final boolean jsonb;
-
-    GenericObject(ScalarJsonManager jsonManager, JsonType<Object> jsonType, int dbType, DocPropertyType docType) {
-      super(Object.class, jsonManager, jsonType, dbType, docType);
-      this.jsonb = "jsonb".equals(pgType);
-    }
-
-    @Override
-    public boolean mutable() {
-      return true;
-    }
-
-    @Override
-    public boolean jsonMapper() {
-      return true;
-    }
-
-    @Override
-    public Object read(DataReader reader) throws SQLException {
-      String json = reader.getString();
-      if (jsonb) {
-        json = JsonTrim.trim(json);
-      }
-      reader.pushJson(json);
-      return parseJson(json);
-    }
-
-    @Override
-    public void bind(DataBinder binder, Object value) throws SQLException {
-      String rawJson = binder.popJson();
-      if (rawJson == null && value != null) {
-        rawJson = formatValue(value);
-      }
-      bindJson(binder, value, rawJson);
-    }
-  }
-
-  private static abstract class Base<T> extends ScalarTypeBase<T> {
-
-    private final JsonType<T> jsonType;
-    protected final String pgType;
-    private final DocPropertyType docType;
-
-    Base(Class<T> cls, ScalarJsonManager jsonManager, JsonType<T> jsonType, int dbType, DocPropertyType docType) {
-      super(cls, false, dbType);
-      this.jsonType = jsonType;
-      this.pgType = jsonManager.postgresType(dbType);
-      this.docType = docType;
-    }
-
-    @Override
-    public T read(DataReader reader) throws SQLException {
-      return parseJson(reader.getString());
-    }
-
-    @Override
-    public void bind(DataBinder binder, T value) throws SQLException {
-      bindJson(binder, value, value == null ? null : formatValue(value));
-    }
-
-    final T parseJson(String json) {
-      if (json == null || json.isEmpty()) {
-        return null;
-      }
-      try {
-        return jsonType.fromJson(json);
-      } catch (RuntimeException e) {
-        throw new TextException("Failed to parse JSON [{}] as " + jsonType, json, e);
-      }
-    }
-
-    final void bindJson(DataBinder binder, Object value, String rawJson) throws SQLException {
-      if (pgType != null) {
-        binder.setObject(PostgresHelper.asObject(pgType, rawJson));
-      } else if (value == null) {
-        binder.setNull(Types.VARCHAR);
-      } else {
-        binder.setString(rawJson);
-      }
-    }
-
-    @Override
-    public final Object toJdbcType(Object value) {
-      return value;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public final T toBeanType(Object value) {
-      return (T) value;
-    }
-
-    @Override
-    public final String formatValue(T value) {
-      try {
-        return jsonType.toJson(value);
-      } catch (RuntimeException e) {
-        throw new PersistenceException("Unable to create JSON", e);
-      }
-    }
-
-    @Override
-    public final T parse(String value) {
-      return parseJson(value);
-    }
-
-    @Override
-    public final DocPropertyType docType() {
-      return docType;
-    }
-
-    @Override
-    public final T jsonRead(JsonReader parser) {
-      if (parser.isNullValue()) {
-        return null;
-      }
-      return parseJson(parser.readRaw());
-    }
-
-    @Override
-    public final void jsonWrite(JsonWriter writer, T value) throws IOException {
-      if (value == null) {
-        writer.nullValue();
-      } else {
-        writer.rawValue(formatValue(value));
-      }
-    }
-
-    @Override
-    public final T readData(DataInput dataInput) throws IOException {
-      return dataInput.readBoolean() ? parse(dataInput.readUTF()) : null;
-    }
-
-    @Override
-    public final void writeData(DataOutput dataOutput, T value) throws IOException {
-      if (value == null) {
-        dataOutput.writeBoolean(false);
-      } else {
-        dataOutput.writeBoolean(true);
-        dataOutput.writeUTF(format(value));
-      }
-    }
-  }
-}
@@ -1,9 +0,0 @@
-import io.ebean.avajejsonb.mapper.ScalarJsonAvajeJsonbMapper;
-
-module io.ebean.avajejsonb.mapper {
-
-  requires io.avaje.jsonb;
-  requires io.ebean.core.type;
-
-  provides io.ebean.core.type.ScalarJsonMapper with ScalarJsonAvajeJsonbMapper;
-}
@@ -1 +0,0 @@
-io.ebean.avajejsonb.mapper.ScalarJsonAvajeJsonbMapper
@@ -1,56 +0,0 @@
-package io.ebean.avajejsonb.mapper;
-
-import io.avaje.json.node.JsonNode;
-import io.avaje.json.node.JsonObject;
-import io.ebean.Database;
-import io.ebean.DatabaseBuilder;
-import org.example.avajejsonb.JsonbEntity;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Properties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class JsonbDatabaseTest {
-
-  @Test
-  void dbJson_roundTripsJsonbPayloadsAndJsonNode() {
-    Database database = buildDatabase();
-    try {
-      JsonbEntity entity = new JsonbEntity();
-      entity.setPayload(new JsonbPayload("main", 1));
-      entity.setPayloads(List.of(new JsonbPayload("first", 2), new JsonbPayload("second", 3)));
-      entity.setNode(JsonObject.create().add("name", "node").add("count", 4));
-      database.save(entity);
-
-      JsonbEntity found = database.find(JsonbEntity.class, entity.getId());
-
-      assertThat(found.getPayload()).isEqualTo(new JsonbPayload("main", 1));
-      assertThat(found.getPayloads()).containsExactly(new JsonbPayload("first", 2), new JsonbPayload("second", 3));
-      JsonNode node = found.getNode();
-      assertThat(node.extract("name")).isEqualTo("node");
-      assertThat(node.extract("count", 0)).isEqualTo(4);
-    } finally {
-      database.shutdown();
-    }
-  }
-
-  private static Database buildDatabase() {
-    DatabaseBuilder config = Database.builder();
-    config.setName("avajeJsonbMapper");
-    config.setDefaultServer(false);
-    config.setDdlGenerate(true);
-    config.setDdlRun(true);
-    config.setDdlExtra(false);
-
-    Properties properties = new Properties();
-    properties.setProperty("datasource.avajeJsonbMapper.username", "sa");
-    properties.setProperty("datasource.avajeJsonbMapper.password", "");
-    properties.setProperty("datasource.avajeJsonbMapper.databaseUrl", "jdbc:h2:mem:avajeJsonbMapper");
-    properties.setProperty("datasource.avajeJsonbMapper.databaseDriver", "org.h2.Driver");
-    config.loadFromProperties(properties);
-    config.addClass(JsonbEntity.class);
-    return config.build();
-  }
-}
@@ -1,37 +0,0 @@
-package io.ebean.avajejsonb.mapper;
-
-import io.avaje.jsonb.Json;
-
-import java.util.Objects;
-
-@Json
-public class JsonbPayload {
-
-  public String name;
-  public int count;
-
-  public JsonbPayload() {
-  }
-
-  JsonbPayload(String name, int count) {
-    this.name = name;
-    this.count = count;
-  }
-
-  @Override
-  public boolean equals(Object object) {
-    if (this == object) {
-      return true;
-    }
-    if (!(object instanceof JsonbPayload)) {
-      return false;
-    }
-    JsonbPayload other = (JsonbPayload) object;
-    return count == other.count && Objects.equals(name, other.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, count);
-  }
-}
@@ -1,130 +0,0 @@
-package io.ebean.avajejsonb.mapper;
-
-import io.avaje.json.node.JsonNode;
-import io.avaje.json.node.JsonObject;
-import io.avaje.jsonb.Json;
-import io.ebean.annotation.MutationDetection;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarJsonManager;
-import io.ebean.core.type.ScalarJsonRequest;
-import io.ebean.core.type.ScalarType;
-import org.junit.jupiter.api.Test;
-
-import java.sql.Types;
-import java.util.List;
-import java.util.Objects;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class ScalarJsonAvajeJsonbMapperTest {
-
-  private static final ScalarJsonManager JSON_MANAGER = new ScalarJsonManager() {
-
-    @Override
-    public MutationDetection mutationDetection() {
-      return MutationDetection.HASH;
-    }
-
-    @Override
-    public Object mapper() {
-      return null;
-    }
-
-    @Override
-    public String postgresType(int dbType) {
-      return null;
-    }
-  };
-
-  private final ScalarJsonAvajeJsonbMapper mapper = new ScalarJsonAvajeJsonbMapper();
-
-  @Test
-  void pojo_roundTripsThroughGeneratedJsonbAdapter() {
-    ScalarType<Object> scalarType = scalarType("document", MutationDetection.HASH);
-    Payload payload = new Payload("hello", 42);
-
-    String json = scalarType.formatValue(payload);
-
-    assertThat(json).isEqualTo("{\"name\":\"hello\",\"count\":42}");
-    assertThat(scalarType.parse(json)).isEqualTo(payload);
-    assertThat(scalarType.mutable()).isTrue();
-    assertThat(scalarType.jsonMapper()).isTrue();
-  }
-
-  @Test
-  void genericList_roundTripsUsingPropertyGenericType() {
-    ScalarType<Object> scalarType = scalarType("payloads", MutationDetection.HASH);
-    List<Payload> payloads = List.of(new Payload("one", 1), new Payload("two", 2));
-
-    String json = scalarType.formatValue(payloads);
-
-    assertThat(json).isEqualTo("[{\"name\":\"one\",\"count\":1},{\"name\":\"two\",\"count\":2}]");
-    assertThat(scalarType.parse(json)).isEqualTo(payloads);
-  }
-
-  @Test
-  void jsonNode_roundTripsThroughAvajeJsonNodeComponent() {
-    ScalarType<Object> scalarType = scalarType("node", MutationDetection.HASH);
-    JsonNode node = JsonObject.create().add("name", "node").add("count", 3);
-
-    String json = scalarType.formatValue(node);
-
-    assertThat(json).isEqualTo("{\"name\":\"node\",\"count\":3}");
-    JsonNode parsed = (JsonNode) scalarType.parse(json);
-    assertThat(parsed.extract("name")).isEqualTo("node");
-    assertThat(parsed.extract("count", 0)).isEqualTo(3);
-  }
-
-  @Test
-  void mutationDetectionNone_isNotMutable() {
-    ScalarType<Object> scalarType = scalarType("document", MutationDetection.NONE);
-
-    assertThat(scalarType.mutable()).isFalse();
-    assertThat(scalarType.jsonMapper()).isFalse();
-  }
-
-  @SuppressWarnings("unchecked")
-  private ScalarType<Object> scalarType(String property, MutationDetection mutationDetection) {
-    var request = new ScalarJsonRequest(JSON_MANAGER, Types.VARCHAR, DocPropertyType.OBJECT, Entity.class, mutationDetection, property);
-    return (ScalarType<Object>) mapper.createType(request);
-  }
-
-  private static final class Entity {
-
-    Payload document;
-    List<Payload> payloads;
-    JsonNode node;
-  }
-
-  @Json
-  static class Payload {
-
-    public String name;
-    public int count;
-
-    Payload() {
-    }
-
-    Payload(String name, int count) {
-      this.name = name;
-      this.count = count;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-      if (this == object) {
-        return true;
-      }
-      if (!(object instanceof Payload)) {
-        return false;
-      }
-      Payload other = (Payload) object;
-      return count == other.count && Objects.equals(name, other.name);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(name, count);
-    }
-  }
-}
@@ -1,54 +0,0 @@
-package org.example.avajejsonb;
-
-import io.avaje.json.node.JsonNode;
-import io.ebean.avajejsonb.mapper.JsonbPayload;
-import io.ebean.annotation.DbJson;
-import io.ebean.annotation.DbJsonB;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-
-import java.util.List;
-
-@Entity
-public class JsonbEntity {
-
-  @Id
-  long id;
-
-  @DbJson
-  JsonbPayload payload;
-
-  @DbJson
-  List<JsonbPayload> payloads;
-
-  @DbJsonB
-  JsonNode node;
-
-  public long getId() {
-    return id;
-  }
-
-  public JsonbPayload getPayload() {
-    return payload;
-  }
-
-  public void setPayload(JsonbPayload payload) {
-    this.payload = payload;
-  }
-
-  public List<JsonbPayload> getPayloads() {
-    return payloads;
-  }
-
-  public void setPayloads(List<JsonbPayload> payloads) {
-    this.payloads = payloads;
-  }
-
-  public JsonNode getNode() {
-    return node;
-  }
-
-  public void setNode(JsonNode node) {
-    this.node = node;
-  }
-}
@@ -1 +0,0 @@
-entity-packages: org.example.avajejsonb
@@ -6,7 +6,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <artifactId>ebean-bench</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
@@ -125,19 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>18.5.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-avajejsonb-mapper</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
@@ -161,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <!-- platforms -->
@@ -199,91 +193,91 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-pgvector</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-pgvector-types</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>18.5.0</version>
+        <version>18.3.0</version>
      </dependency>

    </dependencies>
@@ -3,7 +3,7 @@
  <parent>
    <groupId>io.ebean</groupId>
    <artifactId>ebean-parent</artifactId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>
  <artifactId>ebean-core-json</artifactId>
  <name>ebean-core-json</name>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.12</version>
+      <version>42.7.11</version>
      <optional>true</optional>
    </dependency>

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.3.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-json</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
    </dependency>

    <dependency>
@@ -52,7 +52,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-externalmapping-api</artifactId>
+      <version>14.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.13.1</version>
    </dependency>

    <!--
@@ -145,21 +157,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.5.0</version>
+      <version>18.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -66,6 +66,11 @@ public interface LoadContext {
  @Nullable
  EntityBean immutableBeanHit(BeanDescriptor<?> descriptor, Object id);

+  /**
+   * Use soft-references for streaming queries, so unreachable entries can be garbage collected.
+   */
+  void useReferences(boolean useReferences);
+
  /**
   * Return true to include a many as a secondary query for unmodified.
   */
@@ -43,4 +43,5 @@ public interface LoadManyBuffer {

  void configureQuery(SpiQuery<?> query);

+  boolean isUseDocStore();
 }
@@ -107,7 +107,7 @@ public final class LoadManyRequest extends LoadRequest {
    }
    query.setLazyLoadForParents(many);
    final var pc = loadContext.persistenceContext();
-    many.addWhereParentIdIn(query, parentIdList(server, many, pc));
+    many.addWhereParentIdIn(query, parentIdList(server, many, pc), loadContext.isUseDocStore());
    query.setPersistenceContext(pc);
    query.setLoadDescription(lazy ? "lazy" : "query", description());
    if (lazy) {
@@ -5,6 +5,8 @@ import org.jspecify.annotations.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;
@@ -105,6 +107,11 @@ public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {
   */
  BeanDescriptor<?> descriptorById(String className);

+  /**
+   * Return BeanDescriptor using it's unique doc store queueId.
+   */
+  BeanDescriptor<?> descriptorByQueueId(String queueId);
+
  /**
   * Return BeanDescriptors mapped to this table.
   */
@@ -195,6 +202,17 @@ public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {
   */
  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>
@@ -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,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;
 }
@@ -12,6 +12,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;
@@ -171,6 +172,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).
     */
@@ -293,6 +299,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>
@@ -376,6 +393,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.
   */
@@ -509,6 +531,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.
   */
@@ -728,6 +755,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.
   */
@@ -804,6 +836,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.
   */
@@ -881,6 +918,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;
@@ -108,6 +109,19 @@ public interface SpiTransaction extends Transaction {
   */
  boolean isGeneratedPropertiesEnabled();

+  /**
+   * 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>
@@ -279,6 +293,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;
@@ -111,6 +113,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>
@@ -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.
   */
@@ -42,7 +42,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) {
@@ -12,6 +12,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;
+  }
+
+}
@@ -172,11 +172,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;
@@ -185,7 +186,9 @@ final class DefaultBeanLoader {
    }
    SpiQuery<?> query = server.createQuery(desc.type());
    query.setLazyLoadProperty(ebi.lazyLoadProperty());
-    if (desc.isSoftDelete()
+    if (draft) {
+      query.asDraft();
+    } else if (desc.isSoftDelete()
        && (mode == SpiQuery.Mode.LAZYLOAD_BEAN || mode == SpiQuery.Mode.REFRESH_BEAN)) {
      // include soft-deleted rows when lazy loading or refreshing so a
      // refresh() on a soft-deleted bean can reload it (issue #3641)
@@ -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);
+          }
        }
      }

@@ -12,6 +12,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;
@@ -27,9 +29,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;
@@ -38,6 +42,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 DtoMapperManager dtoMapperManager;
  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;
@@ -141,12 +149,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.clock = config.clock();

-    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();
@@ -182,7 +194,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);
    }
@@ -283,6 +297,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.
   */
@@ -598,7 +622,25 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
        return (T) existing;
      }
    }
-    return (T) desc.contextRef(pc, id);
+    InheritInfo inheritInfo = desc.inheritInfo();
+    if (inheritInfo == null || inheritInfo.isConcrete()) {
+      return (T) desc.contextRef(pc, 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
@@ -804,6 +846,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);
@@ -820,6 +885,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);
@@ -893,6 +968,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
@@ -975,6 +1051,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();
@@ -1233,6 +1312,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    SpiQuery<T> spiQuery = configureForFuture(query.copy());
    // FutureList query always run in its own persistence content
    spiQuery.setPersistenceContext(new DefaultPersistenceContext());
+    if (!spiQuery.isDisableReadAudit()) {
+      BeanDescriptor<T> desc = descriptorManager.descriptor(spiQuery.getBeanType());
+      desc.readAuditFutureList(spiQuery);
+    }
    final var queryFuture = new QueryFutureList<T>(new CallableQueryList<>(this, spiQuery));
    backgroundExecutor.execute(queryFuture.futureTask());
    return queryFuture;
@@ -1243,6 +1326,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    SpiQuery<T> spiQuery = configureForFuture(query.copy());
    // FutureMap 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);
+    }
    final var queryFuture = new QueryFutureMap<K, T>(new CallableQueryMap<>(this, spiQuery));
    backgroundExecutor.execute(queryFuture.futureTask());
    return queryFuture;
@@ -1254,6 +1341,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);
  }

@@ -1281,6 +1371,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
@@ -1289,6 +1383,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
@@ -1297,6 +1395,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
@@ -1331,6 +1433,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();
@@ -1600,6 +1705,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);
  }
@@ -1913,6 +2066,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.
   */
@@ -2019,6 +2182,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
@@ -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());
+    }
+  }
+
+}
@@ -12,6 +12,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.*;
@@ -28,6 +30,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;
@@ -40,10 +43,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.time.Clock;
 import java.util.*;
@@ -63,6 +74,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 DtoMapperManager dtoMapperManager;
@@ -81,6 +93,7 @@ public final class InternalConfiguration {
  private final ExpressionFactory expressionFactory;
  private final SpiBackgroundExecutor backgroundExecutor;
  private final JsonStream jsonStream;
+  private final DocStoreFactory docStoreFactory;
  private final List<Plugin> plugins = new ArrayList<>();
  private final MultiValueBind multiValueBind;
  private final SpiLogManager logManager;
@@ -97,6 +110,7 @@ public final class InternalConfiguration {
    this.clock = config.settings().getClock();
    this.tableModState = new TableModState();
    this.logManager = initLogManager();
+    this.docStoreFactory = initDocStoreFactory(service(DocStoreFactory.class));
    this.jsonStream = config.getJsonStream();
    this.clusterManager = clusterManager;
    this.backgroundExecutor = backgroundExecutor;
@@ -105,26 +119,34 @@ 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.dtoMapperManager = initDtoMapperManager();
    this.dataSourceSupplier = createDataSourceSupplier();
    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) {
@@ -145,6 +167,14 @@ public final class InternalConfiguration {
    return manager != null ? manager : new DtoMapperManager();
  }

+  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);
@@ -165,6 +195,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;
+  }
+
  Clock clock() {
    return clock;
  }
@@ -221,6 +262,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.
   */
@@ -308,6 +365,10 @@ public final class InternalConfiguration {
    return beanDescriptorManager;
  }

+  public DeployInherit getDeployInherit() {
+    return deployInherit;
+  }
+
  public DeployCreateProperties getDeployCreateProperties() {
    return deployCreateProperties;
  }
@@ -329,19 +390,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, dataSourceSupplier, profileHandler(), logManager,
+        indexUpdateProcessor, beanDescriptorManager, dataSourceSupplier, profileHandler(), logManager,
        tableModState, cacheNotify);

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

@@ -113,6 +113,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) {
@@ -159,6 +160,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return loadContext;
  }

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

  /**
@@ -254,6 +261,24 @@ 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
   * transaction scoped.
@@ -634,6 +659,24 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return beanDescriptor.queryCacheGet(cacheKey);
  }

+  /**
+   * 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) {
    CQueryPlan plan = queryPlan();
    if (plan != null) {
@@ -664,6 +707,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.
   */
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;

 import io.ebean.InsertOptions;
 import io.ebean.ValuePair;
+import io.ebean.annotation.DocStoreMode;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PreGetterCallback;
@@ -16,16 +17,21 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.persist.*;
 import io.ebeaninternal.server.transaction.BeanPersistIdMap;
+import io.ebeanservice.docstore.api.DocStoreUpdate;
+import io.ebeanservice.docstore.api.DocStoreUpdateContext;
+import io.ebeanservice.docstore.api.DocStoreUpdates;

 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import java.io.IOException;
 import java.sql.Statement;
 import java.util.*;

 /**
 * PersistRequest for insert update or delete of a bean.
 */
-public final class PersistRequestBean<T> extends PersistRequest implements BeanPersistRequest<T>, PreGetterCallback, SpiProfileTransactionEvent {
+public final class PersistRequestBean<T> extends PersistRequest implements BeanPersistRequest<T>, DocStoreUpdate, PreGetterCallback, SpiProfileTransactionEvent {

  private final BeanManager<T> beanManager;
  private final BeanDescriptor<T> beanDescriptor;
@@ -39,8 +45,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   */
  private final Object parentBean;
  private final boolean dirty;
+  private final boolean publish;
  private int flags;
  private boolean saveRecurse;
+  private DocStoreMode docStoreMode;
  private final ConcurrencyMode concurrencyMode;
  /**
   * The unique id used for logging summary.
@@ -144,6 +152,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    this.parentBean = parentBean;
    this.controller = beanDescriptor.persistController();
    this.type = type;
+    this.docStoreMode = calcDocStoreMode(transaction, type);
    this.flags = flags;
    if (Flags.isRecurse(flags)) {
      this.persistCascade = t.isPersistCascade();
@@ -159,6 +168,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
      }
    }
    this.concurrencyMode = beanDescriptor.concurrencyMode(intercept);
+    this.publish = Flags.isPublish(flags);
+    if (isMarkDraftDirty(publish)) {
+      beanDescriptor.setDraftDirty(entityBean, true);
+    }
    this.dirty = intercept.isDirty();
  }

@@ -187,11 +200,29 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    profileBase(type.profileEventId, offset, beanDescriptor.name(), flushCount);
  }

+  /**
+   * Return the document store event that should be used for this request.
+   * <p>
+   * Used to check if the Transaction has set the mode to IGNORE when doing large batch inserts that we
+   * don't want to send to the doc store.
+   */
+  private DocStoreMode calcDocStoreMode(SpiTransaction txn, Type type) {
+    DocStoreMode txnMode = (txn == null) ? null : txn.docStoreMode();
+    return beanDescriptor.docStoreMode(type, txnMode);
+  }
+
  @Override
  public boolean isCascade() {
    return Flags.isRecurse(flags);
  }

+  /**
+   * Return true if the draftDirty property should be set to true for this request.
+   */
+  private boolean isMarkDraftDirty(boolean publish) {
+    return !publish && type != Type.DELETE && beanDescriptor.isDraftable();
+  }
+
  /**
   * Set the transaction from prior persist request.
   * Only used when hard deleting draft & associated live beans.
@@ -206,7 +237,9 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   * Init the transaction and also check for batch on cascade escalation.
   */
  public void initTransIfRequiredWithBatchCascade() {
-    createImplicitTransIfRequired();
+    if (createImplicitTransIfRequired()) {
+      docStoreMode = calcDocStoreMode(transaction, type);
+    }
    checkBatchEscalationOnCascade();
    transaction.markNotQueryOnly();
  }
@@ -415,14 +448,21 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   * Set the cache notify status.
   */
  private void setNotifyCache() {
-    this.notifyCache = beanDescriptor.isCacheNotify(type);
+    this.notifyCache = beanDescriptor.isCacheNotify(type, publish);
  }

  /**
   * Return true if this change should notify persist listener or doc store (and keep the request).
   */
  private boolean isNotifyListeners() {
-    return isNotifyPersistListener();
+    return isNotifyPersistListener() || isDocStoreNotify();
+  }
+
+  /**
+   * Return true if this request should update the document store.
+   */
+  private boolean isDocStoreNotify() {
+    return docStoreMode != DocStoreMode.IGNORE;
  }

  private boolean isNotifyPersistListener() {
@@ -451,6 +491,46 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    }
  }

+  /**
+   * Process the persist request updating the document store.
+   */
+  @Override
+  public void docStoreUpdate(DocStoreUpdateContext txn) throws IOException {
+    switch (type) {
+      case INSERT:
+        beanDescriptor.docStoreInsert(idValue, this, txn);
+        break;
+      case UPDATE:
+      case DELETE_SOFT:
+        beanDescriptor.docStoreUpdate(idValue, this, txn);
+        break;
+      case DELETE:
+        beanDescriptor.docStoreDeleteById(idValue, txn);
+        break;
+      default:
+        throw new IllegalStateException("Invalid type " + type);
+    }
+  }
+
+  /**
+   * Add this event to the queue entries in IndexUpdates.
+   */
+  @Override
+  public void addToQueue(DocStoreUpdates docStoreUpdates) {
+    switch (type) {
+      case INSERT:
+      case UPDATE:
+      case DELETE_SOFT:
+        docStoreUpdates.queueIndex(beanDescriptor.docStoreQueueId(), idValue);
+        break;
+      case DELETE:
+        docStoreUpdates.queueDelete(beanDescriptor.docStoreQueueId(), idValue);
+        break;
+      default:
+        throw new IllegalStateException("Invalid type " + type);
+    }
+  }
+
  public void addToPersistMap(BeanPersistIdMap beanPersistMap) {
    beanPersistMap.add(beanDescriptor, type, idValue);
  }
@@ -576,6 +656,28 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    return beanDescriptor.createRef(beanId(), null);
  }

+  /**
+   * Return true if the bean type is a Draftable.
+   */
+  public boolean isDraftable() {
+    return beanDescriptor.isDraftable();
+  }
+
+  /**
+   * Return true if this request is a hard delete of a draftable bean.
+   * If this is true Ebean is expected to auto-publish and delete the associated live bean.
+   */
+  public boolean isHardDeleteDraft() {
+    if (type == Type.DELETE && beanDescriptor.isDraftable() && !beanDescriptor.isDraftableElement()) {
+      // deleting a top level draftable bean
+      if (beanDescriptor.isLiveInstance(entityBean)) {
+        throw new PersistenceException("Explicit Delete is not allowed on a 'live' bean - only draft beans");
+      }
+      return true;
+    }
+    return false;
+  }
+
  /**
   * Return true if this was a hard/permanent delete request (and should cascade as such).
   */
@@ -583,6 +685,16 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    return (type == Type.DELETE && beanDescriptor.isSoftDelete());
  }

+  /**
+   * Checks for @Draftable entity beans with @Draft property that the bean is a 'draft'.
+   * Save or Update is not allowed to execute using 'live' beans - must use publish().
+   */
+  public void checkDraft() {
+    if (beanDescriptor.isDraftable() && beanDescriptor.isLiveInstance(entityBean)) {
+      throw new PersistenceException("Save or update is not allowed on a 'live' bean - only draft beans");
+    }
+  }
+
  /**
   * Return the parent bean for cascading save with unidirectional relationship.
   */
@@ -785,7 +897,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    setNotifyCache();
    boolean isChangeLog = beanDescriptor.isChangeLog();
    if (type == Type.UPDATE) {
-      // get the dirty properties for update notification to the doc store
+      // get the dirty properties for notify cache & orphanRemoval of vanilla collection detection
      dirtyProperties = intercept.dirtyProperties();
      // snapshot orig values before setLoaded() clears them - needed by cache FK-eviction logic
      if (dirtyProperties != null && notifyCache) {
@@ -876,19 +988,20 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  }

  private void logSummaryMessage() {
+    String draft = (beanDescriptor.isDraftable() && !publish) ? " draft[true]" : "";
    String name = beanDescriptor.name();
    switch (type) {
      case INSERT:
-        transaction.logSummary("Inserted [{0}] [{1}]", name, (idValue == null ? "" : idValue));
+        transaction.logSummary("Inserted [{0}] [{1}]{2}", name, (idValue == null ? "" : idValue), draft);
        break;
      case UPDATE:
-        transaction.logSummary("Updated [{0}] [{1}]", name, idValue);
+        transaction.logSummary("Updated [{0}] [{1}]{2}", name, idValue , draft);
        break;
      case DELETE:
-        transaction.logSummary("Deleted [{0}] [{1}]", name, idValue);
+        transaction.logSummary("Deleted [{0}] [{1}]{2}", name, idValue , draft);
        break;
      case DELETE_SOFT:
-        transaction.logSummary("SoftDelete [{0}] [{1}]", name, idValue);
+        transaction.logSummary("SoftDelete [{0}] [{1}]{2}", name, idValue , draft);
        break;
      default:
        break;
@@ -926,6 +1039,9 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  private void postInsert() {
    // mark all properties as loaded after an insert to support immediate update
    beanDescriptor.setAllLoaded(entityBean);
+    if (!publish) {
+      beanDescriptor.setDraft(entityBean);
+    }
    if (transaction.isAutoPersistUpdates() && idValue != null) {
      // with getGeneratedKeys off we will not have a idValue
      beanDescriptor.contextPut(transaction.persistenceContext(), idValue, entityBean);
@@ -1022,6 +1138,32 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    }
  }

+  /**
+   * For requests that update document store add this event to either the list
+   * of queue events or list of update events.
+   */
+  public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates) {
+    if (type == Type.UPDATE) {
+      beanDescriptor.docStoreUpdateEmbedded(this, docStoreUpdates);
+    }
+    switch (docStoreMode) {
+      case UPDATE: {
+        docStoreUpdates.addPersist(this);
+        return;
+      }
+      case QUEUE: {
+        if (type == Type.DELETE) {
+          docStoreUpdates.queueDelete(beanDescriptor.docStoreQueueId(), idValue);
+        } else {
+          docStoreUpdates.queueIndex(beanDescriptor.docStoreQueueId(), idValue);
+        }
+      }
+      break;
+      default:
+        break;
+    }
+  }
+
  /**
   * Determine if all loaded properties should be used for an update.
   * <p>
@@ -1047,6 +1189,13 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    return flags;
  }

+  /**
+   * Return true if this request is a 'publish' action.
+   */
+  public boolean isPublish() {
+    return publish;
+  }
+
  /**
   * Return the key for an update persist request.
   */
@@ -1063,14 +1212,17 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
        key.append('v');
      }
    }
+    if (publish) {
+      key.append('p');
+    }
    return key.toString();
  }

  /**
-   * Return the table to update.
+   * Return the table to update depending if the request is a 'publish' one or normal.
   */
  public String updateTable() {
-    return beanDescriptor.baseTable();
+    return publish ? beanDescriptor.baseTable() : beanDescriptor.draftTable();
  }

  /**
@@ -1154,6 +1306,30 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    return preDeleteResult;
  }

+  /**
+   * Persist to the document store now (via buffer, not post commit).
+   */
+  public void docStorePersist() {
+    idValue = beanDescriptor.getId(entityBean);
+    if (type == Type.UPDATE) {
+      dirtyProperties = intercept.dirtyProperties();
+    }
+    // processing now so set IGNORE (unlike DB + DocStore processing with post-commit)
+    docStoreMode = DocStoreMode.IGNORE;
+    try {
+      docStoreUpdate(transaction.docStoreTransaction().obtain());
+      postExecute();
+      if (type == Type.UPDATE
+        && beanDescriptor.isDocStoreEmbeddedInvalidation()
+        && transaction.isPersistCascade()) {
+        // queue embedded/nested updates for later processing
+        beanDescriptor.docStoreUpdateEmbedded(this, transaction.docStoreTransaction().queue());
+      }
+    } catch (IOException e) {
+      throw new PersistenceException("Error persisting doc store bean", e);
+    }
+  }
+
  /**
   * Use a common 'now' value across both when created and when updated etc.
   */
@@ -1273,7 +1449,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   * Return the SQL used to fetch the last inserted id value.
   */
  public String selectLastInsertedId() {
-    return beanDescriptor.selectLastInsertedId();
+    return beanDescriptor.selectLastInsertedId(publish);
  }

  /**
@@ -78,6 +78,16 @@ public interface Persister {
   */
  int executeCallable(CallableSql callable, Transaction t);

+  /**
+   * Publish the draft beans matching the given query.
+   */
+  <T> List<T> publish(Query<T> query, Transaction transaction);
+
+  /**
+   * Restore the draft beans back to the matching live beans.
+   */
+  <T> List<T> draftRestore(Query<T> query, Transaction transaction);
+
  /**
   * Visit the metrics.
   */
@@ -5,6 +5,7 @@ import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeanservice.docstore.api.DocQueryRequest;

 import java.util.Collection;
 import java.util.List;
@@ -16,7 +17,7 @@ import java.util.function.Predicate;
 /**
 * Defines the ORM query request api.
 */
-public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T> {
+public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequest<T> {

  /**
   * Return the query.
@@ -182,6 +183,11 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T> {
   */
  void markNotQueryOnly();

+  /**
+   * Return true if this query is expected to use the doc store.
+   */
+  boolean isUseDocStore();
+
  /**
   * Return true if delete by statement is allowed for this type given cascade rules etc.
   */
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`io.ebean.avajejsonb.mapper.ScalarJsonAvajeJsonbMapper`