Merge branch 'master' into ebean-15x

# Conflicts:
#	ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
#	ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [21]
+        java_version: [11]
         os: [ubuntu-latest]
 
     steps:
@@ -40,7 +40,5 @@ jobs:
 #    - name: Maven single test
 #      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
     - name: Build with Maven
-      run: mvn -T 1C clean install -Pdefault
-    - name: Test SequencedSet and SequencedMap (requires installed MR-JAR)
-      run: cd tests/test-java16 && mvn test
+      run: mvn -T 1C clean test -Pdefault
 

.github/workflows/db2luw.yml

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

.github/workflows/h2database.yml

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

.github/workflows/mariadb.yml

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

.github/workflows/multi-db-platform.yml

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

.github/workflows/multi-jdk-build.yml

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

.github/workflows/mysql.yml

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

.github/workflows/oracle.yml

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

.github/workflows/postgres.yml

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

.github/workflows/sqlserver-2019.yml

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

.github/workflows/sqlserver.yml

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

.github/workflows/yugabyte.yml

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

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-net-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-net-postgis-types</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-pgvector/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-pgvector-types</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
   </parent>
 
   <artifactId>composites</artifactId>

docs/guides/AGENTS.md

@@ -14,7 +14,6 @@ Key guides (fetch and follow when performing the relevant task):
 - Migrate to `Database.builder()`: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/migrating-to-database-builder.md
 - Migrate JSON APIs from Jackson core to avaje-json-core: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/migrating-json-jackson-core-to-avaje-json-core.md
 - Write queries with query beans: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/writing-ebean-query-beans.md
-- Derived / formula properties (`@Formula`, `@Formula2`): https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/derived-formula-properties.md
 - Persisting and transactions: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/persisting-and-transactions-with-ebean.md
 - Query metrics and naming: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/ebean-query-metrics.md
 - Query plan capture: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/ebean-query-plan-capture.md

docs/guides/README.md

@@ -40,7 +40,6 @@ existing Maven project. Complete the steps in order.
 | [Entity Bean Creation](entity-bean-creation.md) | How to generate clean, idiomatic Ebean entity beans for AI agents; patterns and anti-patterns; field visibility and accessor guidance; minimal boilerplate |
 | [Lombok with Ebean entity beans](lombok-with-ebean-entity-beans.md) | Which Lombok annotations to use and avoid on entity beans; why `@Data` is incompatible with Ebean; how to use `@Getter` + `@Setter` + `@Accessors(chain = true)` |
 | [`@DbJson` mapping support (built-in vs Jackson)](dbjson-mapping-support.md) | Which `@DbJson` / `@DbJsonB` property types are handled by the built-in avaje-json-core support versus which require `ebean-jackson-mapper` (Jackson `ObjectMapper`); supported `String`/`List`/`Set`/`Map` matrix; enum-key and `@DbArray` notes |
-| [Derived / formula properties (`@Formula`, `@Formula2`)](derived-formula-properties.md) | Read-only computed properties: physical-SQL `@Formula` (with `${ta}` and hand-written joins) versus logical path-based `@Formula2` (auto-resolved joins); use in `select`/`where`/`orderBy`; default inclusion and the `@Transient` opt-out |
 
 ## Querying
 
@@ -48,7 +47,6 @@ existing Maven project. Complete the steps in order.
 |-------|-------------|
 | [Write Ebean queries with query beans](writing-ebean-query-beans.md) | Step-by-step guidance for AI agents to write type-safe Ebean queries; choose the right terminal method; tune `select()` / `fetch()` / `fetchQuery()`; and project to DTOs when entity beans are not the right output |
 | [Immutable bean cache for read-only references](immutable-bean-cache.md) | Use `ImmutableBeanCache` and `ImmutableBeanCaches.loading(...)` to resolve assoc-one references in read-only/unmodifiable queries, including secondary `fetchQuery`/`fetchLazy` loads |
-| [Using `RawSql` with Ebean](using-rawsql-with-ebean.md) | Choose between `RawSqlBuilder.parse()`, `unparsed()`, and `withPlaceholders()`; the `${where}`/`${andWhere}`/`${having}`/`${andHaving}` placeholder reference for CTEs, window functions, and subqueries; column mapping; and using `RawSql` with query beans |
 
 ## Persisting & transactions
 

docs/guides/derived-formula-properties.md

@@ -1,164 +0,0 @@
-# Guide: Derived / formula properties — `@Formula` and `@Formula2`
-
-## Purpose
-
-A *formula property* is a read-only entity property whose value is computed by a SQL
-expression at query time rather than stored in its own column. Ebean has two
-annotations for this:
-
-- **`@Formula`** — you write the **physical SQL** for the `select` (and any `join`),
-  using the `${ta}` placeholder for the base table alias. Maximum control; verbose.
-- **`@Formula2`** — you write a **logical expression** using dot-notation property
-  paths (e.g. `parent.familyName`). Ebean translates the paths to the correct table
-  aliases and **adds the required JOINs automatically**.
-
-`@Formula2` is intended as the easier, path-based replacement for `@Formula`. Both
-produce read-only properties and behave the same way with respect to default
-inclusion (see [Default inclusion](#default-inclusion-and-transient)).
-
----
-
-## Quick comparison
-
-| | `@Formula` | `@Formula2` |
-|---|---|---|
-| Expression | Physical SQL columns + aliases | Logical property paths |
-| Table alias | `${ta}` placeholder you write | Resolved automatically |
-| Joins | You write the `join` clause | Added automatically from the paths |
-| Read only | ✅ | ✅ |
-| Included by default | ✅ (use `@Transient` to opt out) | ✅ (use `@Transient` to opt out) |
-| Usable in `select` / `where` / `orderBy` / `having` | ✅ | ✅ |
-| Creates a DB column (DDL) | ❌ | ❌ |
-
----
-
-## `@Formula` — physical SQL
-
-You supply the SQL `select` fragment, and an optional `join`. Use `${ta}` wherever you
-need the base table alias of the entity.
-
-```java
-@Entity
-public class ParentPerson {
-
-  // aggregation via a derived join; ${ta} is the base table alias
-  @Formula(select = "coalesce(f2.child_count, 0)",
-           join = "left join (select parent_id, count(*) as child_count"
-                + " from child group by parent_id) f2 on f2.parent_id = ${ta}.id")
-  Integer childCount;
-
-  // coalesce across a joined table using an explicit join alias (j1)
-  @Formula(select = "coalesce(${ta}.family_name, j1.family_name)",
-           join = "join parent_person j1 on j1.id = ${ta}.parent_id")
-  String effectiveFamilyName;
-}
-```
-
-Notes:
-- The `join` string must start with `join` or `left join`.
-- You manage the join aliases (`j1`, `f2`, …) yourself and reference them in `select`.
-- `@Formula` is `@Repeatable` and supports a `platforms()` restriction.
-
----
-
-## `@Formula2` — logical property paths
-
-Write the expression using property paths. Ebean resolves each path to the right table
-alias and adds the joins it needs.
-
-```java
-@Entity
-public class ParentPerson {
-
-  @ManyToOne
-  GrandParentPerson parent;
-
-  String familyName;
-
-  // Ebean automatically left joins 'parent' and resolves the aliases
-  @Formula2("coalesce(familyName, parent.familyName)")
-  String derivedFamilyName;
-}
-```
-
-A query selecting `derivedFamilyName` produces (roughly):
-
-```sql
-select t0.id, coalesce(t0.family_name, t1.family_name)
-from parent_person t0
-left join grand_parent_person t1 on t1.id = t0.parent_id
-```
-
-Multi-level paths join through each step:
-
-```java
-// joins parent and parent.parent automatically
-@Formula2("coalesce(familyName, parent.familyName, parent.parent.familyName)")
-String deepFamilyName;
-```
-
-`@Formula2` works wherever a normal property does — the required joins are added
-automatically in each case:
-
-```java
-// selected explicitly
-DB.find(ParentPerson.class).select("derivedFamilyName").findList();
-
-// used in where (auto-joins even when not selected)
-DB.find(ParentPerson.class).where().eq("derivedFamilyName", "Smith").findList();
-
-// used in order by
-DB.find(ParentPerson.class).orderBy("derivedFamilyName").findList();
-
-// referenced via a path from another bean
-DB.find(ChildPerson.class).where().eq("parent.derivedFamilyName", "Smith").findList();
-```
-
-It also resolves correctly inside nested `fetch()` joins, so a `@Formula2` on a fetched
-association is computed with its own joins relative to that association.
-
-Notes:
-- The expression supports any SQL function whose arguments are logical property paths.
-- `@Formula2` supports a `platforms()` restriction.
-- No `${ta}` and no hand-written join — that is the point of `@Formula2`.
-
----
-
-## Default inclusion and `@Transient`
-
-Both annotations are **included in queries by default** (just like a normal mapped
-property). When no explicit `select()`/`fetch()` is given, the formula — and for
-`@Formula2` the joins it requires — are added to the query.
-
-Add `@Transient` to make the formula **opt-in**: it is then **not** selected by default
-and must be requested explicitly via `select()` or `fetch()`. Do this when the formula
-(or the joins it needs) is relatively expensive.
-
-```java
-// not selected by default; must be requested explicitly
-@Transient
-@Formula2("coalesce(familyName, parent.familyName)")
-String lazyDerivedFamilyName;
-```
-
-```java
-DB.find(ParentPerson.class)
-  .select("lazyDerivedFamilyName")   // explicitly included, join auto-added
-  .findList();
-```
-
-This is the same `@Transient` opt-out mechanism used by `@Formula`.
-
----
-
-## Which should I use?
-
-- Prefer **`@Formula2`** for expressions over property paths (coalesce/case/functions
-  across associations). It is shorter, refactor-friendly, and the joins stay correct as
-  the model changes.
-- Use **`@Formula`** when you need raw SQL that does not map cleanly to property paths —
-  for example a derived aggregate sub-select / dynamic view, or vendor-specific SQL.
-
-For read models that exist only to carry computed values, also consider projecting to a
-DTO instead of mapping the formula onto the entity — see
-[writing-ebean-query-beans.md](writing-ebean-query-beans.md).

docs/guides/using-rawsql-with-ebean.md

@@ -1,464 +0,0 @@
-# Guide: Using `RawSql` with Ebean
-
-## Purpose
-
-`RawSql` lets you back an Ebean bean with a **hand-written SQL query** instead of
-Ebean generating the SQL from the entity mapping. Ebean still handles object
-mapping (result set columns → bean properties), lazy loading of associated beans,
-and - depending on how the `RawSql` is built - dynamic `WHERE`/`HAVING` predicates
-added through the normal query API.
-
-Use this guide when you need to:
-
-- run vendor-specific SQL, complex aggregation, or reporting queries that don't
-  map cleanly to an ORM query
-- reuse a hand-tuned query but still want typed/dynamic predicates, paging, or
-  `ORDER BY` added by the caller
-- back a query bean (`Q*`) or DTO-like bean with SQL containing a CTE, window
-  function, or subquery in the `FROM` clause
-
-Prefer ordinary query bean queries first - see
-[Write Ebean queries with query beans](writing-ebean-query-beans.md), Step 9,
-for the full decision order (query bean → `asDto()` → DTO query → raw SQL).
-This guide covers raw SQL once you've decided it's the right tool.
-
----
-
-## The bean behind a `RawSql` query
-
-A bean queried with `RawSql` is not necessarily backed by a physical table. Annotate
-it `@Entity @Sql` to tell Ebean it is mapped via `RawSql` rather than table DDL:
-
-```java
-@Entity
-@Sql
-public class OrderAggregate {
-
-  @OneToOne
-  Order order;
-
-  Double totalAmount;
-  Long totalItems;
-
-  // getters/setters
-}
-```
-
-`@Sql` beans still get a generated query bean (`QOrderAggregate`) if the
-querybean-generator annotation processor is configured - see
-[Using `RawSql` with query beans](#using-rawsql-with-query-beans) below.
-
-You can also query an ordinary table-backed `@Entity` with `RawSql` - the column
-mapping just needs to line up with that entity's properties.
-
----
-
-## Building a `RawSql` - three factory methods
-
-`RawSqlBuilder` has three ways to construct a `RawSql`, depending on how much of
-the SQL Ebean needs to understand:
-
-| Method | SELECT columns parsed? | Dynamic WHERE/HAVING/ORDER BY? | Use for |
-|--------|------------------------|------------------------|---------|
-| `RawSqlBuilder.parse(sql)` | Yes | Yes | Ordinary `SELECT ... FROM ... WHERE ...` statements |
-| `RawSqlBuilder.unparsed(sql)` | No | No | Fixed SQL that never needs additional predicates |
-| `RawSqlBuilder.withPlaceholders(sql)` | No (explicit `columnMapping()` required) | Yes, via `${where}` / `${andWhere}` / `${having}` / `${andHaving}` / `${orderBy}` / `${andOrderBy}` | CTEs, window functions, subqueries - SQL that keyword-based parsing can't handle |
-
-### `parse(sql)` - the common case
-
-`parse(sql)` scans the SQL text for the `select` / `from` / `where` / `group by`
-/ `having` / `order by` keywords to work out the SELECT column list (so it can
-validate your column mappings) and the injection points for dynamic `WHERE`/
-`HAVING` expressions.
-
-```java
-RawSql rawSql = RawSqlBuilder.parse(
-    "select c.id, c.name, c.status from customer c")
-  .columnMapping("c.id", "id")
-  .columnMapping("c.name", "name")
-  .columnMapping("c.status", "status")
-  .create();
-
-List<Customer> customers = DB.find(Customer.class)
-  .setRawSql(rawSql)
-  .where().eq("status", Customer.Status.ACTIVE)
-  .orderBy("name")
-  .findList();
-```
-
-Because the SQL is parsed, mistakes in `columnMapping()` (unknown column, wrong
-order for `unparsed`-style mappings) are caught early. **This fails on SQL the
-keyword parser can't make sense of** - a `WITH` CTE, a window function, a
-subquery in `FROM`, etc. - because the keyword positions found don't correspond
-to the outer query's real structure. Use `withPlaceholders(sql)` for that SQL
-instead (see below).
-
-### `unparsed(sql)` - fixed queries
-
-`unparsed(sql)` skips all parsing. The SQL is used exactly as written, and **no
-further `WHERE`/`HAVING`/`ORDER BY` can be added** by the caller - useful for a
-completely fixed reporting query with no caller-supplied filtering.
-
-```java
-RawSql rawSql = RawSqlBuilder.unparsed(
-    "select id, name, status from customer where status = 'ACTIVE'")
-  .columnMapping("id", "id")
-  .columnMapping("name", "name")
-  .columnMapping("status", "status")
-  .create();
-
-List<Customer> customers = DB.find(Customer.class)
-  .setRawSql(rawSql)
-  .findList();
-```
-
-Column mappings for `unparsed(sql)` must be supplied **in the same order** as
-the columns appear in the SQL, since there's no parsing to match them by name.
-
-### `withPlaceholders(sql)` - complex SQL (CTEs, window functions, subqueries)
-
-`withPlaceholders(sql)` avoids keyword scanning entirely. You mark exactly where
-a dynamic `WHERE`/`HAVING`/`ORDER BY` expression should be injected using
-placeholder tokens, and column mappings are always explicit (as with `unparsed`).
-
-#### Placeholder reference
-
-| Placeholder | Meaning | Use when |
-|-------------|---------|----------|
-| `${where}` | Insert a new `WHERE <expr>` clause here | No static `WHERE` clause exists yet at this point in the SQL |
-| `${andWhere}` | Insert `AND <expr>` here | A static `WHERE ...` clause already exists in the SQL and you want to append to it |
-| `${having}` | Insert a new `HAVING <expr>` clause here | No static `HAVING` clause exists yet at this point in the SQL |
-| `${andHaving}` | Insert `AND <expr>` here | A static `HAVING ...` clause already exists in the SQL and you want to append to it |
-| `${orderBy}` | Insert a new `ORDER BY <expr>` clause here | No static `ORDER BY` clause exists yet at this point in the SQL, and callers may supply `.orderBy(...)` |
-| `${andOrderBy}` | Insert `, <expr>` here | A static `ORDER BY ...` clause already exists in the SQL and you want callers to be able to append extra sort columns to it |
-
-Rules:
-
-- At least one placeholder is required - `withPlaceholders(sql)` throws
-  `IllegalArgumentException` if none of the six tokens are present.
-- Use only the placeholders you need. Omit `${where}`/`${andWhere}` entirely if
-  the query never needs a dynamic `WHERE` (e.g. only a dynamic `HAVING` on an
-  aggregate). Omit `${having}`/`${andHaving}` if there's no dynamic `HAVING`.
-  Omit `${orderBy}`/`${andOrderBy}` if the ordering is always fixed.
-- Explicit `columnMapping()` is required for every returned column - there is no
-  column-list parsing to infer names from.
-- **A caller-supplied `.orderBy(...)`/`.order(...)` is only applied if the SQL
-  contains an `${orderBy}` or `${andOrderBy}` placeholder.** Without one of
-  those placeholders there is no defined injection point for dynamic ordering,
-  so any `.orderBy(...)` call on the query is safely ignored rather than risk
-  producing invalid SQL - even if the template has a static trailing
-  `ORDER BY ...` of its own. If you need callers to be able to influence
-  ordering, add `${orderBy}` (no existing static order by) or `${andOrderBy}`
-  (append after an existing static order by).
-- Any other static SQL that follows a `${where}`/`${having}` placeholder (e.g.
-  a trailing `GROUP BY`) is preserved and correctly positioned **after**
-  whatever dynamic expression gets injected at that placeholder.
-
-#### Example - CTE with `${where}`
-
-```java
-String sql = """
-  with order_totals as (
-    select o.id as order_id, sum(d.qty * d.unit_price) as total_amount
-    from o_order o
-    join o_order_detail d on d.order_id = o.id
-    group by o.id
-  )
-  select order_id, total_amount
-  from order_totals
-  ${where}
-  order by order_id
-  """;
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .where().gt("totalAmount", 100)
-  .findList();
-```
-
-`total_amount` is a genuine column of the `order_totals` CTE here, so it's valid
-to filter on it in the outer `WHERE` - this only works because the aggregate is
-computed inside the CTE rather than as a same-level `SELECT` alias.
-
-#### Example - static `WHERE` already present, append with `${andWhere}`
-
-```java
-String sql = "... from order_totals where total_amount > 0 ${andWhere} order by order_id";
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-// executed SQL: ... where total_amount > 0 and total_amount > ? order by order_id
-DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .where().gt("totalAmount", 100)
-  .findList();
-```
-
-#### Example - `${having}` only, filtering on an aggregate directly
-
-No `WHERE` placeholder is needed if you only ever filter on the aggregate value:
-
-```java
-String sql =
-  "select o.id as order_id, sum(d.qty * d.unit_price) as total_amount" +
-  " from o_order o join o_order_detail d on d.order_id = o.id" +
-  " group by o.id" +
-  " ${having}" +
-  " order by order_id";
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .having().gt("totalAmount", 100)
-  .findList();
-```
-
-The dynamic `HAVING` clause is injected before the static trailing `ORDER BY`,
-even though `${having}` is the only placeholder present. Because there's no
-`${orderBy}`/`${andOrderBy}` placeholder here, a caller-supplied `.orderBy(...)`
-would be ignored - the ordering stays fixed as `order by order_id`.
-
-#### Example - both `${where}` and `${having}`
-
-```java
-String sql =
-  "select o.id as order_id, sum(d.qty * d.unit_price) as total_amount" +
-  " from o_order o join o_order_detail d on d.order_id = o.id" +
-  " ${where}" +
-  " group by o.id" +
-  " ${having}" +
-  " order by order_id";
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .where().gt("order.id", 0)
-  .having().gt("totalAmount", 50)
-  .findList();
-```
-
-Both the dynamic `WHERE` and dynamic `HAVING` are injected at their respective
-placeholders, and the trailing `order by order_id` is preserved after the
-`HAVING` clause.
-
-#### Example - `${orderBy}`, fully dynamic ordering
-
-Use `${orderBy}` when there's no static default ordering and you want the
-caller's `.orderBy(...)` to control it entirely:
-
-```java
-String sql =
-  "with order_totals as (" +
-  "  select o.id as order_id, sum(d.qty * d.unit_price) as total_amount" +
-  "  from o_order o join o_order_detail d on d.order_id = o.id" +
-  "  group by o.id" +
-  ")" +
-  " select order_id, total_amount from order_totals" +
-  " ${where}" +
-  " ${orderBy}";
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-// executed SQL: ... where total_amount > ? order by total_amount desc
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .where().gt("totalAmount", 0)
-  .orderBy("totalAmount desc")
-  .findList();
-```
-
-If the caller doesn't call `.orderBy(...)`, nothing is injected at `${orderBy}`
-and no `ORDER BY` clause is emitted at all.
-
-#### Example - `${andOrderBy}`, appending to a static default ordering
-
-Use `${andOrderBy}` when there's a sensible static default ordering but you
-want callers to be able to add extra tie-breaker sort columns:
-
-```java
-String sql =
-  "... from order_totals" +
-  " ${where}" +
-  " order by total_amount desc ${andOrderBy}";
-
-RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-  .columnMapping("order_id", "order.id")
-  .columnMapping("total_amount", "totalAmount")
-  .create();
-
-// executed SQL: ... order by total_amount desc , order_id
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)
-  .where().gt("totalAmount", 0)
-  .orderBy("order.id")
-  .findList();
-```
-
----
-
-## Using `fetchQuery()` to build out more of the graph
-
-A `RawSql` query can be the **root query** and still use `fetchQuery(path)` the
-same way an ordinary ORM query does - Ebean runs the raw SQL for the root rows,
-then runs additional secondary ORM queries to populate the requested paths. This
-lets you hand-write only the part of the query that needs raw SQL (e.g. an
-aggregate/CTE) and let the ORM build out the rest of the object graph normally.
-
-```java
-List<OrderAggregate> list = DB.find(OrderAggregate.class)
-  .setRawSql(rawSql)           // root query - runs the CTE/aggregate SQL
-  .fetchQuery("order")         // secondary query - loads the full Order
-  .fetchQuery("order.details") // secondary query - loads Order.details
-  .where().gt("totalAmount", 50)
-  .findList();
-```
-
-This executes **three** queries: the raw SQL root query, then one secondary
-query per `fetchQuery(path)` call.
-
-**Important**: if the raw SQL's column mapping only populates part of an
-association (e.g. only `order.id`, as in the examples above), that association
-is a *partial reference*. To load a nested to-many under it (e.g.
-`order.details`), you must add an explicit `fetchQuery(...)` (or `fetch(...)`)
-for the **intermediate path** (`order`) as well as the nested path
-(`order.details`) - `fetchQuery("order.details")` alone will leave `details` as
-a deferred/lazy collection, because Ebean doesn't otherwise have a fetch node
-for `order` to hang the secondary query off. If the raw SQL already selects the
-full set of columns for an association directly (no partial reference), this
-extra step isn't needed.
-
-This is the same `fetchQuery()` mechanism used for ordinary query bean queries -
-see [Use `fetchQuery()` for to-many paths](writing-ebean-query-beans.md#step-7---use-fetchquery-for-to-many-paths-and-fetchgroup-for-reusable-query-shapes)
-for background on why to-many paths are loaded via secondary queries rather than
-a single joined query.
-
----
-
-## Column mapping
-
-Every `RawSqlBuilder` (except a bare `unparsed(sql)` with implicit positional
-mapping) uses `columnMapping(dbColumn, propertyName)` to map SQL result columns
-to bean properties:
-
-```java
-.columnMapping("order_id", "order.id")   // maps to the "order" association's "id" property
-.columnMapping("total_amount", "totalAmount")
-```
-
-- Dotted property paths (e.g. `"order.id"`) map a column into a nested/associated
-  bean property.
-- `columnMappingIgnore(dbColumn)` marks a selected column as intentionally unmapped
-  (present in the SQL but not needed on the bean).
-- `tableAliasMapping(tableAlias, path)` bulk-renames every mapping using a given
-  SQL table alias to be prefixed with a bean property path - handy when a `parse()`
-  query selects many columns from a joined table (e.g. alias `c` → path `customer`)
-  and you don't want to repeat the prefix in every `columnMapping()` call.
-
----
-
-## Using `RawSql` with query beans
-
-`RawSql` is not limited to the plain `Query<T>` API - it also works with a
-generated query bean, giving type-safe `where()`/`having()`-equivalent
-expressions (as bean properties) over hand-written SQL. Every generated query
-bean exposes `setRawSql(...)`:
-
-```java
-RawSql rawSql = RawSqlBuilder.parse("select id, name, status from customer")
-  .columnMapping("id", "id")
-  .columnMapping("name", "name")
-  .columnMapping("status", "status")
-  .create();
-
-List<Customer> customers = new QCustomer()
-  .setRawSql(rawSql)
-  .status.equalTo(Customer.Status.ACTIVE) // typed expression, injected into the parsed WHERE clause
-  .findList();
-```
-
-This also works with `withPlaceholders(sql)` and an `@Sql` query bean:
-
-```java
-List<OrderAggregate> list = new QOrderAggregate()
-  .setRawSql(rawSql) // built with withPlaceholders() as shown above
-  .totalAmount.gt(100)
-  .findList();
-```
-
-The typed property expression (`.totalAmount.gt(100)`) is translated to a bound
-predicate and injected at the `${where}`/`${having}` placeholder position, exactly
-as `.where().gt("totalAmount", 100)` would be on the plain `Query<T>` API.
-
----
-
-## Common anti-patterns
-
-### Anti-pattern 1 - reaching for raw SQL before trying a query bean
-
-Complex-looking joins are often just ordinary association traversal in a query
-bean. Don't use raw SQL just because a query touches several tables - see
-[Write Ebean queries with query beans](writing-ebean-query-beans.md).
-
-### Anti-pattern 2 - using `parse(sql)` on a CTE or window-function query
-
-`parse(sql)` will throw a parsing exception (or silently mis-locate the WHERE
-injection point) on SQL it can't understand structurally. If your SQL starts
-with `WITH ...` or has a subquery in `FROM`, use `withPlaceholders(sql)` instead.
-
-### Anti-pattern 3 - filtering on a same-level SELECT alias
-
-You cannot add a dynamic `WHERE` predicate on a `SELECT`-clause alias in the
-same query level (e.g. `select sum(x) as total ... ${where}` - `total` isn't a
-real column yet at the `WHERE` stage of that query level). Either:
-
-- move the aggregation into a CTE and filter on the CTE's output column in the
-  outer query (`WHERE` case), or
-- use `${having}`/`${andHaving}` to filter on the aggregate at the `HAVING` stage
-  of the same query level, where the aggregate expression is valid.
-
-### Anti-pattern 4 - forgetting `columnMapping()` with `unparsed()`/`withPlaceholders()`
-
-Both `unparsed(sql)` and `withPlaceholders(sql)` require **every** returned
-column to be explicitly mapped (or explicitly ignored via
-`columnMappingIgnore(...)`) - there's no column-list parsing to infer them.
-
----
-
-## Troubleshooting
-
-| Symptom | Likely cause | Fix |
-|---------|--------------|-----|
-| `RuntimeException: Error parsing sql, can not find ... keyword` | `parse(sql)` used on SQL with a CTE, window function, or subquery in `FROM` | Use `RawSqlBuilder.withPlaceholders(sql)` instead |
-| `IllegalArgumentException: withPlaceholders() requires at least one of ${where}, ${andWhere}, ${having}, ${andHaving}, ${orderBy}, ${andOrderBy}...` | None of the six placeholder tokens were found in the SQL | Add the appropriate placeholder token at the injection point |
-| Dynamic `WHERE`/`HAVING` predicate silently has no effect, or query throws | Used `unparsed(sql)` and then tried to add a predicate | `unparsed(sql)` queries cannot be modified - switch to `parse(sql)` or `withPlaceholders(sql)` |
-| Generated SQL is invalid / clauses appear in the wrong order | Predicates added via `.where()`/`.having()` don't match the placeholders actually present in the SQL | Make sure `${where}`/`${having}` (or the `and` variants) exist at the point you expect predicates to be injected |
-| `.orderBy(...)`/`.order(...)` on the query silently has no effect | The SQL has no `${orderBy}`/`${andOrderBy}` placeholder | This is by design - without one of those placeholders there's no defined injection point, so the ordering is ignored rather than corrupting the SQL. Add `${orderBy}` or `${andOrderBy}` if you need caller-controlled ordering |
-| `Unknown column` / unmapped property error | Missing `columnMapping()` for a selected column | Add a `columnMapping(...)` or `columnMappingIgnore(...)` for every SQL column |
-| `fetchQuery("a.b")` collection stays deferred/lazy | `a` is a partial reference from the raw SQL column mapping (e.g. only `a.id` mapped), and there's no fetch node for `a` itself | Add `fetchQuery("a")` (or `fetch("a")`) alongside `fetchQuery("a.b")` |
-
----
-
-## Related documentation
-
-- [Write Ebean queries with query beans](writing-ebean-query-beans.md)
-- [Derived / formula properties (`@Formula`, `@Formula2`)](derived-formula-properties.md)
-- [Ebean query docs](https://ebean.io/docs/query/)

docs/guides/writing-ebean-query-beans.md

@@ -483,30 +483,6 @@ Prefer the following order:
 Do **not** jump to raw SQL just because the query joins multiple tables. Query
 beans already handle ordinary relationship traversal well.
 
-### Using `RawSql` with query beans
-
-`RawSql` is not limited to the plain `Query<T>` API - it also works with a
-generated query bean, giving type-safe `where()`/`having()` expressions over
-hand-written SQL. Every generated query bean exposes `setRawSql(...)`:
-
-```java
-RawSql rawSql = RawSqlBuilder.parse("select id, name, status from customer")
-  .columnMapping("id", "id")
-  .columnMapping("name", "name")
-  .columnMapping("status", "status")
-  .create();
-
-List<Customer> customers = new QCustomer()
-  .setRawSql(rawSql)
-  .status.equalTo(Customer.Status.ACTIVE) // typed expression, injected into the parsed WHERE clause
-  .findList();
-```
-
-For the full guide to building `RawSql` - including `unparsed()`,
-`withPlaceholders()` for CTEs/window functions, the `${where}` / `${andWhere}`
-/ `${having}` / `${andHaving}` placeholder reference, and column mapping - see
-[Using `RawSql` with Ebean](using-rawsql-with-ebean.md).
-
 ---
 
 ## Common anti-patterns
@@ -594,5 +570,4 @@ When asked to add or modify an Ebean query:
 - [Add Ebean Postgres Maven POM](add-ebean-postgres-maven-pom.md)
 - [Entity Bean Creation](entity-bean-creation.md)
 - [Immutable bean cache for read-only references](immutable-bean-cache.md)
-- [Using `RawSql` with Ebean](using-rawsql-with-ebean.md)
 - [Ebean query docs](https://ebean.io/docs/query/)

ebean-api/pom.xml

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

ebean-api/src/main/java/io/ebean/BeanFinder.java

@@ -155,10 +155,4 @@ 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);
-  }
 }

ebean-api/src/main/java/io/ebean/DB.java

@@ -741,21 +741,6 @@ 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>
@@ -775,43 +760,6 @@ 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>

ebean-api/src/main/java/io/ebean/Database.java

@@ -247,18 +247,6 @@ 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)}.
    *
@@ -266,41 +254,6 @@ 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>
@@ -464,18 +417,6 @@ 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.
@@ -1378,109 +1319,6 @@ 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>

ebean-api/src/main/java/io/ebean/DatabaseBuilder.java

@@ -13,8 +13,6 @@ 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;
@@ -61,10 +59,6 @@ public interface DatabaseBuilder {
 
   /**
    * Build and return the Database instance.
-   * <p>
-   * When {@link #setRegister(boolean)} is set to true, and a database with the same
-   * name is already registered, this may return the existing registered database
-   * rather than creating a new one.
    */
   Database build();
 
@@ -695,38 +689,6 @@ 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.
@@ -887,13 +849,6 @@ public interface DatabaseBuilder {
   @Deprecated
   DatabaseBuilder setBackgroundExecutorWrapper(BackgroundExecutorWrapper backgroundExecutorWrapper);
 
-  /**
-   * Enable tenant-partitioned caches. When enabled each tenant gets its own cache namespace,
-   * improving cache-hit ratio by preventing cross-tenant key collisions.
-   * Use {@link SpiCacheManager#clearTenant(Object)} when a tenant is deactivated.
-   */
-  DatabaseBuilder tenantPartitionedCache(boolean tenantPartitionedCache);
-
   /**
    * Set the L2 cache default max size.
    */
@@ -993,7 +948,7 @@ public interface DatabaseBuilder {
    * <p>
    * Use this to override the default known aggregation functions.
    */
-  DatabaseBuilder aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
+  DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
 
   /**
    * Set to true if all DB column and table names should use quoted identifiers.
@@ -1011,16 +966,6 @@ 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.
    */
@@ -2473,16 +2418,6 @@ public interface DatabaseBuilder {
      */
     boolean isChangeLogAsync();
 
-    /**
-     * Return the ReadAuditLogger to use.
-     */
-    ReadAuditLogger getReadAuditLogger();
-
-    /**
-     * Return the ReadAuditPrepare to use.
-     */
-    ReadAuditPrepare getReadAuditPrepare();
-
     /**
      * Return the tenancy catalog provider.
      */
@@ -2574,11 +2509,6 @@ public interface DatabaseBuilder {
      */
     boolean isAutoPersistUpdates();
 
-    /**
-     * Return true if caches are partitioned by tenant.
-     */
-    boolean isTenantPartitionedCache();
-
     /**
      * Return the L2 cache default max size.
      */
@@ -2626,16 +2556,6 @@ 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.
      */

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -7,8 +7,6 @@ import jakarta.persistence.PersistenceException;
 
 import java.util.concurrent.locks.ReentrantLock;
 
-import static java.lang.System.Logger.Level.WARNING;
-
 /**
  * Low-level factory for creating {@link Database} instances.
  * <p>
@@ -73,28 +71,18 @@ public final class DatabaseFactory {
     lock.lock();
     try {
       var config = builder.settings();
-      var name = config.getName();
-      if (name == null) {
+      if (config.getName() == null) {
         throw new PersistenceException("The name is null (it is required)");
       }
-      if (config.isRegister()) {
-        // We're explicitly creating a database to be registered, so avoid
-        // triggering DbContext static initialisation to auto-create a default one.
-        DbPrimary.setSkip(true);
-        Database existing = DbContext.getInstance().getRegistered(name);
-        if (existing != null) {
-          EbeanVersion.log.log(WARNING, "Using existing database with name:{0}", name);
-          return existing;
-        }
-      }
       Database server = createInternal(config);
       if (config.isRegister()) {
         if (config.isDefaultServer()) {
-          if (defaultServerName != null && !defaultServerName.equals(name)) {
-            throw new IllegalStateException("Registering [" + name + "] as the default server but [" + defaultServerName + "] is already registered as the default");
+          if (defaultServerName != null && !defaultServerName.equals(config.getName())) {
+            throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
           }
-          defaultServerName = name;
+          defaultServerName = config.getName();
         }
+        DbPrimary.setSkip(true);
         DbContext.getInstance().register(server, config.isDefaultServer());
       }
       return server;

ebean-api/src/main/java/io/ebean/DbContext.java

@@ -4,8 +4,6 @@ import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
 
 import jakarta.persistence.PersistenceException;
-import org.jspecify.annotations.Nullable;
-
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -77,11 +75,6 @@ final class DbContext {
     return defaultDatabase;
   }
 
-  @Nullable
-  Database getRegistered(String name) {
-    return concMap.get(name);
-  }
-
   /**
    * Return the database by name.
    */

ebean-api/src/main/java/io/ebean/DocStoreQueueEntry.java

@@ -1,94 +0,0 @@
-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;
-  }
-}

ebean-api/src/main/java/io/ebean/DocumentStore.java

@@ -1,312 +0,0 @@
-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);
-}

ebean-api/src/main/java/io/ebean/ExpressionFactory.java

@@ -1,7 +1,5 @@
 package io.ebean;
 
-import io.ebean.search.*;
-
 import java.util.Collection;
 import java.util.Map;
 
@@ -625,31 +623,6 @@ 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.
    */
@@ -693,12 +666,4 @@ 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);
 }

ebean-api/src/main/java/io/ebean/ExpressionList.java

@@ -2,7 +2,6 @@ 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,11 +89,6 @@ 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>
@@ -205,22 +199,6 @@ public interface ExpressionList<T> {
    */
   int delete();
 
-  /**
-   * Execute as a delete query permanently deleting the 'root level' beans that match the
-   * predicates in the query without soft delete.
-   * <p>
-   * This is the same as {@link #delete()} except that when the bean type uses soft delete
-   * (e.g. {@code @SoftDelete}) the matching rows are permanently (hard) deleted rather than
-   * being marked as deleted.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   * </p>
-   *
-   * @return the number of rows that were permanently deleted.
-   */
-  int deletePermanent();
-
   /**
    * Execute as a update query.
    *
@@ -487,28 +465,6 @@ 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.
@@ -560,19 +516,6 @@ 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.
    *
@@ -656,14 +599,6 @@ 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>
@@ -672,16 +607,6 @@ 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).
    */
@@ -701,14 +626,6 @@ 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
@@ -1651,47 +1568,6 @@ 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.
    */
@@ -1834,42 +1710,6 @@ 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>

ebean-api/src/main/java/io/ebean/Finder.java

@@ -213,11 +213,4 @@ 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);
-  }
-
 }

ebean-api/src/main/java/io/ebean/Query.java

@@ -346,23 +346,6 @@ public interface Query<T> extends CancelableQuery, 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.
@@ -457,11 +440,6 @@ public interface Query<T> extends CancelableQuery, 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.
    */

ebean-api/src/main/java/io/ebean/QueryBuilder.java

@@ -64,11 +64,6 @@ 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>
@@ -253,44 +248,7 @@ 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
@@ -300,15 +258,6 @@ 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>
@@ -321,20 +270,6 @@ 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.
    *
@@ -405,13 +340,6 @@ 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>
@@ -607,21 +535,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
    */
   int delete();
 
-  /**
-   * Execute as a delete query permanently deleting the 'root level' beans that match the
-   * predicates in the query without soft delete.
-   * <p>
-   * This is the same as {@link #delete()} except that when the bean type uses soft delete
-   * (e.g. {@code @SoftDelete}) the matching rows are permanently (hard) deleted rather than
-   * being marked as deleted.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were permanently deleted.
-   */
-  int deletePermanent();
-
   /**
    * Execute the query returning true if a row is found.
    * <p>

ebean-api/src/main/java/io/ebean/RawSqlBuilder.java

@@ -41,49 +41,6 @@ public interface RawSqlBuilder {
     return XBootstrapService.rawSql().unparsed(sql);
   }
 
-  /**
-   * Return a RawSqlBuilder for SQL containing {@code ${where}}, {@code ${having}} and/or
-   * {@code ${orderBy}} placeholder(s). Unlike {@link #parse(String)} this does NOT attempt to parse
-   * the SELECT columns, so it supports complex SQL such as CTEs, subqueries, and window functions.
-   * <p>
-   * Explicit column mappings must be provided (as with {@link #unparsed(String)}), but
-   * WHERE, HAVING and ORDER BY expressions can be added dynamically via the query API - provided
-   * the corresponding placeholder is present in the SQL. If a query calls {@code .orderBy(...)}
-   * on a template with no {@code ${orderBy}}/{@code ${andOrderBy}} placeholder, that ordering is
-   * ignored (there is no injection point for it) rather than producing invalid SQL.
-   * </p>
-   * <p>
-   * Available placeholders:
-   * </p>
-   * <ul>
-   *   <li>{@code ${where}} / {@code ${andWhere}} - inject "where &lt;expr&gt;" / "and &lt;expr&gt;"</li>
-   *   <li>{@code ${having}} / {@code ${andHaving}} - inject "having &lt;expr&gt;" / "and &lt;expr&gt;"</li>
-   *   <li>{@code ${orderBy}} / {@code ${andOrderBy}} - inject "order by &lt;expr&gt;" / ", &lt;expr&gt;"</li>
-   * </ul>
-   * <h3>Example:</h3>
-   * <pre>{@code
-   *
-   *   String sql = """
-   *     with agg as (
-   *       select company_id, sum(amount) as total
-   *       from orders
-   *       ${where}
-   *       group by company_id
-   *     )
-   *     select company_id, total from agg ${orderBy}
-   *     """;
-   *
-   *   RawSql rawSql = RawSqlBuilder.withPlaceholders(sql)
-   *     .columnMapping("company_id", "companyId")
-   *     .columnMapping("total", "total")
-   *     .create();
-   *
-   * }</pre>
-   */
-  static RawSqlBuilder withPlaceholders(String sql) {
-    return XBootstrapService.rawSql().withPlaceholders(sql);
-  }
-
   /**
    * Return a RawSqlBuilder parsing the sql.
    * <p>

ebean-api/src/main/java/io/ebean/Transaction.java

@@ -1,9 +1,7 @@
 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;
@@ -211,29 +209,6 @@ 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
@@ -260,27 +235,6 @@ public interface Transaction extends AutoCloseable {
    */
   void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties);
 
-  /**
-   * Set to false to disable auto-generation of {@code @WhenCreated}, {@code @WhenModified},
-   * {@code @WhoCreated} and {@code @WhoModified} values for this transaction.
-   * <p>
-   * When disabled, Ebean will only set a generated property value if the property currently
-   * has a null value (for inserts) or is a {@code @Version} property. Any value already set
-   * on the bean is preserved.
-   * <p>
-   * This is useful in backup and restore scenarios where you need to retain the original
-   * audit timestamps and user values rather than have them overwritten.
-   * <pre>{@code
-   *   try (Transaction txn = DB.beginTransaction()) {
-   *     txn.setGeneratedPropertiesEnabled(false);
-   *     bean.setWhenCreated(originalTimestamp);
-   *     DB.save(bean);
-   *     txn.commit();
-   *   }
-   * }</pre>
-   */
-  void setGeneratedPropertiesEnabled(boolean enable);
-
   /**
    * Set if the L2 cache should be skipped for "find by id" and "find by natural key" queries.
    * <p>

ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java

@@ -175,7 +175,7 @@ public final class InterceptReadOnly extends InterceptBase {
 
   @Override
   public boolean isUpdate() {
-    return true;
+    return false;
   }
 
   @Override

ebean-api/src/main/java/io/ebean/common/BeanList.java

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

ebean-api/src/main/java/io/ebean/common/BeanMap.java

@@ -1,6 +1,9 @@
 package io.ebean.common;
 
-import io.ebean.bean.*;
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollectionLoader;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.ToStringBuilder;
 
 import java.util.*;
 
@@ -14,12 +17,12 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   /**
    * The underlying map implementation.
    */
-  private LinkedHashMap<K, E> map;
+  private Map<K, E> map;
 
   /**
    * Create with a given Map.
    */
-  public BeanMap(LinkedHashMap<K, E> map) {
+  public BeanMap(Map<K, E> map) {
     this.map = map;
   }
 
@@ -162,23 +165,18 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     }
   }
 
-  public LinkedHashMap<K, E> collectionAdd() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    return map;
-  }
-
+  /**
+   * Set the actual underlying map. Used for performing lazy fetch.
+   */
   @SuppressWarnings("unchecked")
-  public void refresh(ModifyListenMode modifyListenMode, BeanMap<?, ?> newMap) {
-    setModifyListening(modifyListenMode);
-    this.map = (LinkedHashMap<K, E>) newMap.actualMap();
+  public void setActualMap(Map<?, ?> map) {
+    this.map = (Map<K, E>) map;
   }
 
   /**
    * Return the actual underlying map.
    */
-  public LinkedHashMap<K, E> actualMap() {
+  public Map<K, E> actualMap() {
     return map;
   }
 

ebean-api/src/main/java/io/ebean/common/BeanSet.java

@@ -15,12 +15,12 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   /**
    * The underlying Set implementation.
    */
-  private LinkedHashSet<E> set;
+  private Set<E> set;
 
   /**
    * Create with a specific Set implementation.
    */
-  public BeanSet(LinkedHashSet<E> set) {
+  public BeanSet(Set<E> set) {
     this.set = set;
   }
 
@@ -146,22 +146,18 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     }
   }
 
-  public BeanCollectionAdd collectionAdd() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    return this;
-  }
-
-  public void refresh(ModifyListenMode modifyListenMode, BeanSet<E> newSet) {
-    setModifyListening(modifyListenMode);
-    this.set = newSet.actualSet();
+  /**
+   * Set the underlying set (used for lazy fetch).
+   */
+  @SuppressWarnings("unchecked")
+  public void setActualSet(Set<?> set) {
+    this.set = (Set<E>) set;
   }
 
   /**
    * Return the actual underlying set.
    */
-  public LinkedHashSet<E> actualSet() {
+  public Set<E> actualSet() {
     return set;
   }
 

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -16,8 +16,6 @@ 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;
@@ -120,16 +118,6 @@ 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).
@@ -407,8 +395,6 @@ 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;
@@ -432,8 +418,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   private int backgroundExecutorShutdownSecs = 30;
   private BackgroundExecutorWrapper backgroundExecutorWrapper = new MdcBackgroundExecutorWrapper();
 
-  private boolean tenantPartitionedCache;
-
   // defaults for the L2 bean caching
 
   private int cacheMaxSize = 10000;
@@ -985,28 +969,6 @@ 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;
@@ -1177,17 +1139,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     return cacheMaxSize;
   }
 
-  @Override
-  public boolean isTenantPartitionedCache() {
-    return tenantPartitionedCache;
-  }
-
-  @Override
-  public DatabaseConfig tenantPartitionedCache(boolean tenantPartitionedCache) {
-    this.tenantPartitionedCache = tenantPartitionedCache;
-    return this;
-  }
-
   @Override
   public DatabaseConfig setCacheMaxSize(int cacheMaxSize) {
     this.cacheMaxSize = cacheMaxSize;
@@ -1292,28 +1243,6 @@ 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();
@@ -2097,13 +2026,6 @@ 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.
    */
@@ -2134,11 +2056,6 @@ 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);
@@ -2157,7 +2074,6 @@ 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);
@@ -2241,15 +2157,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     ddlPlaceholders = p.get("ddl.placeholders", ddlPlaceholders);
     ddlHeader = p.get("ddl.header", ddlHeader);
 
-    tenantPartitionedCache = p.getBoolean("tenantPartitionedCache", tenantPartitionedCache);
-
-    cacheMaxSize = p.getInt("cacheMaxSize", cacheMaxSize);
-    cacheMaxIdleTime = p.getInt("cacheMaxIdleTime", cacheMaxIdleTime);
-    cacheMaxTimeToLive = p.getInt("cacheMaxTimeToLive", cacheMaxTimeToLive);
-    queryCacheMaxSize = p.getInt("queryCacheMaxSize", queryCacheMaxSize);
-    queryCacheMaxIdleTime = p.getInt("queryCacheMaxIdleTime", queryCacheMaxIdleTime);
-    queryCacheMaxTimeToLive = p.getInt("queryCacheMaxTimeToLive", queryCacheMaxTimeToLive);
-
     // read tenant-configuration from config:
     // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION
     String mode = p.get("tenant.mode");

ebean-api/src/main/java/io/ebean/config/DocStoreConfig.java

@@ -1,320 +0,0 @@
-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);
-  }
-}

ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -11,12 +11,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayDeque;
 import java.util.Collections;
-import java.util.Deque;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.NavigableSet;
+import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -25,36 +23,18 @@ import static java.lang.System.Logger.Level.ERROR;
 
 /**
  * Database sequence based IdGenerator.
- * <p>
- * Maintains a separate buffer of pre-fetched id values per tenant when the supplied
- * DataSource implements {@link TenantConnectionSource}. For the common single-tenant
- * case a single buffer is used (keyed by {@link #SINGLE}).
  */
 public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected static final System.Logger log = AppLog.getLogger("io.ebean.SEQ");
 
-  /**
-   * Buffer key used when there is no current tenant (single-tenant or no tenant in scope).
-   */
-  private static final Object SINGLE = new Object();
-
+  private final ReentrantLock lock = new ReentrantLock();
   protected final String seqName;
   protected final DataSource dataSource;
   protected final BackgroundExecutor backgroundExecutor;
+  protected final NavigableSet<Long> idList = new TreeSet<>();
   protected final int allocationSize;
-  private final TenantConnectionSource tenantSource;
-  private final TenantBuffer single = new TenantBuffer();
-  private final ConcurrentMap<Object, TenantBuffer> buffers = new ConcurrentHashMap<>();
-
-  /**
-   * Per-tenant pre-fetched id buffer with its own lock and background-loading flag.
-   */
-  private static final class TenantBuffer {
-    final ReentrantLock lock = new ReentrantLock();
-    final Deque<Long> idList = new ArrayDeque<>();
-    final AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
-  }
+  protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
 
   /**
    * Construct given a dataSource and sql to return the next sequence value.
@@ -64,7 +44,6 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     this.dataSource = ds;
     this.seqName = seqName;
     this.allocationSize = allocationSize;
-    this.tenantSource = (ds instanceof TenantConnectionSource) ? (TenantConnectionSource) ds : null;
   }
 
   public abstract String getSql(int batchSize);
@@ -85,24 +64,6 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     return true;
   }
 
-  private Object currentTenantKey() {
-    if (tenantSource != null) {
-      Object tenantId = tenantSource.currentTenantId();
-      if (tenantId != null) {
-        return tenantId;
-      }
-    }
-    return SINGLE;
-  }
-
-  private TenantBuffer buffer(Object tenantKey) {
-    if (tenantKey == SINGLE) {
-      // common single-tenant path - avoid the concurrent map lookup
-      return single;
-    }
-    return buffers.computeIfAbsent(tenantKey, k -> new TenantBuffer());
-  }
-
   /**
    * If allocateSize is large load some sequences in a background thread.
    * <p>
@@ -117,22 +78,23 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   /**
    * Return the next Id.
+   * <p>
+   * If a Transaction has been passed in use the Connection from it.
+   * </p>
    */
   @Override
   public Object nextId(Transaction t) {
-    Object tenantKey = currentTenantKey();
-    TenantBuffer buffer = buffer(tenantKey);
-    buffer.lock.lock();
+    lock.lock();
     try {
-      int size = buffer.idList.size();
+      int size = idList.size();
       if (size > 0) {
         maybeLoadMoreInBackground(size);
       } else {
-        loadMore(tenantKey, buffer, allocationSize);
+        loadMore(allocationSize);
       }
-      return buffer.idList.poll();
+      return idList.pollFirst();
     } finally {
-      buffer.lock.unlock();
+      lock.unlock();
     }
   }
 
@@ -144,36 +106,29 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     }
   }
 
-  private void loadMore(Object tenantKey, TenantBuffer buffer, int requestSize) {
-    List<Long> newIds = getMoreIds(tenantKey, requestSize);
-    buffer.lock.lock();
+  private void loadMore(int requestSize) {
+    List<Long> newIds = getMoreIds(requestSize);
+    lock.lock();
     try {
-      buffer.idList.addAll(newIds);
+      idList.addAll(newIds);
     } finally {
-      buffer.lock.unlock();
+      lock.unlock();
     }
   }
 
   /**
    * Load another batch of Id's using a background thread.
-   * <p>
-   * The tenant is captured here (submit time) as the current tenant is not in scope
-   * on the background executor thread.
    */
   protected void loadInBackground(final int requestSize) {
-    final Object tenantKey = currentTenantKey();
-    final TenantBuffer buffer = buffer(tenantKey);
-    if (!buffer.currentlyBackgroundLoading.compareAndSet(false, true)) {
+    if (currentlyBackgroundLoading.get()) {
       // skip as already background loading
       log.log(DEBUG, "... skip background sequence load (another load in progress)");
       return;
     }
+    currentlyBackgroundLoading.set(true);
     backgroundExecutor.execute(() -> {
-      try {
-        loadMore(tenantKey, buffer, requestSize);
-      } finally {
-        buffer.currentlyBackgroundLoading.set(false);
-      }
+      loadMore(requestSize);
+      currentlyBackgroundLoading.set(false);
     });
   }
 
@@ -185,7 +140,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   /**
    * Get more Id's by executing a query and reading the Id's returned.
    */
-  protected List<Long> getMoreIds(Object tenantKey, int requestSize) {
+  protected List<Long> getMoreIds(int requestSize) {
 
     String sql = getSql(requestSize);
 
@@ -193,7 +148,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     PreparedStatement statement = null;
     ResultSet resultSet = null;
     try {
-      connection = connectionFor(tenantKey);
+      connection = dataSource.getConnection();
 
       statement = connection.prepareStatement(sql);
       resultSet = statement.executeQuery();
@@ -219,17 +174,6 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     }
   }
 
-  /**
-   * Return a connection for the given tenant. For multi-tenant this is routed to the
-   * tenant database/schema/catalog; otherwise the plain DataSource connection is used.
-   */
-  private Connection connectionFor(Object tenantKey) throws SQLException {
-    if (tenantSource != null && tenantKey != SINGLE) {
-      return tenantSource.connectionForTenant(tenantKey);
-    }
-    return dataSource.getConnection();
-  }
-
   /**
    * Close the JDBC resources.
    */

ebean-api/src/main/java/io/ebean/config/dbplatform/TenantConnectionSource.java

@@ -1,29 +0,0 @@
-package io.ebean.config.dbplatform;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Optionally implemented by the DataSource passed to a {@link SequenceIdGenerator}
- * to make sequence id allocation multi-tenant aware.
- * <p>
- * When the DataSource implements this interface the sequence generator maintains
- * a separate id buffer per tenant and obtains connections that are routed to the
- * correct tenant database (TenantMode.DB) or schema/catalog (TenantMode.SCHEMA / CATALOG).
- * <p>
- * The {@link #connectionForTenant(Object)} method takes an explicit tenantId so that
- * background pre-fetch (which runs on a separate thread without the current tenant
- * in scope) can fetch sequence values for the tenant captured at submit time.
- */
-public interface TenantConnectionSource {
-
-  /**
-   * Return the current tenant id, or null when there is no current tenant scope.
-   */
-  Object currentTenantId();
-
-  /**
-   * Return a connection routed to the given tenant (its database, schema or catalog).
-   */
-  Connection connectionForTenant(Object tenantId) throws SQLException;
-}

ebean-api/src/main/java/io/ebean/docstore/DocMapping.java

@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document Mapping for a bean marker interface.
- */
-public interface DocMapping {
-}

ebean-api/src/main/java/io/ebean/docstore/DocQueryContext.java

@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document query request context marker interface.
- */
-public interface DocQueryContext<T> {
-}

ebean-api/src/main/java/io/ebean/docstore/DocUpdateContext.java

@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document update context marker interface.
- */
-public interface DocUpdateContext {
-}

ebean-api/src/main/java/io/ebean/docstore/RawDoc.java

@@ -1,102 +0,0 @@
-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;
-  }
-}

ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java

@@ -1,37 +0,0 @@
-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);
-}

ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java

@@ -1,23 +0,0 @@
-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);
-
-}

ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java

@@ -1,97 +0,0 @@
-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;
-  }
-}

ebean-api/src/main/java/io/ebean/event/readaudit/ReadEvent.java

@@ -1,261 +0,0 @@
-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;
-  }
-}

ebean-api/src/main/java/io/ebean/event/readaudit/package-info.java

@@ -1,8 +0,0 @@
-/**
- * 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;

ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java

@@ -44,11 +44,6 @@ public interface MetaQueryPlan {
    */
   String plan();
 
-  /**
-   * The tenant ID of the plan.
-   */
-  Object tenantId();
-
   /**
    * Return the query execution time associated with the bind values capture.
    */

ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java

@@ -1,72 +0,0 @@
-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;
-
-}

ebean-api/src/main/java/io/ebean/plugin/BeanType.java

@@ -2,15 +2,12 @@ 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.
@@ -145,73 +142,4 @@ 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);
 }

ebean-api/src/main/java/io/ebean/plugin/SpiServer.java

@@ -39,11 +39,6 @@ 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.
    */

ebean-api/src/main/java/io/ebean/search/AbstractMatch.java

@@ -1,98 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/Match.java

@@ -1,117 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/MultiMatch.java

@@ -1,148 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/TextCommonTerms.java

@@ -1,139 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/TextQueryString.java

@@ -1,398 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/TextSimple.java

@@ -1,193 +0,0 @@
-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;
-  }
-
-}

ebean-api/src/main/java/io/ebean/search/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Provides text search expressions like Match, TextQueryString etc.
- */
-package io.ebean.search;

ebean-api/src/main/java/io/ebean/service/SpiRawSqlService.java

@@ -27,13 +27,6 @@ public interface SpiRawSqlService extends BootstrapService {
    */
   RawSqlBuilder unparsed(String sql);
 
-  /**
-   * SQL with ${where}/${having} placeholder(s) but no SELECT column parsing.
-   * Supports complex SQL (CTEs, window functions) where keyword parsing would fail.
-   * Explicit column mapping is required (as with unparsed).
-   */
-  RawSqlBuilder withPlaceholders(String sql);
-
   /**
    * Create based on a JDBC ResultSet.
    *

ebean-api/src/main/java/module-info.java

@@ -25,14 +25,11 @@ 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;

ebean-api/src/main/java21/io/ebean/common/BeanMap.java

@@ -1,432 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.*;
-
-import java.util.*;
-
-/**
- * Map capable of lazy loading and modification aware.
- */
-public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements SequencedMap<K, E> {
-
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The underlying map implementation.
-   */
-  private LinkedHashMap<K, E> map;
-
-  /**
-   * Create with a given Map.
-   */
-  public BeanMap(LinkedHashMap<K, E> map) {
-    this.map = map;
-  }
-
-  /**
-   * Create using a underlying LinkedHashMap.
-   */
-  public BeanMap() {
-    this(new LinkedHashMap<>());
-  }
-
-  public BeanMap(BeanCollectionLoader ebeanServer, EntityBean ownerBean, String propertyName) {
-    super(ebeanServer, ownerBean, propertyName);
-  }
-
-  @Override
-  public Map<K, E> freeze() {
-    return map == null ? null : Collections.unmodifiableMap(map);
-  }
-
-  @Override
-  public void toString(ToStringBuilder builder) {
-    if (map == null || map.isEmpty()) {
-      builder.addRaw("{}");
-    } else {
-      builder.addRaw("{");
-      for (Entry<K, E> entry : map.entrySet()) {
-        builder.add(String.valueOf(entry.getKey()), entry.getValue());
-      }
-      builder.addRaw("}");
-    }
-  }
-
-  @Override
-  public void reset(EntityBean ownerBean, String propertyName) {
-    this.ownerBean = ownerBean;
-    this.propertyName = propertyName;
-    this.map = null;
-  }
-
-  @Override
-  public boolean isSkipSave() {
-    return map == null || (map.isEmpty() && !holdsModifications());
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void loadFrom(BeanCollection<?> other) {
-    BeanMap<K, E> otherMap = (BeanMap<K, E>) other;
-    internalPutNull();
-    map.putAll(otherMap.actualMap());
-  }
-
-  public void internalPutNull() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void internalPut(Object key, Object bean) {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    if (key != null) {
-      map.put((K) key, (E) bean);
-    }
-  }
-
-  public void internalPutWithCheck(Object key, Object bean) {
-    if (map == null || key == null || !map.containsKey(key)) {
-      internalPut(key, bean);
-    }
-  }
-
-  @Override
-  public void internalAddWithCheck(Object bean) {
-    throw new RuntimeException("Not allowed for map");
-  }
-
-  @Override
-  public void internalAdd(Object bean) {
-    throw new RuntimeException("Not allowed for map");
-  }
-
-  /**
-   * Return true if the underlying map has been populated. Returns false if it
-   * has a deferred fetch pending.
-   */
-  @Override
-  public boolean isPopulated() {
-    return map != null;
-  }
-
-  /**
-   * Return true if this is a reference (lazy loading) bean collection. This is
-   * the same as !isPopulated();
-   */
-  @Override
-  public boolean isReference() {
-    return map == null;
-  }
-
-  @Override
-  public boolean checkEmptyLazyLoad() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  private void initClear() {
-    lock.lock();
-    try {
-      if (map == null) {
-        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
-        } else {
-          map = new LinkedHashMap<>();
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private void init() {
-    lock.lock();
-    try {
-      if (map == null) {
-        if (disableLazyLoad) {
-          map = new LinkedHashMap<>();
-        } else {
-          lazyLoadCollection(false);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  public LinkedHashMap<K, E> collectionAdd() {
-    if (map == null) {
-      map = new LinkedHashMap<>();
-    }
-    return map;
-  }
-
-  @SuppressWarnings("unchecked")
-  public void refresh(ModifyListenMode modifyListenMode, BeanMap<?, ?> newMap) {
-    setModifyListening(modifyListenMode);
-    this.map = (LinkedHashMap<K, E>) newMap.actualMap();
-  }
-
-  /**
-   * Return the actual underlying map.
-   */
-  public LinkedHashMap<K, E> actualMap() {
-    return map;
-  }
-
-  /**
-   * Returns the collection of beans (map values).
-   */
-  @Override
-  public Collection<E> actualDetails() {
-    return map.values();
-  }
-
-  /**
-   * Returns the map entrySet.
-   */
-  @Override
-  public Collection<?> actualEntries() {
-    return map.entrySet();
-  }
-
-  @Override
-  public String toString() {
-    if (map == null) {
-      return "BeanMap<deferred>";
-    } else {
-      return map.toString();
-    }
-  }
-
-  /**
-   * Equal if object is a Map and equal in a Map sense.
-   */
-  @Override
-  public boolean equals(Object object) {
-    init();
-    return map.equals(object);
-  }
-
-  @Override
-  public int hashCode() {
-    init();
-    return map.hashCode();
-  }
-
-  @Override
-  public void clear() {
-    initClear();
-    if (modifyListening) {
-      // add all beans to the removal list
-      for (E bean : map.values()) {
-        modifyRemoval(bean);
-      }
-    }
-    map.clear();
-  }
-
-  @Override
-  public boolean containsKey(Object key) {
-    init();
-    return map.containsKey(key);
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    init();
-    return map.containsValue(value);
-  }
-
-  @Override
-  public Set<Entry<K, E>> entrySet() {
-    init();
-    return modifyListening ? new ModifyEntrySet<>(this, map.entrySet()) : map.entrySet();
-  }
-
-  @Override
-  public E get(Object key) {
-    init();
-    return map.get(key);
-  }
-
-  @Override
-  public boolean isEmpty() {
-    init();
-    return map.isEmpty();
-  }
-
-  @Override
-  public Set<K> keySet() {
-    init();
-    return modifyListening ? new ModifyKeySet<>(this, map.keySet()) : map.keySet();
-  }
-
-  @Override
-  public E put(K key, E value) {
-    init();
-    if (modifyListening) {
-      E oldBean = map.put(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.put(key, value);
-    }
-  }
-
-  @Override
-  public void putAll(Map<? extends K, ? extends E> puts) {
-    init();
-    if (modifyListening) {
-      for (Entry<? extends K, ? extends E> entry : puts.entrySet()) {
-        Object oldBean = map.put(entry.getKey(), entry.getValue());
-        if (entry.getValue() != oldBean) {
-          modifyAddition(entry.getValue());
-          modifyRemoval(oldBean);
-        }
-      }
-    } else {
-      map.putAll(puts);
-    }
-  }
-
-  @Override
-  public void addBean(E bean) {
-    throw new UnsupportedOperationException("Method not allowed on Map. Please use List instead.");
-  }
-
-  @Override
-  public void removeBean(E bean) {
-    throw new UnsupportedOperationException("Method not allowed on Map. Please use List instead.");
-  }
-
-  @Override
-  public E remove(Object key) {
-    init();
-    if (modifyListening) {
-      E o = map.remove(key);
-      modifyRemoval(o);
-      return o;
-    }
-    return map.remove(key);
-  }
-
-  @Override
-  public int size() {
-    init();
-    return map.size();
-  }
-
-  @Override
-  public Collection<E> values() {
-    init();
-    return modifyListening ? new ModifyCollection<>(this, map.values()) : map.values();
-  }
-
-  // -----------------------------------------------------//
-  // SequencedMap (Java 21+)
-  // -----------------------------------------------------//
-
-  @Override
-  public SequencedMap<K, E> reversed() {
-    init();
-    if (modifyListening) {
-      throw new UnsupportedOperationException("Not supported on modify listening map");
-    }
-    return map.reversed();
-  }
-
-  @Override
-  public Entry<K, E> firstEntry() {
-    init();
-    return map.firstEntry();
-  }
-
-  @Override
-  public Entry<K, E> lastEntry() {
-    init();
-    return map.lastEntry();
-  }
-
-  @Override
-  public Entry<K, E> pollFirstEntry() {
-    init();
-    Entry<K, E> entry = map.pollFirstEntry();
-    if (modifyListening && entry != null) {
-      modifyRemoval(entry.getValue());
-    }
-    return entry;
-  }
-
-  @Override
-  public Entry<K, E> pollLastEntry() {
-    init();
-    Entry<K, E> entry = map.pollLastEntry();
-    if (modifyListening && entry != null) {
-      modifyRemoval(entry.getValue());
-    }
-    return entry;
-  }
-
-  @Override
-  public E putFirst(K key, E value) {
-    init();
-    if (modifyListening) {
-      E oldBean = map.putFirst(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.putFirst(key, value);
-    }
-  }
-
-  @Override
-  public E putLast(K key, E value) {
-    init();
-    if (modifyListening) {
-      E oldBean = map.putLast(key, value);
-      if (value != oldBean) {
-        // register the add of the new and the removal of the old
-        modifyAddition(value);
-        modifyRemoval(oldBean);
-      }
-      return oldBean;
-    } else {
-      return map.putLast(key, value);
-    }
-  }
-
-  @Override
-  public SequencedSet<K> sequencedKeySet() {
-    init();
-    return map.sequencedKeySet();
-  }
-
-  @Override
-  public SequencedCollection<E> sequencedValues() {
-    init();
-    return map.sequencedValues();
-  }
-
-  @Override
-  public SequencedSet<Entry<K, E>> sequencedEntrySet() {
-    init();
-    return map.sequencedEntrySet();
-  }
-}

ebean-api/src/main/java21/io/ebean/common/BeanSet.java

@@ -1,419 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.*;
-
-import java.util.*;
-
-/**
- * Set capable of lazy loading and modification aware.
- */
-public final class BeanSet<E> extends AbstractBeanCollection<E> implements SequencedSet<E>, BeanCollectionAdd {
-
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The underlying Set implementation.
-   */
-  private LinkedHashSet<E> set;
-
-  /**
-   * Create with a specific Set implementation.
-   */
-  public BeanSet(LinkedHashSet<E> set) {
-    this.set = set;
-  }
-
-  /**
-   * Create using an underlying LinkedHashSet.
-   */
-  public BeanSet() {
-    this(new LinkedHashSet<>());
-  }
-
-  public BeanSet(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) {
-    super(loader, ownerBean, propertyName);
-  }
-
-  @Override
-  public Set<E> freeze() {
-    return set == null ? null : Collections.unmodifiableSet(set);
-  }
-
-  @Override
-  public void toString(ToStringBuilder builder) {
-    builder.addCollection(set);
-  }
-
-  @Override
-  public void reset(EntityBean ownerBean, String propertyName) {
-    this.ownerBean = ownerBean;
-    this.propertyName = propertyName;
-    this.set = null;
-  }
-
-  @Override
-  public boolean isSkipSave() {
-    return set == null || (set.isEmpty() && !holdsModifications());
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void addEntityBean(EntityBean bean) {
-    set.add((E) bean);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void loadFrom(BeanCollection<?> other) {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    set.addAll((Collection<? extends E>) other.actualDetails());
-  }
-
-  @Override
-  public void internalAddWithCheck(Object bean) {
-    // set add() already de-dups so just add it
-    internalAdd(bean);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void internalAdd(Object bean) {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    if (bean != null) {
-      set.add((E) bean);
-    }
-  }
-
-  /**
-   * Returns true if the underlying set has its data.
-   */
-  @Override
-  public boolean isPopulated() {
-    return set != null;
-  }
-
-  /**
-   * Return true if this is a reference (lazy loading) bean collection. This is
-   * the same as !isPopulated();
-   */
-  @Override
-  public boolean isReference() {
-    return set == null;
-  }
-
-  @Override
-  public boolean checkEmptyLazyLoad() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  private void initClear() {
-    lock.lock();
-    try {
-      if (set == null) {
-        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(false);
-        } else {
-          set = new LinkedHashSet<>();
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private void init() {
-    lock.lock();
-    try {
-      if (set == null) {
-        if (disableLazyLoad) {
-          set = new LinkedHashSet<>();
-        } else {
-          lazyLoadCollection(false);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  public BeanCollectionAdd collectionAdd() {
-    if (set == null) {
-      set = new LinkedHashSet<>();
-    }
-    return this;
-  }
-
-  public void refresh(ModifyListenMode modifyListenMode, BeanSet<E> newSet) {
-    setModifyListening(modifyListenMode);
-    this.set = newSet.actualSet();
-  }
-
-  /**
-   * Return the actual underlying set.
-   */
-  public LinkedHashSet<E> actualSet() {
-    return set;
-  }
-
-  @Override
-  public Collection<E> actualDetails() {
-    return set;
-  }
-
-  @Override
-  public Collection<?> actualEntries() {
-    return set;
-  }
-
-  @Override
-  public String toString() {
-    if (set == null) {
-      return "BeanSet<deferred>";
-    } else {
-      return set.toString();
-    }
-  }
-
-  /**
-   * Equal if obj is a Set and equal in a Set sense.
-   */
-  @Override
-  public boolean equals(Object obj) {
-    init();
-    return set.equals(obj);
-  }
-
-  @Override
-  public int hashCode() {
-    init();
-    return set.hashCode();
-  }
-
-  @Override
-  public void addBean(E bean) {
-    add(bean);
-  }
-
-  @Override
-  public void removeBean(E bean) {
-    if (set.remove(bean)) {
-      getModifyHolder().modifyRemoval(bean);
-    }
-  }
-
-  // -----------------------------------------------------//
-  // proxy method for map
-  // -----------------------------------------------------//
-
-  @Override
-  public boolean add(E bean) {
-    init();
-    if (modifyListening) {
-      if (set.add(bean)) {
-        modifyAddition(bean);
-        return true;
-      } else {
-        return false;
-      }
-    }
-    return set.add(bean);
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends E> beans) {
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      for (E bean : beans) {
-        if (set.add(bean)) {
-          // register the addition of the bean
-          modifyAddition(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.addAll(beans);
-  }
-
-  @Override
-  public void clear() {
-    initClear();
-    if (modifyListening) {
-      for (E bean : set) {
-        modifyRemoval(bean);
-      }
-    }
-    set.clear();
-  }
-
-  @Override
-  public boolean contains(Object bean) {
-    init();
-    return set.contains(bean);
-  }
-
-  @Override
-  public boolean containsAll(Collection<?> beans) {
-    init();
-    return set.containsAll(beans);
-  }
-
-  @Override
-  public boolean isEmpty() {
-    init();
-    return set.isEmpty();
-  }
-
-  @Override
-  public Iterator<E> iterator() {
-    init();
-    if (modifyListening) {
-      return new ModifyIterator<>(this, set.iterator());
-    }
-    return set.iterator();
-  }
-
-  @Override
-  public boolean remove(Object bean) {
-    init();
-    if (modifyListening) {
-      if (set.remove(bean)) {
-        modifyRemoval(bean);
-        return true;
-      }
-      return false;
-    }
-    return set.remove(bean);
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> beans) {
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      for (Object bean : beans) {
-        if (set.remove(bean)) {
-          modifyRemoval(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.removeAll(beans);
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> beans) {
-    init();
-    if (modifyListening) {
-      boolean changed = false;
-      Iterator<?> it = set.iterator();
-      while (it.hasNext()) {
-        Object bean = it.next();
-        if (!beans.contains(bean)) {
-          // not retaining this bean so add it to the removal list
-          it.remove();
-          modifyRemoval(bean);
-          changed = true;
-        }
-      }
-      return changed;
-    }
-    return set.retainAll(beans);
-  }
-
-  @Override
-  public int size() {
-    init();
-    return set.size();
-  }
-
-  @Override
-  public Object[] toArray() {
-    init();
-    return set.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(T[] array) {
-    init();
-    //noinspection SuspiciousToArrayCall
-    return set.toArray(array);
-  }
-
-  // -----------------------------------------------------//
-  // SequencedSet (Java 21+)
-  // -----------------------------------------------------//
-
-  @Override
-  public SequencedSet<E> reversed() {
-    init();
-    if (modifyListening) {
-      throw new UnsupportedOperationException("Not supported on modify listening set");
-    }
-    return set.reversed();
-  }
-
-  @Override
-  public void addFirst(E bean) {
-    init();
-    if (modifyListening) {
-      modifyAddition(bean);
-    }
-    set.addFirst(bean);
-  }
-
-  @Override
-  public void addLast(E bean) {
-    init();
-    if (modifyListening) {
-      modifyAddition(bean);
-    }
-    set.addLast(bean);
-  }
-
-  @Override
-  public E getFirst() {
-    init();
-    return set.getFirst();
-  }
-
-  @Override
-  public E getLast() {
-    init();
-    return set.getLast();
-  }
-
-  @Override
-  public E removeFirst() {
-    init();
-    if (modifyListening) {
-      E bean = set.removeFirst();
-      modifyRemoval(bean);
-      return bean;
-    }
-    return set.removeFirst();
-  }
-
-  @Override
-  public E removeLast() {
-    init();
-    if (modifyListening) {
-      E bean = set.removeLast();
-      modifyRemoval(bean);
-      return bean;
-    }
-    return set.removeLast();
-  }
-
-}

ebean-api/src/test/java/io/ebean/bean/ToStringBuilderTest.java

@@ -136,13 +136,13 @@ class ToStringBuilderTest {
   @Test
   void beanSet_null_empty() {
     assertThat(toStringFor(new BeanSet<String>(null))).isEqualTo("[]");
-    assertThat(toStringFor(new BeanSet<String>(new LinkedHashSet<>()))).isEqualTo("[]");
+    assertThat(toStringFor(new BeanSet<String>(Collections.emptySet()))).isEqualTo("[]");
   }
 
   @Test
   void beanMap_null_empty() {
     assertThat(toStringFor(new BeanMap<String, String>(null))).isEqualTo("{}");
-    assertThat(toStringFor(new BeanMap<String, String>(new LinkedHashMap<>()))).isEqualTo("{}");
+    assertThat(toStringFor(new BeanMap<String, String>(Collections.emptyMap()))).isEqualTo("{}");
   }
 
   @Test
@@ -159,7 +159,7 @@ class ToStringBuilderTest {
 
   @Test
   void beanMap_some() {
-    var under = new LinkedHashMap<String, Recurse>();
+    Map<String, Recurse> under = new LinkedHashMap<>();
     under.put("a", new Recurse(1, "a"));
     under.put("b", new Recurse(2, "b"));
     BeanMap<String, Recurse> list = new BeanMap<>(under);

ebean-bench/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
   </parent>
 
   <artifactId>ebean-bench</artifactId>

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,91 +193,91 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-pgvector</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-pgvector-types</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>18.2.0</version>
+        <version>18.0.0</version>
       </dependency>
 
     </dependencies>

ebean-core-json/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-parent</artifactId>
-    <version>18.2.0</version>
+    <version>18.0.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.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.2.0</version>
+    <version>18.0.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-json</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
     </dependency>
 
     <dependency>
@@ -52,19 +52,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>18.2.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>
+      <version>18.0.0</version>
     </dependency>
 
     <!--
@@ -157,21 +145,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.2.0</version>
+      <version>18.0.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java

@@ -100,9 +100,7 @@ public final class LoadBeanRequest extends LoadRequest {
     query.setLoadDescription(mode(), description());
     if (lazy) {
       query.setLazyLoadBatchSize(loadBuffer.batchSize());
-      if (alreadyLoaded || !loadCache) {
-        // alreadyLoaded: bean is being re-loaded, skip the cache to avoid a stale hit
-        // !loadCache: parent context disabled cache (e.g. CacheMode.OFF or asOf query),
+      if (alreadyLoaded) {
         query.setBeanCacheMode(CacheMode.OFF);
       }
     } else {

ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java

@@ -66,11 +66,6 @@ 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.
    */

ebean-core/src/main/java/io/ebeaninternal/api/LoadManyBuffer.java

@@ -43,5 +43,4 @@ public interface LoadManyBuffer {
 
   void configureQuery(SpiQuery<?> query);
 
-  boolean isUseDocStore();
 }

ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java

@@ -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), loadContext.isUseDocStore());
+    many.addWhereParentIdIn(query, parentIdList(server, many, pc));
     query.setPersistenceContext(pc);
     query.setLoadDescription(lazy ? "lazy" : "query", description());
     if (lazy) {

ebean-core/src/main/java/io/ebeaninternal/api/SpiDbQueryPlan.java

@@ -12,6 +12,6 @@ public interface SpiDbQueryPlan extends MetaQueryPlan {
   /**
    * Extend with queryTimeMicros, captureCount, captureMicros and when the bind values were captured.
    */
-  SpiDbQueryPlan with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured, Object tenantId);
+  SpiDbQueryPlan with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured);
 
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java

@@ -5,8 +5,6 @@ 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;
@@ -107,11 +105,6 @@ 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.
    */
@@ -202,17 +195,6 @@ 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.
    */
@@ -374,8 +356,6 @@ public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {
 
   <T> int delete(SpiQuery<T> query);
 
-  <T> int deletePermanent(SpiQuery<T> query);
-
   <T> int update(SpiQuery<T> query);
 
   List<SqlRow> findList(SpiSqlQuery query);

ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java

@@ -3,9 +3,6 @@ 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;
 
 
 /**
@@ -21,16 +18,6 @@ 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>

ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java

@@ -2,7 +2,6 @@ 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;
@@ -32,11 +31,6 @@ 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.
    */

ebean-core/src/main/java/io/ebeaninternal/api/SpiJunction.java

@@ -1,17 +1,10 @@
 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;
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -12,7 +12,6 @@ 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;
@@ -172,11 +171,6 @@ 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).
      */
@@ -299,17 +293,6 @@ 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>
@@ -393,11 +376,6 @@ 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.
    */
@@ -531,11 +509,6 @@ 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.
    */
@@ -755,11 +728,6 @@ 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.
    */
@@ -836,11 +804,6 @@ 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.
    */
@@ -918,21 +881,6 @@ 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.
    */

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -9,7 +9,6 @@ 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;
@@ -104,24 +103,6 @@ public interface SpiTransaction extends Transaction {
    */
   Boolean isUpdateAllLoadedProperties();
 
-  /**
-   * Return true if generated properties ({@code @WhenCreated} etc.) are enabled for this 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>
@@ -293,11 +274,6 @@ public interface SpiTransaction extends Transaction {
    */
   void sendChangeLog(ChangeSet changeSet);
 
-  /**
-   * Return a document store transaction.
-   */
-  DocStoreTransaction docStoreTransaction();
-
   /**
    * Set the current Tenant Id.
    */