Change Delete by Id with @SoftDelete to performs soft delete rather than hard delete

Co-authored-by: robin.bygrave <robin.bygrave@eroad.com>

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11]
+        java_version: [21]
         os: [ubuntu-latest]
 
     steps:
@@ -40,5 +40,7 @@ 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 test -Pdefault
+      run: mvn -T 1C clean install -Pdefault
+    - name: Test SequencedSet and SequencedMap (requires installed MR-JAR)
+      run: cd tests/test-java16 && mvn test
 

.github/workflows/db2luw.yml

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

.github/workflows/h2database.yml

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

.github/workflows/mariadb.yml

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

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

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

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

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

.github/workflows/mysql.yml

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

.github/workflows/oracle.yml

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

.github/workflows/postgres.yml

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

.github/workflows/sqlserver-2019.yml

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

.github/workflows/sqlserver.yml

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

.github/workflows/yugabyte.yml

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

composites/ebean-clickhouse/pom.xml

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

composites/ebean-cockroach/pom.xml

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

composites/ebean-db2/pom.xml

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

composites/ebean-h2/pom.xml

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

composites/ebean-hana/pom.xml

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

composites/ebean-mariadb/pom.xml

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

composites/ebean-mysql/pom.xml

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

composites/ebean-net-postgis/pom.xml

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

composites/ebean-nuodb/pom.xml

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

composites/ebean-oracle/pom.xml

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

composites/ebean-pgvector/pom.xml

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

composites/ebean-postgis/pom.xml

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

composites/ebean-postgres/pom.xml

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

composites/ebean-sqlite/pom.xml

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

composites/ebean-sqlserver/pom.xml

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

composites/ebean-yugabyte/pom.xml

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

composites/ebean/pom.xml

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

composites/pom.xml

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

docs/LIBRARY.md

@@ -183,6 +183,8 @@ database.save(customer);
 | Configure database and `Database` bean | [add-ebean-postgres-database-config.md](guides/add-ebean-postgres-database-config.md) |
 | Add PostgreSQL test container support | [add-ebean-postgres-test-container.md](guides/add-ebean-postgres-test-container.md) |
 | Generate DB migrations | [add-ebean-db-migration-generation.md](guides/add-ebean-db-migration-generation.md) |
+| Migrate JSON APIs from Jackson core to avaje-json-core | [migrating-json-jackson-core-to-avaje-json-core.md](guides/migrating-json-jackson-core-to-avaje-json-core.md) |
+| Know which `@DbJson` types need Jackson vs built-in | [dbjson-mapping-support.md](guides/dbjson-mapping-support.md) |
 | Model entity beans correctly | [entity-bean-creation.md](guides/entity-bean-creation.md) |
 | Use Lombok safely with entities | [lombok-with-ebean-entity-beans.md](guides/lombok-with-ebean-entity-beans.md) |
 | Write type-safe query bean queries | [writing-ebean-query-beans.md](guides/writing-ebean-query-beans.md) |

docs/guides/AGENTS.md

@@ -12,7 +12,9 @@ Key guides (fetch and follow when performing the relevant task):
 - Maven POM setup: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/add-ebean-postgres-maven-pom.md
 - Database configuration: https://raw.githubusercontent.com/ebean-orm/ebean/HEAD/docs/guides/add-ebean-postgres-database-config.md
 - 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

@@ -23,6 +23,7 @@ existing Maven project. Complete the steps in order.
 | Guide | Description |
 |-------|-------------|
 | [Migrate to `Database.builder()`](migrating-to-database-builder.md) | Replace legacy `new DatabaseConfig()` and `DatabaseFactory.create(...)` code with `Database.builder()` and `DatabaseBuilder.build()`. Includes common rewrites, fluent builder equivalents, and manual-review cases for semi-automated upgrades |
+| [Migrate JSON APIs from Jackson core to avaje-json-core](migrating-json-jackson-core-to-avaje-json-core.md) | Cut over `JsonParser`/`JsonGenerator`/`JsonFactory` usage to `JsonReader`/`JsonWriter`/`JsonStream`, including `DatabaseBuilder`/`DatabaseConfig` JSON config changes and validation checklist |
 
 ## Observability
 
@@ -38,6 +39,8 @@ 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
 
@@ -45,6 +48,7 @@ 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/dbjson-mapping-support.md

@@ -0,0 +1,116 @@
+# Guide: `@DbJson` / `@DbJsonB` mapping support — built-in vs Jackson ObjectMapper
+
+## Purpose
+
+Ebean can map `@DbJson` and `@DbJsonB` properties in two ways:
+
+- **Built-in** JSON support, backed by **avaje-json-core** — no extra dependency.
+- **Jackson `ObjectMapper`**, provided by the **`ebean-jackson-mapper`** module — used
+  for everything the built-in support does not handle.
+
+This guide lists exactly which property types are handled built-in and which require
+`ebean-jackson-mapper`.
+
+> If a property type is **not** handled built-in and `ebean-jackson-mapper` is not on the
+> classpath, Ebean fails fast at startup:
+>
+> ```text
+> Unsupported @DbJson mapping - Missing dependency ebean-jackson-mapper?
+> Jackson ObjectMapper not present for <property>
+> ```
+
+---
+
+## Quick reference
+
+| Property type | Built-in (avaje-json-core) | Needs `ebean-jackson-mapper` |
+|---|:---:|:---:|
+| `String` | ✅ | |
+| `List<String>`, `List<Long>` | ✅ | |
+| `Set<String>`, `Set<Long>` | ✅ | |
+| `Map<String, Object>`, `Map<String, ?>` | ✅ | |
+| `Map<String, String>` | ✅ | |
+| `Map<Enum, Object>`, `Map<Enum, String>` | ✅ | |
+| `List`/`Set` of any other element type (`Integer`, `Double`, `UUID`, `LocalDate`, an enum, a POJO, …) | | ✅ |
+| `Map` with a typed value other than `String`/`Object` (`Map<String,Integer>`, `Map<String,UUID>`, …) | | ✅ |
+| `Map` with a key other than `String` or an enum (`Map<Integer, …>`, `Map<UUID, …>`) | | ✅ |
+| POJOs, records, or any other type | | ✅ |
+
+---
+
+## Built-in support (no Jackson required)
+
+The built-in path materialises JSON into the *natural* JSON value types
+(`String`, `Long`, `BigDecimal`, `Boolean`, `Map`, `List`). It is therefore type-safe only
+for the following declared property types:
+
+- **`String`** — stored as raw JSON text.
+- **`List<String>`** and **`List<Long>`**.
+- **`Set<String>`** and **`Set<Long>`**.
+- **`Map<K, V>`** where:
+  - the key `K` is `String` or an **enum**, and
+  - the value `V` is `Object`, `String`, or a wildcard `?`.
+
+  So `Map<String,Object>`, `Map<String,String>`, `Map<Enum,Object>` and `Map<Enum,String>`
+  are all built-in.
+
+These mappings work across all supported storage types — `VARCHAR`, `CLOB`, `BLOB`, and
+Postgres `json` / `jsonb` — without `ebean-jackson-mapper`.
+
+---
+
+## Everything else → Jackson `ObjectMapper`
+
+Any other `@DbJson` / `@DbJsonB` property routes to the Jackson `ObjectMapper` path, which
+requires `ebean-jackson-mapper`:
+
+- **Typed collections** — `List`/`Set` whose element type is not `String` or `Long`
+  (for example `List<Integer>`, `List<UUID>`, `List<LocalDate>`, `List<MyEnum>`, `List<MyPojo>`).
+- **Typed-value maps** — a `Map` value type other than `String`/`Object`
+  (for example `Map<String,Integer>`, `Map<String,UUID>`, `Map<String,MyPojo>`).
+- **Non-`String`/non-enum map keys** — for example `Map<Integer,Object>`, `Map<UUID,String>`.
+- **POJOs, records, and any other custom type.**
+
+> **Jackson marker annotation override:** if the **field or getter** carries a Jackson annotation
+> (anything meta-annotated with `com.fasterxml.jackson.annotation.JacksonAnnotation`), Ebean
+> uses the `ObjectMapper` path even when the type would otherwise be handled built-in.
+
+---
+
+## Adding `ebean-jackson-mapper`
+
+```xml
+<dependency>
+  <groupId>io.ebean</groupId>
+  <artifactId>ebean-jackson-mapper</artifactId>
+  <version>${ebean.version}</version>
+</dependency>
+```
+
+A Jackson `ObjectMapper` must be available (via `jackson-databind`). Ebean detects it and
+registers the mapper-based JSON support automatically.
+
+---
+
+## Notes
+
+- **Enum map keys** are serialised using the enum `name()` (for example `ACTIVE`), not any
+  `@DbEnumValue` mapping. Round-trips are correct; the DB value mapping is not applied to
+  JSON keys.
+- **`@DbArray` alternative:** for typed *scalar* collections (`List`/`Set` of `Integer`,
+  `Long`, `UUID`, `Double`, an enum, …) consider `@DbArray`, which maps to a native DB array
+  (with a JSON fallback on platforms without array support) and supports more element types
+  than built-in `@DbJson` collections.
+- The reason typed value/element collections need a real mapper is that the built-in path
+  only produces natural JSON types — for example a JSON number always parses to `Long`, so a
+  declared `List<Integer>` or `Map<String,Integer>` could not be populated safely without a
+  type-aware mapper.
+
+---
+
+## Choosing
+
+- Prefer the **built-in** mappings for the common cases (`String`, string/long lists and sets,
+  object/string maps) to avoid pulling in Jackson.
+- Add **`ebean-jackson-mapper`** when you need rich POJO JSON columns or typed collections /
+  typed-value maps.

docs/guides/derived-formula-properties.md

@@ -0,0 +1,164 @@
+# 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/migrating-json-jackson-core-to-avaje-json-core.md

@@ -0,0 +1,91 @@
+# Guide: Migrate JSON APIs from Jackson core to avaje-json-core
+
+## Purpose
+
+This guide covers the one-step cutover in Ebean from Jackson core JSON APIs to
+avaje-json-core APIs.
+
+Use this when upgrading code that references:
+
+- `com.fasterxml.jackson.core.JsonParser`
+- `com.fasterxml.jackson.core.JsonGenerator`
+- `com.fasterxml.jackson.core.JsonFactory`
+
+The replacement types are:
+
+- `io.avaje.json.JsonReader`
+- `io.avaje.json.JsonWriter`
+- `io.avaje.json.stream.JsonStream`
+
+---
+
+## Breaking API changes
+
+| Previous API | New API |
+|---|---|
+| `JsonParser` | `JsonReader` |
+| `JsonGenerator` | `JsonWriter` |
+| `JsonFactory` | `JsonStream` |
+| `DatabaseBuilder.jsonFactory(...)` | `DatabaseBuilder.jsonStream(...)` |
+| `DatabaseConfig.getJsonFactory()/setJsonFactory(...)` | `DatabaseConfig.getJsonStream()/setJsonStream(...)` |
+
+---
+
+## Typical migration rewrites
+
+### Parser and generator signatures
+
+```java
+// before
+void read(JsonParser parser)
+void write(JsonGenerator generator)
+
+// after
+void read(JsonReader parser)
+void write(JsonWriter generator)
+```
+
+### Database configuration
+
+```java
+// before
+Database.builder().jsonFactory(factory)
+
+// after
+Database.builder().jsonStream(stream)
+```
+
+### JSON utility calls
+
+`EJson` and `JsonContext` APIs now operate on `JsonReader` and `JsonWriter` types.
+If your code was calling those APIs with Jackson core types, switch to avaje types.
+
+---
+
+## Dependency and module notes
+
+- `ebean-core` no longer requires a direct `jackson-core` dependency for JSON
+  parsing/writing.
+- `jackson-databind` remains optional for `ObjectMapper` compatibility paths.
+- `ebean-jackson-mapper` remains the compatibility bridge module for mapper-based
+  integrations.
+
+---
+
+## Behavior notes to verify during upgrade
+
+1. Parser token handling is now based on avaje `JsonReader.Token`.
+2. Scalar JSON reads (for example booleans, date-time, array scalar types) should
+   be validated in your tests if you previously depended on Jackson token quirks.
+3. If your integration uses transient assoc-many JSON mapping with ObjectMapper,
+   keep ObjectMapper wiring enabled.
+
+---
+
+## Validation checklist
+
+1. Compile all modules that implement or consume `io.ebean.text.json` APIs.
+2. Run module tests that cover JSON scalar conversion and bean JSON round-trips.
+3. Confirm no remaining `com.fasterxml.jackson.core.*` imports in migrated code.
+4. Keep `ObjectMapper` compatibility tests if your project depends on mapper paths.
+

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

@@ -0,0 +1,464 @@
+# 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,6 +483,30 @@ 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
@@ -570,4 +594,5 @@ 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>16.11.1</version>
+    <version>18.2.0</version>
   </parent>
 
   <name>ebean api</name>
@@ -70,15 +70,13 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- Jackson core used internally by Ebean -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-json-core</artifactId>
+      <version>${avaje-json-core.version}</version>
     </dependency>
 
-    <!-- provided scope for JsonNode support -->
+    <!-- Jackson databind remains for ObjectMapper compatibility paths -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -105,6 +103,53 @@
         </excludes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>11</release>
+            </configuration>
+          </execution>
+          <execution>
+            <id>compile-21</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>21</release>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
+              </compileSourceRoots>
+              <multiReleaseOutput>true</multiReleaseOutput>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
+<!--          <manifest>-->
+<!--            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
+<!--          </manifest>-->
+
+      </plugin>
+    </plugins>
   </build>
 
 </project>

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import io.avaje.json.stream.JsonStream;
 import io.ebean.annotation.*;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.*;
@@ -61,6 +61,10 @@ 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();
 
@@ -360,18 +364,18 @@ public interface DatabaseBuilder {
   DatabaseBuilder putServiceObject(Object configObject);
 
   /**
-   * Set the Jackson JsonFactory to use.
+   * Set the JsonStream to use.
    * <p>
    * If not set a default implementation will be used.
    */
-  default DatabaseBuilder jsonFactory(JsonFactory jsonFactory) {
-    return setJsonFactory(jsonFactory);
+  default DatabaseBuilder jsonStream(JsonStream jsonStream) {
+    return setJsonStream(jsonStream);
   }
 
   /**
-   * @deprecated migrate to {@link #jsonFactory(JsonFactory)}.
+   * @deprecated migrate to {@link #jsonStream(JsonStream)}.
    */
-  DatabaseBuilder setJsonFactory(JsonFactory jsonFactory);
+  DatabaseBuilder setJsonStream(JsonStream jsonStream);
 
   /**
    * Set the JSON format to use for DateTime types.
@@ -883,6 +887,13 @@ 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.
    */
@@ -2254,11 +2265,11 @@ public interface DatabaseBuilder {
     boolean isAutoLoadModuleInfo();
 
     /**
-     * Return the Jackson JsonFactory to use.
+     * Return the JsonStream to use.
      * <p>
      * If not set a default implementation will be used.
      */
-    JsonFactory getJsonFactory();
+    JsonStream getJsonStream();
 
     /**
      * Get the clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.
@@ -2563,6 +2574,11 @@ public interface DatabaseBuilder {
      */
     boolean isAutoPersistUpdates();
 
+    /**
+     * Return true if caches are partitioned by tenant.
+     */
+    boolean isTenantPartitionedCache();
+
     /**
      * Return the L2 cache default max size.
      */

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

@@ -7,6 +7,8 @@ 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>
@@ -71,18 +73,28 @@ public final class DatabaseFactory {
     lock.lock();
     try {
       var config = builder.settings();
-      if (config.getName() == null) {
+      var name = config.getName();
+      if (name == 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(config.getName())) {
-            throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
+          if (defaultServerName != null && !defaultServerName.equals(name)) {
+            throw new IllegalStateException("Registering [" + name + "] as the default server but [" + defaultServerName + "] is already registered as the default");
           }
-          defaultServerName = config.getName();
+          defaultServerName = name;
         }
-        DbPrimary.setSkip(true);
         DbContext.getInstance().register(server, config.isDefaultServer());
       }
       return server;

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

@@ -4,6 +4,8 @@ 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;
@@ -75,6 +77,11 @@ 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/ExpressionList.java

@@ -205,6 +205,22 @@ 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.
    *

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

@@ -607,6 +607,21 @@ 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,6 +41,49 @@ 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

@@ -260,6 +260,27 @@ 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 false;
+    return true;
   }
 
   @Override

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

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

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

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

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

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

@@ -60,7 +60,8 @@ public class ClassLoadConfig {
   }
 
   public boolean isJacksonCorePresent() {
-    return isPresent("com.fasterxml.jackson.core.JsonParser");
+    // Legacy method name retained for compatibility; now checks avaje JSON core.
+    return isPresent("io.avaje.json.JsonReader");
   }
 
   /**
@@ -158,4 +159,3 @@ public class ClassLoadConfig {
     }
   }
 }
-

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

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import io.avaje.config.Config;
+import io.avaje.json.stream.JsonStream;
 import io.ebean.*;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
@@ -420,7 +420,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    * The default PersistenceContextScope used if one is not explicitly set on a query.
    */
   private PersistenceContextScope persistenceContextScope = PersistenceContextScope.TRANSACTION;
-  private JsonFactory jsonFactory;
+  private JsonStream jsonStream;
   private boolean localTimeWithNanos;
   private boolean durationWithNanos;
   private int maxCallStack = 5;
@@ -432,6 +432,8 @@ 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;
@@ -631,13 +633,13 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   }
 
   @Override
-  public JsonFactory getJsonFactory() {
-    return jsonFactory;
+  public JsonStream getJsonStream() {
+    return jsonStream;
   }
 
   @Override
-  public DatabaseConfig setJsonFactory(JsonFactory jsonFactory) {
-    this.jsonFactory = jsonFactory;
+  public DatabaseConfig setJsonStream(JsonStream jsonStream) {
+    this.jsonStream = jsonStream;
     return this;
   }
 
@@ -1175,6 +1177,17 @@ 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;
@@ -2228,6 +2241,15 @@ 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/dbplatform/SequenceIdGenerator.java

@@ -11,10 +11,12 @@ 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.NavigableSet;
-import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -23,18 +25,36 @@ 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");
 
-  private final ReentrantLock lock = new ReentrantLock();
+  /**
+   * Buffer key used when there is no current tenant (single-tenant or no tenant in scope).
+   */
+  private static final Object SINGLE = new Object();
+
   protected final String seqName;
   protected final DataSource dataSource;
   protected final BackgroundExecutor backgroundExecutor;
-  protected final NavigableSet<Long> idList = new TreeSet<>();
   protected final int allocationSize;
-  protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
+  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);
+  }
 
   /**
    * Construct given a dataSource and sql to return the next sequence value.
@@ -44,6 +64,7 @@ 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);
@@ -64,6 +85,24 @@ 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>
@@ -78,23 +117,22 @@ 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) {
-    lock.lock();
+    Object tenantKey = currentTenantKey();
+    TenantBuffer buffer = buffer(tenantKey);
+    buffer.lock.lock();
     try {
-      int size = idList.size();
+      int size = buffer.idList.size();
       if (size > 0) {
         maybeLoadMoreInBackground(size);
       } else {
-        loadMore(allocationSize);
+        loadMore(tenantKey, buffer, allocationSize);
       }
-      return idList.pollFirst();
+      return buffer.idList.poll();
     } finally {
-      lock.unlock();
+      buffer.lock.unlock();
     }
   }
 
@@ -106,29 +144,36 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     }
   }
 
-  private void loadMore(int requestSize) {
-    List<Long> newIds = getMoreIds(requestSize);
-    lock.lock();
+  private void loadMore(Object tenantKey, TenantBuffer buffer, int requestSize) {
+    List<Long> newIds = getMoreIds(tenantKey, requestSize);
+    buffer.lock.lock();
     try {
-      idList.addAll(newIds);
+      buffer.idList.addAll(newIds);
     } finally {
-      lock.unlock();
+      buffer.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) {
-    if (currentlyBackgroundLoading.get()) {
+    final Object tenantKey = currentTenantKey();
+    final TenantBuffer buffer = buffer(tenantKey);
+    if (!buffer.currentlyBackgroundLoading.compareAndSet(false, true)) {
       // skip as already background loading
       log.log(DEBUG, "... skip background sequence load (another load in progress)");
       return;
     }
-    currentlyBackgroundLoading.set(true);
     backgroundExecutor.execute(() -> {
-      loadMore(requestSize);
-      currentlyBackgroundLoading.set(false);
+      try {
+        loadMore(tenantKey, buffer, requestSize);
+      } finally {
+        buffer.currentlyBackgroundLoading.set(false);
+      }
     });
   }
 
@@ -140,7 +185,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(int requestSize) {
+  protected List<Long> getMoreIds(Object tenantKey, int requestSize) {
 
     String sql = getSql(requestSize);
 
@@ -148,7 +193,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     PreparedStatement statement = null;
     ResultSet resultSet = null;
     try {
-      connection = dataSource.getConnection();
+      connection = connectionFor(tenantKey);
 
       statement = connection.prepareStatement(sql);
       resultSet = statement.executeQuery();
@@ -174,6 +219,17 @@ 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

@@ -0,0 +1,29 @@
+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/meta/MetaQueryPlan.java

@@ -44,6 +44,11 @@ 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/service/SpiJsonService.java

@@ -1,8 +1,8 @@
 package io.ebean.service;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
+import io.avaje.json.JsonWriter;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -32,12 +32,12 @@ public interface SpiJsonService extends BootstrapService {
   /**
    * Write the nested Map/List as json to the jsonGenerator.
    */
-  void write(Object object, JsonGenerator jsonGenerator) throws IOException;
+  void write(Object object, JsonWriter jsonGenerator) throws IOException;
 
   /**
    * Write the collection as json array to the jsonGenerator.
    */
-  void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException;
+  void writeCollection(Collection<Object> collection, JsonWriter jsonGenerator) throws IOException;
 
   /**
    * Parse the json and return as a Map additionally specifying if the returned map should
@@ -61,17 +61,17 @@ public interface SpiJsonService extends BootstrapService {
   Map<String, Object> parseObject(Reader reader) throws IOException;
 
   /**
-   * Parse the json and return as a Map taking a JsonParser.
+   * Parse the json and return as a Map taking a JsonReader.
    */
-  Map<String, Object> parseObject(JsonParser parser) throws IOException;
+  Map<String, Object> parseObject(JsonReader parser) throws IOException;
 
   /**
-   * Parse the json and return as a Map taking a JsonParser and a starting token.
+   * Parse the json and return as a Map taking a JsonReader and a starting token.
    * <p>
    * Used when the first token is checked to see if the value is null prior to calling this.
    * </p>
    */
-  Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException;
+  Map<String, Object> parseObject(JsonReader parser, Token token) throws IOException;
 
   /**
    * Parse the json and return as a modify aware List.
@@ -89,14 +89,14 @@ public interface SpiJsonService extends BootstrapService {
   List<Object> parseList(Reader reader) throws IOException;
 
   /**
-   * Parse the json and return as a List taking a JsonParser.
+   * Parse the json and return as a List taking a JsonReader.
    */
-  List<Object> parseList(JsonParser parser) throws IOException;
+  List<Object> parseList(JsonReader parser) throws IOException;
 
   /**
    * Parse the json returning as a List taking into account the current token.
    */
-  <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException;
+  <T> List<T> parseList(JsonReader parser, Token currentToken) throws IOException;
 
   /**
    * Parse the json and return as a List or Map.
@@ -111,7 +111,7 @@ public interface SpiJsonService extends BootstrapService {
   /**
    * Parse the json and return as a List or Map.
    */
-  Object parse(JsonParser parser) throws IOException;
+  Object parse(JsonReader parser) throws IOException;
 
   /**
    * Parse the json returning a Set that might be modify aware.
@@ -121,5 +121,5 @@ public interface SpiJsonService extends BootstrapService {
   /**
    * Parse the json returning as a Set taking into account the current token.
    */
-  <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException;
+  <T> Set<T> parseSet(JsonReader parser, Token currentToken) throws IOException;
 }

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

@@ -27,6 +27,13 @@ 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/io/ebean/text/json/EJson.java

@@ -1,8 +1,7 @@
 package io.ebean.text.json;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
 import io.ebean.XBootstrapService;
 import io.ebean.service.SpiJsonService;
 
@@ -38,14 +37,14 @@ public class EJson {
   /**
    * Write the nested Map/List as json to the jsonGenerator.
    */
-  public static void write(Object object, JsonGenerator jsonGenerator) throws IOException {
+  public static void write(Object object, io.avaje.json.JsonWriter jsonGenerator) throws IOException {
     plugin.write(object, jsonGenerator);
   }
 
   /**
    * Write the collection as json array to the jsonGenerator.
    */
-  public static void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException {
+  public static void writeCollection(Collection<Object> collection, io.avaje.json.JsonWriter jsonGenerator) throws IOException {
     plugin.writeCollection(collection, jsonGenerator);
   }
 
@@ -79,19 +78,19 @@ public class EJson {
   }
 
   /**
-   * Parse the json and return as a Map taking a JsonParser.
+   * Parse the json and return as a Map taking a JsonReader.
    */
-  public static Map<String, Object> parseObject(JsonParser parser) throws IOException {
+  public static Map<String, Object> parseObject(JsonReader parser) throws IOException {
     return plugin.parseObject(parser);
   }
 
   /**
-   * Parse the json and return as a Map taking a JsonParser and a starting token.
+   * Parse the json and return as a Map taking a JsonReader and a starting token.
    * <p>
    * Used when the first token is checked to see if the value is null prior to calling this.
    * </p>
    */
-  public static Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
+  public static Map<String, Object> parseObject(JsonReader parser, Token token) throws IOException {
     return plugin.parseObject(parser, token);
   }
 
@@ -117,16 +116,16 @@ public class EJson {
   }
 
   /**
-   * Parse the json and return as a List taking a JsonParser.
+   * Parse the json and return as a List taking a JsonReader.
    */
-  public static List<Object> parseList(JsonParser parser) throws IOException {
+  public static List<Object> parseList(JsonReader parser) throws IOException {
     return plugin.parseList(parser);
   }
 
   /**
    * Parse the json returning as a List taking into account the current token.
    */
-  public static <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
+  public static <T> List<T> parseList(JsonReader parser, Token currentToken) throws IOException {
     return plugin.parseList(parser, currentToken);
   }
 
@@ -147,7 +146,7 @@ public class EJson {
   /**
    * Parse the json and return as a List or Map.
    */
-  public static Object parse(JsonParser parser) throws IOException {
+  public static Object parse(JsonReader parser) throws IOException {
     return plugin.parse(parser);
   }
 
@@ -161,7 +160,7 @@ public class EJson {
   /**
    * Parse the json returning as a Set taking into account the current token.
    */
-  public static <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException {
+  public static <T> Set<T> parseSet(JsonReader parser, Token currentToken) throws IOException {
     return plugin.parseSet(parser, currentToken);
   }
 }

ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java

@@ -1,6 +1,6 @@
 package io.ebean.text.json;
 
-import com.fasterxml.jackson.core.JsonParser;
+import io.avaje.json.JsonReader;
 import io.ebean.bean.PersistenceContext;
 
 /**
@@ -25,9 +25,9 @@ public interface JsonBeanReader<T> {
   }
   
   /**
-   * Create a new reader taking the context from the existing one but using a new JsonParser.
+   * Create a new reader taking the context from the existing one but using a new JsonReader.
    */
-  JsonBeanReader<T> forJson(JsonParser moreJson);
+  JsonBeanReader<T> forJson(JsonReader moreJson);
 
   /**
    * Add a bean explicitly to the persistence context.

ebean-api/src/main/java/io/ebean/text/json/JsonContext.java

@@ -1,7 +1,6 @@
 package io.ebean.text.json;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
+import io.avaje.json.JsonReader;
 import io.ebean.FetchPath;
 import io.ebean.plugin.BeanType;
 
@@ -49,14 +48,14 @@ public interface JsonContext {
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> T toBean(Class<T> cls, JsonParser parser) throws JsonIOException;
+  <T> T toBean(Class<T> cls, JsonReader parser) throws JsonIOException;
 
   /**
    * Convert json parser input into a Bean of a specific type additionally using JsonReadOptions..
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> T toBean(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException;
+  <T> T toBean(Class<T> cls, JsonReader parser, JsonReadOptions options) throws JsonIOException;
 
   /**
    * Read json parser input into a given Bean. <br>
@@ -65,19 +64,19 @@ public interface JsonContext {
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> void toBean(T target, JsonParser parser) throws JsonIOException;
+  <T> void toBean(T target, JsonReader parser) throws JsonIOException;
 
   /**
    * Read json parser input into a given Bean additionally using JsonReadOptions.<br>
-   * See {@link #toBean(Class, JsonParser)} for details modified.
+   * See {@link #toBean(Class, JsonReader)} for details modified.
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException;
+  <T> void toBean(T target, JsonReader parser, JsonReadOptions options) throws JsonIOException;
 
   /**
    * Read json reader input into a given Bean.<br>
-   * See {@link #toBean(Class, JsonParser)} for details
+   * See {@link #toBean(Class, JsonReader)} for details
    *
    * @throws JsonIOException When IOException occurs
    */
@@ -85,7 +84,7 @@ public interface JsonContext {
 
   /**
    * Read json reader input into a given Bean additionally using JsonReadOptions.<br>
-   * See {@link #toBean(Class, JsonParser)} for details modified.
+   * See {@link #toBean(Class, JsonReader)} for details modified.
    *
    * @throws JsonIOException When IOException occurs
    */
@@ -93,7 +92,7 @@ public interface JsonContext {
 
   /**
    * Read json string input into a given Bean.<br>
-   * See {@link #toBean(Class, JsonParser)} for details
+   * See {@link #toBean(Class, JsonReader)} for details
    *
    * @throws JsonIOException When IOException occurs
    */
@@ -101,7 +100,7 @@ public interface JsonContext {
 
   /**
    * Read json string input into a given Bean additionally using JsonReadOptions.<br>
-   * See {@link #toBean(Class, JsonParser)} for details
+   * See {@link #toBean(Class, JsonReader)} for details
    *
    * @throws JsonIOException When IOException occurs
    */
@@ -113,7 +112,7 @@ public interface JsonContext {
    * Note that JsonOption provides an option for setting a persistence context and also enabling further lazy loading. Further lazy
    * loading requires a persistence context so if that is set on then a persistence context is created if there is not one set.
    */
-  <T> JsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException;
+  <T> JsonBeanReader<T> createBeanReader(Class<T> cls, JsonReader parser, JsonReadOptions options) throws JsonIOException;
 
   /**
    * Create and return a new bean reading for the bean type given the JSON options and source.
@@ -122,7 +121,7 @@ public interface JsonContext {
    * further lazy loading. Further lazy loading requires a persistence context so if that is set
    * on then a persistence context is created if there is not one set.
    */
-  <T> JsonBeanReader<T> createBeanReader(BeanType<T> beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException;
+  <T> JsonBeanReader<T> createBeanReader(BeanType<T> beanType, JsonReader parser, JsonReadOptions options) throws JsonIOException;
 
   /**
    * Convert json string input into a list of beans of a specific type.
@@ -157,14 +156,14 @@ public interface JsonContext {
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> List<T> toList(Class<T> cls, JsonParser json) throws JsonIOException;
+  <T> List<T> toList(Class<T> cls, JsonReader json) throws JsonIOException;
 
   /**
    * Convert json parser input into a list of beans of a specific type additionally using JsonReadOptions.
    *
    * @throws JsonIOException When IOException occurs
    */
-  <T> List<T> toList(Class<T> cls, JsonParser json, JsonReadOptions options) throws JsonIOException;
+  <T> List<T> toList(Class<T> cls, JsonReader json, JsonReadOptions options) throws JsonIOException;
 
   /**
    * Use the genericType to determine if this should be converted into a List or
@@ -188,7 +187,7 @@ public interface JsonContext {
    *
    * @throws JsonIOException When IOException occurs
    */
-  Object toObject(Type genericType, JsonParser jsonParser) throws JsonIOException;
+  Object toObject(Type genericType, JsonReader jsonParser) throws JsonIOException;
 
   /**
    * Return the bean or collection as JSON string.
@@ -212,11 +211,11 @@ public interface JsonContext {
   void toJson(Object value, Writer writer) throws JsonIOException;
 
   /**
-   * Write the bean or collection to the JsonGenerator.
+   * Write the bean or collection to the JsonWriter.
    *
    * @throws JsonIOException When IOException occurs
    */
-  void toJson(Object value, JsonGenerator generator) throws JsonIOException;
+  void toJson(Object value, io.avaje.json.JsonWriter generator) throws JsonIOException;
 
   /**
    * Return the bean or collection as JSON string using FetchPath.
@@ -231,15 +230,15 @@ public interface JsonContext {
   void toJson(Object value, Writer writer, FetchPath fetchPath) throws JsonIOException;
 
   /**
-   * Write the bean or collection to the JsonGenerator using the FetchPath.
+   * Write the bean or collection to the JsonWriter using the FetchPath.
    */
-  void toJson(Object value, JsonGenerator generator, FetchPath fetchPath) throws JsonIOException;
+  void toJson(Object value, io.avaje.json.JsonWriter generator, FetchPath fetchPath) throws JsonIOException;
 
   /**
    * Deprecated in favour of using PathProperties by itself.
-   * Write json to the JsonGenerator using the JsonWriteOptions.
+   * Write json to the JsonWriter using the JsonWriteOptions.
    */
-  void toJson(Object value, JsonGenerator generator, JsonWriteOptions options) throws JsonIOException;
+  void toJson(Object value, io.avaje.json.JsonWriter generator, JsonWriteOptions options) throws JsonIOException;
 
   /**
    * Deprecated in favour of using PathProperties by itself.
@@ -264,27 +263,27 @@ public interface JsonContext {
   boolean isSupportedType(Type genericType);
 
   /**
-   * Create and return a new JsonGenerator for the given writer.
+   * Create and return a new JsonWriter for the given writer.
    *
    * @throws JsonIOException When IOException occurs
    */
-  JsonGenerator createGenerator(Writer writer) throws JsonIOException;
+  io.avaje.json.JsonWriter createGenerator(Writer writer) throws JsonIOException;
 
   /**
-   * Create and return a new JsonParser for the given reader.
+   * Create and return a new JsonReader for the given reader.
    *
    * @throws JsonIOException When IOException occurs
    */
-  JsonParser createParser(Reader reader) throws JsonIOException;
+  JsonReader createParser(Reader reader) throws JsonIOException;
 
   /**
-   * Write a scalar types known to Ebean to Jackson.
+   * Write scalar types known to Ebean to JsonWriter.
    * <p>
    * Ebean has built in support for java8 and Joda types as well as the other
    * standard JDK types like URI, URL, UUID etc. This is a fast simple way to
-   * write any of those types to Jackson.
+   * write any of those types.
    * </p>
    */
-  void writeScalar(JsonGenerator generator, Object scalarValue) throws IOException;
+  void writeScalar(io.avaje.json.JsonWriter generator, Object scalarValue) throws IOException;
 
 }

ebean-api/src/main/java/io/ebean/text/json/JsonWriter.java

@@ -1,19 +1,17 @@
 package io.ebean.text.json;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-
 import java.io.InputStream;
 import java.math.BigDecimal;
 
 /**
- * Wraps an underlying JsonGenerator taking into account null suppression and exposing isIncludeEmpty() etc.
+ * Wraps an underlying JsonWriter taking into account null suppression and exposing isIncludeEmpty() etc.
  */
 public interface JsonWriter {
 
   /**
-   * Return the Jackson core JsonGenerator.
+   * Return the underlying JsonWriter.
    */
-  JsonGenerator gen();
+  io.avaje.json.JsonWriter gen();
 
   /**
    * Return true if null values should be included in JSON output.

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

@@ -8,6 +8,7 @@ module io.ebean.api {
 
   requires transitive java.sql;
   requires transitive io.avaje.config;
+  requires transitive io.avaje.json;
   requires transitive org.jspecify;
   requires transitive jakarta.persistence.api;
   requires transitive io.ebean.annotation;
@@ -16,7 +17,6 @@ module io.ebean.api {
 
   requires static org.slf4j;
   requires static io.ebean.types;
-  requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
 
   exports io.ebean;

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

@@ -0,0 +1,432 @@
+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

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

ebean-bench/pom.xml

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

ebean-core-json/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-parent</artifactId>
-    <version>16.11.1</version>
+    <version>18.2.0</version>
   </parent>
   <artifactId>ebean-core-json</artifactId>
   <name>ebean-core-json</name>
@@ -16,15 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
     </dependency>
 
-    <!-- Jackson core used internally by Ebean -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-json-core</artifactId>
+      <version>${avaje-json-core.version}</version>
     </dependency>
 
   </dependencies>

ebean-core-json/src/main/java/io/ebeaninternal/json/DJsonService.java

@@ -1,190 +1,170 @@
 package io.ebeaninternal.json;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
+import io.avaje.json.JsonWriter;
+import io.avaje.json.mapper.JsonMapper;
+import io.avaje.json.stream.JsonStream;
 import io.ebean.service.SpiJsonService;
 
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.io.Writer;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Utility that converts between JSON content and simple java Maps/Lists.
+ * <p>
+ * Backed by avaje {@link JsonMapper} using {@link EbeanJsonAdapter} which
+ * preserves Ebean's modify-aware collection and number semantics.
  */
 public final class DJsonService implements SpiJsonService {
 
-  /**
-   * Write the nested Map/List as json.
-   */
+  private static final JsonStream JSON_STREAM = JsonStream.builder().build();
+  private static final JsonMapper MAPPER = JsonMapper.builder().jsonStream(JSON_STREAM).build();
+
+  private static final JsonMapper.Type<Object> PLAIN = MAPPER.type(EbeanJsonAdapter.PLAIN);
+  private static final JsonMapper.Type<Object> MODIFY_AWARE = MAPPER.type(EbeanJsonAdapter.MODIFY_AWARE);
+
+  private static JsonMapper.Type<Object> type(boolean modifyAware) {
+    return modifyAware ? MODIFY_AWARE : PLAIN;
+  }
+
+  private static boolean blank(String content) {
+    return content == null || content.trim().isEmpty();
+  }
+
+  private static String readAll(Reader reader) throws IOException {
+    StringBuilder builder = new StringBuilder();
+    char[] buffer = new char[2048];
+    int len;
+    while ((len = reader.read(buffer)) != -1) {
+      builder.append(buffer, 0, len);
+    }
+    return builder.toString();
+  }
+
   @Override
   public String write(Object object) throws IOException {
-    return EJsonWriter.write(object);
+    StringWriter writer = new StringWriter();
+    write(object, writer);
+    return writer.toString();
   }
 
-  /**
-   * Write the nested Map/List as json to the writer.
-   */
   @Override
   public void write(Object object, Writer writer) throws IOException {
-    EJsonWriter.write(object, writer);
+    JsonWriter jsonWriter = JSON_STREAM.writer(writer);
+    jsonWriter.serializeNulls(true);
+    PLAIN.toJson(object, jsonWriter);
+    jsonWriter.flush();
   }
 
-  /**
-   * Write the nested Map/List as json to the jsonGenerator.
-   */
   @Override
-  public void write(Object object, JsonGenerator jsonGenerator) throws IOException {
-    EJsonWriter.write(object, jsonGenerator);
+  public void write(Object object, JsonWriter jsonWriter) throws IOException {
+    PLAIN.toJson(object, jsonWriter);
   }
 
-  /**
-   * Write the collection as json array to the jsonGenerator.
-   */
   @Override
-  public void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException {
-    EJsonWriter.writeCollection(collection, jsonGenerator);
+  public void writeCollection(Collection<Object> collection, JsonWriter jsonWriter) throws IOException {
+    EbeanJsonAdapter.writeCollection(jsonWriter, collection);
   }
 
-  /**
-   * Parse the json and return as a Map additionally specifying if the returned map should be modify
-   * aware meaning that it can detect when it has been modified.
-   */
-  @Override
-  public Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
-    return EJsonReader.parseObject(json, modifyAware);
-  }
-
-  /**
-   * Parse the json and return as a Map.
-   */
-  @Override
-  public Map<String, Object> parseObject(String json) throws IOException {
-    return EJsonReader.parseObject(json);
-  }
-
-  /**
-   * Parse the json and return as a Map taking a reader.
-   */
-  @Override
-  public Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException {
-    return EJsonReader.parseObject(reader, modifyAware);
-  }
-
-  /**
-   * Parse the json and return as a Map taking a reader.
-   */
-  @Override
-  public Map<String, Object> parseObject(Reader reader) throws IOException {
-    return EJsonReader.parseObject(reader);
-  }
-
-  /**
-   * Parse the json and return as a Map taking a JsonParser.
-   */
-  @Override
-  public Map<String, Object> parseObject(JsonParser parser) throws IOException {
-    return EJsonReader.parseObject(parser);
-  }
-
-  /**
-   * Parse the json and return as a Map taking a JsonParser and a starting token.
-   *
-   * <p>Used when the first token is checked to see if the value is null prior to calling this.
-   */
-  @Override
-  public Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
-    return EJsonReader.parseObject(parser, token);
-  }
-
-  /**
-   * Parse the json and return as a modify aware List.
-   */
-  @Override
-  public <T> List<T> parseList(String json, boolean modifyAware) throws IOException {
-    return EJsonReader.parseList(json, modifyAware);
-  }
-
-  /**
-   * Parse the json and return as a List.
-   */
-  @Override
-  public List<Object> parseList(String json) throws IOException {
-    return EJsonReader.parseList(json);
-  }
-
-  /**
-   * Parse the json and return as a List taking a Reader.
-   */
-  @Override
-  public List<Object> parseList(Reader reader) throws IOException {
-    return EJsonReader.parseList(reader);
-  }
-
-  /**
-   * Parse the json and return as a List taking a JsonParser.
-   */
-  @Override
-  public List<Object> parseList(JsonParser parser) throws IOException {
-    return EJsonReader.parseList(parser, false);
-  }
-
-  /**
-   * Parse the json returning as a List taking into account the current token.
-   */
   @Override
   @SuppressWarnings("unchecked")
-  public <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
-    return (List<T>) EJsonReader.parse(parser, currentToken, false);
+  public Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
+    return blank(json) ? null : (Map<String, Object>) type(modifyAware).fromJson(json);
+  }
+
+  @Override
+  public Map<String, Object> parseObject(String json) throws IOException {
+    return parseObject(json, false);
+  }
+
+  @Override
+  public Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException {
+    return parseObject(readAll(reader), modifyAware);
+  }
+
+  @Override
+  public Map<String, Object> parseObject(Reader reader) throws IOException {
+    return parseObject(reader, false);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Map<String, Object> parseObject(JsonReader parser) throws IOException {
+    return (Map<String, Object>) PLAIN.fromJson(parser);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Map<String, Object> parseObject(JsonReader parser, Token token) throws IOException {
+    return (Map<String, Object>) EbeanJsonAdapter.read(parser, token, false);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public <T> List<T> parseList(String json, boolean modifyAware) throws IOException {
+    return blank(json) ? null : (List<T>) type(modifyAware).fromJson(json);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public List<Object> parseList(String json) throws IOException {
+    return (List<Object>) parseList(json, false);
+  }
+
+  @Override
+  public List<Object> parseList(Reader reader) throws IOException {
+    return parseList(readAll(reader));
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public List<Object> parseList(JsonReader parser) throws IOException {
+    return (List<Object>) PLAIN.fromJson(parser);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public <T> List<T> parseList(JsonReader parser, Token currentToken) throws IOException {
+    return (List<T>) EbeanJsonAdapter.read(parser, currentToken, false);
   }
 
-  /**
-   * Parse the json and return as a List or Map.
-   */
   @Override
   public Object parse(String json) throws IOException {
-    return EJsonReader.parse(json);
+    return blank(json) ? null : PLAIN.fromJson(json);
   }
 
-  /**
-   * Parse the json and return as a List or Map.
-   */
   @Override
   public Object parse(Reader reader) throws IOException {
-    return EJsonReader.parse(reader);
+    return parse(readAll(reader));
   }
 
-  /**
-   * Parse the json and return as a List or Map.
-   */
   @Override
-  public Object parse(JsonParser parser) throws IOException {
-    return EJsonReader.parse(parser);
+  public Object parse(JsonReader parser) throws IOException {
+    return PLAIN.fromJson(parser);
   }
 
-  /**
-   * Parse the json returning a Set that might be modify aware.
-   */
   @Override
   public <T> Set<T> parseSet(String json, boolean modifyAware) throws IOException {
     List<T> list = parseList(json, modifyAware);
     if (list == null) {
       return null;
     }
-
     if (modifyAware) {
       return ((ModifyAwareList<T>) list).asSet();
-    } else {
-      return new LinkedHashSet<>(list);
     }
+    return new LinkedHashSet<>(list);
   }
 
-  /**
-   * Parse the json returning as a Set taking into account the current token.
-   */
   @Override
-  public <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException {
+  public <T> Set<T> parseSet(JsonReader parser, Token currentToken) throws IOException {
     return new LinkedHashSet<>(parseList(parser, currentToken));
   }
 }

ebean-core-json/src/main/java/io/ebeaninternal/json/EJsonReader.java

@@ -1,356 +0,0 @@
-package io.ebeaninternal.json;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.ModifyAwareType;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.*;
-
-final class EJsonReader {
-
-  static final JsonFactory json = new JsonFactory();
-  private final JsonParser parser;
-  private final boolean modifyAware;
-  private final ModifyAwareFlag modifyAwareOwner;
-  private int depth;
-  private Stack stack;
-  private Context currentContext;
-
-  EJsonReader(JsonParser parser, boolean modifyAware) {
-    this.parser = parser;
-    this.modifyAware = modifyAware;
-    this.modifyAwareOwner = modifyAware ? new ModifyAwareFlag() : null;
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
-    return (Map<String, Object>) parse(json, modifyAware);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(String json) throws IOException {
-    return (Map<String, Object>) parse(json);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(Reader reader) throws IOException {
-    return (Map<String, Object>) parse(reader);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException {
-    return (Map<String, Object>) parse(reader, modifyAware);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(JsonParser parser) throws IOException {
-    return (Map<String, Object>) parse(parser);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
-    return (Map<String, Object>) parse(parser, token, false);
-  }
-
-  @SuppressWarnings("unchecked")
-  static <T> List<T> parseList(String json, boolean modifyAware) throws IOException {
-    return (List<T>) parse(json, modifyAware);
-  }
-
-  @SuppressWarnings("unchecked")
-  static List<Object> parseList(String json) throws IOException {
-    return (List<Object>) parse(json);
-  }
-
-  @SuppressWarnings("unchecked")
-  static List<Object> parseList(Reader reader) throws IOException {
-    return (List<Object>) parse(reader);
-  }
-
-  @SuppressWarnings("unchecked")
-  static List<Object> parseList(JsonParser parser, boolean modifyAware) throws IOException {
-    return (List<Object>) parse(parser, modifyAware);
-  }
-
-  static Object parse(String json) throws IOException {
-    if (json == null) {
-      return null;
-    }
-    return parse(new StringReader(json));
-  }
-
-  static Object parse(String json, boolean modifyAware) throws IOException {
-    if (json == null) {
-      return null;
-    }
-    return parse(new StringReader(json), modifyAware);
-  }
-
-  static Object parse(Reader reader) throws IOException {
-    return parse(json.createParser(reader));
-  }
-
-  static Object parse(Reader reader, boolean modifyAware) throws IOException {
-    return parse(json.createParser(reader), modifyAware);
-  }
-
-  static Object parse(JsonParser parser) throws IOException {
-    return parse(parser, null, false);
-  }
-
-  static Object parse(JsonParser parser, boolean modifyAware) throws IOException {
-    return parse(parser, null, modifyAware);
-  }
-
-  static Object parse(JsonParser parser, JsonToken token, boolean modifyAware) throws IOException {
-    return new EJsonReader(parser, modifyAware).parseJson(token);
-  }
-
-  private void startArray() {
-    depth++;
-    stack.push(currentContext);
-    currentContext = modifyAware ? new ArrayContext(modifyAwareOwner) : new ArrayContext();
-  }
-
-  private void startObject() {
-    depth++;
-    stack.push(currentContext);
-    currentContext = modifyAware ? new ObjectContext(modifyAwareOwner) : new ObjectContext();
-  }
-
-  private void endArray() {
-    end();
-  }
-
-  private void endObject() {
-    end();
-  }
-
-  private void end() {
-    depth--;
-    if (!stack.isEmpty()) {
-      currentContext = stack.pop(currentContext);
-    }
-    if (modifyAwareOwner != null) {
-      modifyAwareOwner.setMarkedDirty(false);
-    }
-  }
-
-  private void setValue(Object value) {
-    currentContext.setValue(value);
-  }
-
-  private void setValueNull() {
-    currentContext.setValueNull();
-  }
-
-  private Object parseJson(JsonToken token) throws IOException {
-
-    if (token == null) {
-      token = parser.nextToken();
-      // if it is a simple value just return it
-      switch (token) {
-        case VALUE_NULL:
-          return null;
-        case VALUE_FALSE:
-          return Boolean.FALSE;
-        case VALUE_TRUE:
-          return Boolean.TRUE;
-        case VALUE_STRING:
-          return parser.getText();
-        case VALUE_NUMBER_INT:
-          return parser.getLongValue();
-        case VALUE_NUMBER_FLOAT:
-          return parser.getDecimalValue();
-      }
-    }
-
-    // it is a object or array, process the first JsonToken
-    stack = new Stack();
-    processJsonToken(token);
-
-    // process the rest of the object or array
-    while (depth > 0) {
-      token = parser.nextToken();
-      processJsonToken(token);
-    }
-
-    return currentContext.getValue();
-  }
-
-  /**
-   * Process the JsonToken for objects and arrays.
-   */
-  private void processJsonToken(JsonToken token) throws IOException {
-    switch (token) {
-      case START_ARRAY:
-        startArray();
-        break;
-
-      case START_OBJECT:
-        startObject();
-        break;
-
-      case FIELD_NAME:
-        currentContext.setKey(parser.getCurrentName());
-        break;
-
-      case VALUE_STRING:
-        setValue(parser.getValueAsString());
-        break;
-
-      case VALUE_NUMBER_INT:
-        setValue(parser.getLongValue());
-        break;
-
-      case VALUE_NUMBER_FLOAT:
-        setValue(parser.getDecimalValue());
-        break;
-
-      case VALUE_TRUE:
-        setValue(Boolean.TRUE);
-        break;
-
-      case VALUE_FALSE:
-        setValue(Boolean.FALSE);
-        break;
-
-      case VALUE_NULL:
-        setValueNull();
-        break;
-
-      case END_OBJECT:
-        endObject();
-        break;
-
-      case END_ARRAY:
-        endArray();
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  private static final class Stack {
-
-    private Context head;
-
-    private void push(Context context) {
-      if (context != null) {
-        context.next = head;
-        head = context;
-      }
-    }
-
-    private Context pop(Context endingContext) {
-      if (head == null) {
-        throw new NoSuchElementException();
-      }
-      Context temp = head;
-      head = head.next;
-      temp.popContext(endingContext);
-      return temp;
-    }
-
-    private boolean isEmpty() {
-      return head == null;
-    }
-  }
-
-  private abstract static class Context {
-    Context next;
-
-    abstract void popContext(Context temp);
-
-    abstract Object getValue();
-
-    abstract void setValue(Object value);
-
-    abstract void setKey(String key);
-
-    abstract void setValueNull();
-  }
-
-  private static class ObjectContext extends Context {
-
-    private final Map<String, Object> map;
-
-    private String key;
-
-    ObjectContext() {
-      map = new LinkedHashMap<>();
-    }
-
-    ObjectContext(ModifyAwareType owner) {
-      map = new ModifyAwareMap<>(owner, new LinkedHashMap<>());
-    }
-
-    @Override
-    public void popContext(Context temp) {
-      setValue(temp.getValue());
-    }
-
-    @Override
-    Object getValue() {
-      return map;
-    }
-
-    @Override
-    void setValue(Object value) {
-      map.put(key, value);
-    }
-
-    @Override
-    void setKey(String key) {
-      this.key = key;
-    }
-
-    @Override
-    void setValueNull() {
-      map.put(key, null);
-    }
-  }
-
-  private static class ArrayContext extends Context {
-
-    private final List<Object> values;
-
-    ArrayContext() {
-      values = new ArrayList<>();
-    }
-
-    ArrayContext(ModifyAwareType owner) {
-      values = new ModifyAwareList<>(owner, new ArrayList<>());
-    }
-
-    @Override
-    public void popContext(Context temp) {
-      values.add(temp.getValue());
-    }
-
-    @Override
-    Object getValue() {
-      return values;
-    }
-
-    @Override
-    void setValue(Object value) {
-      values.add(value);
-    }
-
-    @Override
-    void setValueNull() {
-      // ignore
-    }
-
-    @Override
-    void setKey(String key) {
-      // not expected
-    }
-  }
-}

ebean-core-json/src/main/java/io/ebeaninternal/json/EJsonWriter.java

@@ -1,212 +0,0 @@
-package io.ebeaninternal.json;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-final class EJsonWriter {
-
-  /**
-   * Base jsonFactory implementation used when it is not passed in.
-   */
-  static final JsonFactory jsonFactory = new JsonFactory();
-  private final JsonGenerator jsonGenerator;
-
-  private EJsonWriter(JsonGenerator jsonGenerator) {
-    this.jsonGenerator = jsonGenerator;
-  }
-
-  static String write(Object object) throws IOException {
-    StringWriter writer = new StringWriter(200);
-    write(object, writer).close();
-    return writer.toString();
-  }
-
-  static JsonGenerator write(Object object, Writer writer) throws IOException {
-    JsonGenerator generator = jsonFactory.createGenerator(writer);
-    write(object, generator);
-    generator.flush();
-    return generator;
-  }
-
-  static void write(Object object, JsonGenerator jsonGenerator) {
-    new EJsonWriter(jsonGenerator).writeJson(object);
-  }
-
-  static void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException {
-    new EJsonWriter(jsonGenerator).writeCollection(null, collection);
-  }
-
-  private void writeJson(Object object) {
-    writeJson(null, object);
-  }
-
-  @SuppressWarnings("unchecked")
-  private void writeJson(String name, Object object) {
-    try {
-      if (object == null) {
-        writeNull(name);
-
-      } else if (object instanceof Number) {
-        writeNumber(name, (Number) object);
-
-      } else if (object instanceof String) {
-        writeString(name, (String) object);
-
-      } else if (object instanceof Map) {
-        writeMap(name, (Map<Object, Object>) object);
-
-      } else if (object instanceof Collection) {
-        writeCollection(name, (Collection<Object>) object);
-
-      } else if (object instanceof Boolean) {
-        writeBoolean(name, (Boolean) object);
-
-      } else if (object instanceof Date) {
-        writeDate(name, (Date) object);
-
-      } else if (object instanceof Map.Entry<?, ?>) {
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) object;
-        writeJson(entry.getKey().toString(), entry.getValue());
-
-      } else {
-        writeString(name, object.toString());
-      }
-
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private void writeBoolean(String name, Boolean object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeBoolean(object);
-    } else {
-      jsonGenerator.writeBooleanField(name, object);
-    }
-  }
-
-  private void writeDate(String name, Date object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber(object.getTime());
-    } else {
-      jsonGenerator.writeNumberField(name, object.getTime());
-    }
-  }
-
-  private void writeNumber(String name, Number object) throws IOException {
-
-    if (object instanceof Long) {
-      writeLong(name, object);
-
-    } else if (object instanceof Integer) {
-      writeInteger(name, object);
-
-    } else if (object instanceof Double) {
-      writeDouble(name, object);
-
-    } else if (object instanceof BigDecimal) {
-      writeBigDecimal(name, object);
-
-    } else if (object instanceof BigInteger) {
-      writeBigInteger(name, object);
-
-    } else {
-      writeGeneralNumber(name, object);
-    }
-  }
-
-  private void writeGeneralNumber(String name, Number object) throws IOException {
-    writeBigDecimal(name, new BigDecimal(object.toString()));
-  }
-
-  private void writeBigDecimal(String name, Number object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber((BigDecimal) object);
-    } else {
-      jsonGenerator.writeNumberField(name, (BigDecimal) object);
-    }
-  }
-
-  private void writeBigInteger(String name, Number object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber((BigInteger) object);
-    } else {
-      jsonGenerator.writeNumberField(name, object.longValue());
-    }
-  }
-
-  private void writeDouble(String name, Number object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber((Double) object);
-    } else {
-      jsonGenerator.writeNumberField(name, (Double) object);
-    }
-  }
-
-  private void writeLong(String name, Number object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber((Long) object);
-    } else {
-      jsonGenerator.writeNumberField(name, (Long) object);
-    }
-  }
-
-  private void writeInteger(String name, Number object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNumber((Integer) object);
-    } else {
-      jsonGenerator.writeNumberField(name, (Integer) object);
-    }
-  }
-
-  private void writeNull(String name) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeNull();
-    } else {
-      jsonGenerator.writeNullField(name);
-    }
-  }
-
-  private void writeString(String name, String object) throws IOException {
-    if (name == null) {
-      jsonGenerator.writeString(object);
-    } else {
-      jsonGenerator.writeStringField(name, object);
-    }
-  }
-
-  private void writeCollection(String name, Collection<Object> collection) throws IOException {
-    if (name != null) {
-      jsonGenerator.writeFieldName(name);
-    }
-    jsonGenerator.writeStartArray();
-    for (Object object : collection) {
-      writeJson(null, object);
-    }
-    jsonGenerator.writeEndArray();
-  }
-
-  private void writeMap(String name, Map<Object, Object> map) throws IOException {
-
-    if (name != null) {
-      jsonGenerator.writeFieldName(name);
-    }
-    jsonGenerator.writeStartObject();
-    Set<Entry<Object, Object>> entrySet = map.entrySet();
-    for (Entry<Object, Object> entry : entrySet) {
-      writeJson(entry.getKey().toString(), entry.getValue());
-    }
-    jsonGenerator.writeEndObject();
-  }
-}

ebean-core-json/src/main/java/io/ebeaninternal/json/EbeanJsonAdapter.java

@@ -0,0 +1,181 @@
+package io.ebeaninternal.json;
+
+import io.avaje.json.JsonAdapter;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
+import io.avaje.json.JsonWriter;
+import io.avaje.json.stream.JsonStream;
+import io.ebean.ModifyAwareType;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Ebean specific {@link JsonAdapter} that materializes JSON into plain Java
+ * Map/List/scalar values - optionally wrapped in modify-aware collections so
+ * that mutations after load are tracked as dirty.
+ * <p>
+ * This consolidates the prior EJsonReader/EJsonWriter behavior into a single
+ * adapter that plugs into avaje {@code JsonMapper}.
+ */
+final class EbeanJsonAdapter implements JsonAdapter<Object> {
+
+  static final EbeanJsonAdapter PLAIN = new EbeanJsonAdapter(false);
+  static final EbeanJsonAdapter MODIFY_AWARE = new EbeanJsonAdapter(true);
+
+  private static final JsonStream JSON_STREAM = JsonStream.builder().build();
+
+  private final boolean modifyAware;
+
+  private EbeanJsonAdapter(boolean modifyAware) {
+    this.modifyAware = modifyAware;
+  }
+
+  @Override
+  public Object fromJson(JsonReader reader) {
+    return read(reader, null, modifyAware);
+  }
+
+  @Override
+  public void toJson(JsonWriter writer, Object value) {
+    write(writer, value);
+  }
+
+  /**
+   * Read a value honoring an explicitly supplied current token (or current token when null).
+   */
+  static Object read(JsonReader parser, Token token, boolean modifyAware) {
+    ModifyAwareType owner = modifyAware ? new ModifyAwareFlag() : null;
+    Token effectiveToken = token == null ? parser.currentToken() : token;
+    Object value;
+    if (effectiveToken == null) {
+      value = parseRawJson(parser.readRaw(), owner);
+    } else {
+      value = parseValue(parser, effectiveToken, owner);
+    }
+    if (owner != null) {
+      owner.setMarkedDirty(false);
+    }
+    return value;
+  }
+
+  private static Object parseValue(JsonReader parser, Token token, ModifyAwareType owner) {
+    if (token == null) {
+      token = parser.currentToken();
+      if (token == null) {
+        if (parser.isNullValue()) {
+          return null;
+        }
+        return parseRawJson(parser.readRaw(), owner);
+      }
+    }
+    switch (token) {
+      case BEGIN_OBJECT:
+        return parseObjectValue(parser, owner);
+      case BEGIN_ARRAY:
+        return parseArrayValue(parser, owner);
+      case NUMBER:
+        BigDecimal value = parser.readDecimal();
+        return value.scale() <= 0 ? value.longValue() : value;
+      case STRING:
+        return parser.readString();
+      case BOOLEAN:
+        return parser.readBoolean();
+      case NULL:
+        parser.isNullValue();
+        return null;
+      default:
+        return parseRawJson(parser.readRaw(), owner);
+    }
+  }
+
+  private static Object parseRawJson(String json, ModifyAwareType owner) {
+    if (json == null) {
+      return null;
+    }
+    String content = json.trim();
+    if (content.isEmpty()) {
+      return null;
+    }
+    try (JsonReader parser = JSON_STREAM.reader(content)) {
+      return parseValue(parser, parser.currentToken(), owner);
+    }
+  }
+
+  private static Map<String, Object> parseObjectValue(JsonReader parser, ModifyAwareType owner) {
+    Map<String, Object> map = owner == null
+      ? new LinkedHashMap<>()
+      : new ModifyAwareMap<>(owner, new LinkedHashMap<>());
+
+    parser.beginObject();
+    while (parser.hasNextField()) {
+      String fieldName = parser.nextField();
+      map.put(fieldName, parseValue(parser, parser.currentToken(), owner));
+    }
+    parser.endObject();
+    return map;
+  }
+
+  private static List<Object> parseArrayValue(JsonReader parser, ModifyAwareType owner) {
+    List<Object> list = owner == null
+      ? new ArrayList<>()
+      : new ModifyAwareList<>(owner, new ArrayList<>());
+
+    parser.beginArray();
+    while (parser.hasNextElement()) {
+      list.add(parseValue(parser, parser.currentToken(), owner));
+    }
+    parser.endArray();
+    return list;
+  }
+
+  /**
+   * Write the value to an existing JsonWriter (used for the raw stream paths).
+   */
+  static void write(JsonWriter jsonWriter, Object object) {
+    if (object == null) {
+      jsonWriter.nullValue();
+    } else if (object instanceof String) {
+      jsonWriter.value((String) object);
+    } else if (object instanceof Integer) {
+      jsonWriter.value((Integer) object);
+    } else if (object instanceof Long) {
+      jsonWriter.value((Long) object);
+    } else if (object instanceof Double) {
+      jsonWriter.value((Double) object);
+    } else if (object instanceof Float) {
+      jsonWriter.value((Float) object);
+    } else if (object instanceof BigDecimal) {
+      jsonWriter.value((BigDecimal) object);
+    } else if (object instanceof Boolean) {
+      jsonWriter.value((Boolean) object);
+    } else if (object instanceof Map<?, ?>) {
+      writeMap(jsonWriter, (Map<?, ?>) object);
+    } else if (object instanceof Collection<?>) {
+      writeCollection(jsonWriter, (Collection<?>) object);
+    } else {
+      jsonWriter.value(object.toString());
+    }
+  }
+
+  private static void writeMap(JsonWriter jsonWriter, Map<?, ?> map) {
+    jsonWriter.beginObject();
+    for (Map.Entry<?, ?> entry : map.entrySet()) {
+      jsonWriter.name((String) entry.getKey());
+      write(jsonWriter, entry.getValue());
+    }
+    jsonWriter.endObject();
+  }
+
+  static void writeCollection(JsonWriter jsonWriter, Collection<?> collection) {
+    jsonWriter.beginArray();
+    for (Object element : collection) {
+      write(jsonWriter, element);
+    }
+    jsonWriter.endArray();
+  }
+}

ebean-core-json/src/main/java/module-info.java

@@ -1,8 +1,7 @@
 module io.ebean.core.json {
 
   requires io.ebean.api;
-
-  requires transitive com.fasterxml.jackson.core;
+  requires transitive io.avaje.json;
   exports io.ebeaninternal.json to io.ebean.test, io.ebean.core;
 
   provides io.ebean.service.BootstrapService with io.ebeaninternal.json.DJsonService;

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.11.1</version>
+    <version>18.2.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,14 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
     </dependency>
 
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-json-core</artifactId>
+      <version>${avaje-json-core.version}</version>
     </dependency>
 
     <!-- Provided scope for Postgres JSON/JSONB support -->

ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java

@@ -1,7 +1,7 @@
 package io.ebean.core.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonWriter;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 
@@ -177,13 +177,44 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   void writeData(DataOutput dataOutput, T value) throws IOException;
 
   /**
-   * Read the value from JsonParser.
+   * Read the value from JsonReader.
    */
-  T jsonRead(JsonParser parser) throws IOException;
+  default T jsonRead(JsonReader parser) throws IOException {
+    JsonReader.Token token = parser.currentToken();
+    if (token == JsonReader.Token.NULL) {
+      parser.isNullValue();
+      return null;
+    }
+    if (token == JsonReader.Token.STRING) {
+      return parse(parser.readString());
+    }
+    return parse(parser.readRaw());
+  }
 
   /**
-   * Write the value to the JsonGenerator.
+   * Write the value to the JsonWriter.
    */
-  void jsonWrite(JsonGenerator writer, T value) throws IOException;
+  default void jsonWrite(JsonWriter writer, T value) throws IOException {
+    if (value == null) {
+      writer.nullValue();
+      return;
+    }
+    String formatted = formatValue(value);
+    if (formatted == null) {
+      writer.nullValue();
+      return;
+    }
+    DocPropertyType docType = docType();
+    if (docType == DocPropertyType.OBJECT || docType == DocPropertyType.LIST || docType == DocPropertyType.ROOT || likelyRawJson(formatted)) {
+      writer.rawValue(formatted);
+    } else {
+      writer.value(formatted);
+    }
+  }
+
+  private static boolean likelyRawJson(String formatted) {
+    String trimmed = formatted.trim();
+    return !trimmed.isEmpty() && (trimmed.charAt(0) == '{' || trimmed.charAt(0) == '[');
+  }
 
 }

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java

@@ -1,8 +1,8 @@
 package io.ebean.core.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
+import io.avaje.json.JsonWriter;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
@@ -83,20 +83,31 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser parser) throws IOException {
-    if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) {
-      return convertFromMillis(parser.getLongValue());
-    } else {
-      return convertFromDate(Date.valueOf(parser.getText()));
+  public T jsonRead(JsonReader parser) throws IOException {
+    Token token = parser.currentToken();
+    if (Token.NUMBER == token) {
+      return convertFromMillis(parser.readLong());
     }
+    if (Token.STRING == token) {
+      return convertFromDate(Date.valueOf(parser.readString()));
+    }
+
+    String raw = parser.readRaw();
+    if (raw == null || "null".equals(raw)) {
+      return null;
+    }
+    if (raw.length() > 1 && raw.charAt(0) == '"' && raw.charAt(raw.length() - 1) == '"') {
+      return convertFromDate(Date.valueOf(raw.substring(1, raw.length() - 1)));
+    }
+    return convertFromMillis(Long.parseLong(raw));
   }
 
   @Override
-  public void jsonWrite(JsonGenerator writer, T value) throws IOException {
+  public void jsonWrite(JsonWriter writer, T value) throws IOException {
     if (mode == JsonConfig.Date.ISO8601) {
-      writer.writeString(toIsoFormat(value));
+      writer.value(toIsoFormat(value));
     } else {
-      writer.writeNumber(convertToMillis(value));
+      writer.value(convertToMillis(value));
     }
   }
 

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java

@@ -1,7 +1,8 @@
 package io.ebean.core.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
+import io.avaje.json.JsonWriter;
 import io.ebean.config.JsonConfig;
 
 import java.io.DataInput;
@@ -99,35 +100,53 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser parser) throws IOException {
-    switch (parser.getCurrentToken()) {
-      case VALUE_NUMBER_INT: {
-        return convertFromMillis(parser.getLongValue());
-      }
-      case VALUE_NUMBER_FLOAT: {
-        BigDecimal value = parser.getDecimalValue();
-        Timestamp timestamp = ScalarTypeUtils.toTimestamp(value);
-        return convertFromTimestamp(timestamp);
-      }
-      default: {
-        return fromJsonISO8601(parser.getText());
-      }
+  public T jsonRead(JsonReader parser) throws IOException {
+    Token token = parser.currentToken();
+    if (token == Token.NUMBER) {
+      return readNumber(parser.readDecimal());
     }
+    if (token == Token.STRING) {
+      return fromStringValue(parser.readString());
+    }
+
+    String raw = parser.readRaw();
+    if (raw == null || "null".equals(raw)) {
+      return null;
+    }
+    if (raw.length() > 1 && raw.charAt(0) == '"' && raw.charAt(raw.length() - 1) == '"') {
+      return fromStringValue(raw.substring(1, raw.length() - 1));
+    }
+    return readNumber(new BigDecimal(raw));
+  }
+
+  private T fromStringValue(String value) {
+    if (value.indexOf('-') == -1 && Character.isDigit(value.charAt(0))) {
+      return readNumber(new BigDecimal(value));
+    }
+    return fromJsonISO8601(value);
+  }
+
+  private T readNumber(BigDecimal value) {
+    if (value.scale() <= 0) {
+      return convertFromMillis(value.longValue());
+    }
+    Timestamp timestamp = ScalarTypeUtils.toTimestamp(value);
+    return convertFromTimestamp(timestamp);
   }
 
   @Override
-  public void jsonWrite(JsonGenerator writer, T value) throws IOException {
+  public void jsonWrite(JsonWriter writer, T value) throws IOException {
     switch (mode) {
       case ISO8601: {
-        writer.writeString(toJsonISO8601(value));
+        writer.value(toJsonISO8601(value));
         break;
       }
       case NANOS: {
-        writer.writeNumber(toJsonNanos(value));
+        writer.value(toJsonNanos(value));
         break;
       }
       default: {
-        writer.writeNumber(convertToMillis(value));
+        writer.value(convertToMillis(value));
       }
     }
   }

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseVarchar.java

@@ -1,7 +1,7 @@
 package io.ebean.core.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonWriter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -104,13 +104,16 @@ public abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser parser) throws IOException {
-    return parse(parser.getValueAsString());
+  public T jsonRead(JsonReader parser) throws IOException {
+    if (parser.isNullValue()) {
+      return null;
+    }
+    return parse(parser.readString());
   }
 
   @Override
-  public void jsonWrite(JsonGenerator writer, T value) throws IOException {
-    writer.writeString(format(value));
+  public void jsonWrite(JsonWriter writer, T value) throws IOException {
+    writer.value(format(value));
   }
 
   @Override

ebean-core-type/src/main/java/module-info.java

@@ -4,8 +4,7 @@ module io.ebean.core.type {
 
   requires transitive java.sql;
   requires transitive io.ebean.api;
+  requires transitive io.avaje.json;
   requires static org.postgresql.jdbc;
 
-  requires static com.fasterxml.jackson.core;
-
 }

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.11.1</version>
+    <version>18.2.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-json</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
     </dependency>
 
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
     </dependency>
 
     <dependency>
@@ -138,14 +138,6 @@
 <!--      <optional>true</optional>-->
 <!--    </dependency>-->
 
-    <!-- Jackson core used internally by Ebean -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -165,21 +157,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.11.1</version>
+      <version>18.2.0</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -100,7 +100,9 @@ public final class LoadBeanRequest extends LoadRequest {
     query.setLoadDescription(mode(), description());
     if (lazy) {
       query.setLazyLoadBatchSize(loadBuffer.batchSize());
-      if (alreadyLoaded) {
+      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),
         query.setBeanCacheMode(CacheMode.OFF);
       }
     } else {

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);
+  SpiDbQueryPlan with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured, Object tenantId);
 
 }

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

@@ -374,6 +374,8 @@ 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/SpiJsonContext.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import io.avaje.json.JsonWriter;
 import io.ebean.plugin.BeanType;
 import io.ebean.text.json.JsonContext;
 import io.ebean.text.json.JsonWriteOptions;
@@ -17,7 +17,7 @@ public interface SpiJsonContext extends JsonContext {
   /**
    * Create a Json Writer for writing beans as JSON.
    */
-  SpiJsonWriter createJsonWriter(JsonGenerator gen, JsonWriteOptions options);
+  SpiJsonWriter createJsonWriter(JsonWriter gen, JsonWriteOptions options);
 
   /**
    * Create a Json Writer for writing beans as JSON supplying a writer.

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

@@ -104,6 +104,11 @@ 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>

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

@@ -60,6 +60,6 @@ public interface SpiTransactionManager {
   /**
    * Return a connection used for query plan collection.
    */
-  Connection queryPlanConnection() throws SQLException;
+  Connection queryPlanConnection(Object tenantId) throws SQLException;
 
 }

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

@@ -244,6 +244,16 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setUpdateAllLoadedProperties(updateAllLoaded);
   }
 
+  @Override
+  public void setGeneratedPropertiesEnabled(boolean enable) {
+    transaction.setGeneratedPropertiesEnabled(enable);
+  }
+
+  @Override
+  public boolean isGeneratedPropertiesEnabled() {
+    return transaction.isGeneratedPropertiesEnabled();
+  }
+
   @Override
   public Boolean isUpdateAllLoadedProperties() {
     return transaction.isUpdateAllLoadedProperties();

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

@@ -150,4 +150,45 @@ public final class TransactionEvent implements Serializable {
     return changeSet;
   }
 
+  public void merge(TransactionEvent other) {
+    if (other == null) {
+      return;
+    }
+
+    // Merge table events
+    if (other.eventTables != null) {
+      if (this.eventTables == null) {
+        this.eventTables = other.eventTables;
+      } else {
+        this.eventTables.add(other.eventTables);
+      }
+    }
+
+    // Merge listeners
+    if (other.listenerNotify != null) {
+      if (this.listenerNotify == null) {
+        this.listenerNotify = other.listenerNotify;
+      } else {
+        this.listenerNotify.addAll(other.listenerNotify);
+      }
+    }
+
+    // Merge delete-by-id
+    if (other.deleteByIdMap != null) {
+      if (this.deleteByIdMap == null) {
+        this.deleteByIdMap = other.deleteByIdMap;
+      } else {
+        this.deleteByIdMap.merge(other.deleteByIdMap);
+      }
+    }
+
+    // Merge cache changes
+    if (other.changeSet != null) {
+      if (this.changeSet == null) {
+        this.changeSet = other.changeSet;
+      } else {
+        this.changeSet.merge(other.changeSet);
+      }
+    }
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java

@@ -1,8 +1,8 @@
 package io.ebeaninternal.api.json;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonReader.Token;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -14,7 +14,9 @@ public interface SpiJsonReader {
 
   PersistenceContext persistenceContext();
 
-  SpiJsonReader forJson(JsonParser moreJson);
+  SpiJsonReader forJson(JsonReader moreJson);
+
+  SpiJsonReader forJson(String moreJson);
 
   <T> void persistenceContextPut(Object beanId, T currentBean);
 
@@ -22,9 +24,9 @@ public interface SpiJsonReader {
 
   ObjectMapper mapper();
 
-  JsonParser parser();
+  JsonReader parser();
 
-  JsonToken nextToken() throws IOException;
+  Token nextToken() throws IOException;
 
   void pushPath(String path);
 

ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java

@@ -42,4 +42,8 @@ final class CacheChangeBeanRemove implements CacheChange {
   public void addId(Object id) {
     ids.add(id);
   }
+
+  void merge(CacheChangeBeanRemove other) {
+    this.ids.addAll(other.ids);
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java

@@ -184,6 +184,32 @@ public final class CacheChangeSet {
     return manyChangeMap.computeIfAbsent(key, ManyChange::new);
   }
 
+  public void merge(CacheChangeSet other) {
+    if (other == null) {
+      return;
+    }
+
+    this.entries.addAll(other.entries);
+    this.touchedTables.addAll(other.touchedTables);
+    this.queryCaches.addAll(other.queryCaches);
+    this.beanCaches.addAll(other.beanCaches);
+
+    other.beanRemoveMap.forEach((desc, remove) ->
+      this.beanRemoveMap.merge(desc, remove, (a, b) -> {
+        a.merge(b);
+        return a;
+      })
+    );
+
+    other.manyChangeMap.forEach((key, change) ->
+      this.manyChangeMap.merge(key, change, (a, b) -> {
+        a.merge(b);
+        return a;
+      })
+    );
+  }
+
+
   /**
    * Changes for a specific many property.
    */
@@ -215,6 +241,32 @@ public final class CacheChangeSet {
       }
     }
 
+    void merge(ManyChange other) {
+      // clear dominates everything
+      if (other.clear) {
+        this.clear = true;
+        this.removes.clear();
+        this.puts.clear();
+        return;
+      }
+
+      if (this.clear) {
+        // already clearing, ignore finer changes
+        return;
+      }
+
+      // merge puts (put overrides remove)
+      this.puts.putAll(other.puts);
+
+      // merge removes, but do not remove something we just put
+      for (String key : other.removes) {
+        if (!this.puts.containsKey(key)) {
+          this.removes.add(key);
+        }
+      }
+    }
+
+
     /**
      * Put entry for the given parentId.
      */

ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java

@@ -13,8 +13,9 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 public final class CacheManagerOptions {
 
   private final ClusterManager clusterManager;
-  private final DatabaseBuilder.Settings databaseBuilder;
+  private final String serverName;
   private final boolean localL2Caching;
+  private final boolean tenantPartitionedCache;
   private CurrentTenantProvider currentTenantProvider;
   private QueryCacheEntryValidate queryCacheEntryValidate;
   private ServerCacheFactory cacheFactory = new DefaultServerCacheFactory();
@@ -24,7 +25,8 @@ public final class CacheManagerOptions {
   CacheManagerOptions() {
     this.localL2Caching = true;
     this.clusterManager = null;
-    this.databaseBuilder = null;
+    this.serverName = "db";
+    this.tenantPartitionedCache = false;
     this.cacheFactory = new DefaultServerCacheFactory();
     this.beanDefault = new ServerCacheOptions();
     this.queryDefault = new ServerCacheOptions();
@@ -32,9 +34,10 @@ public final class CacheManagerOptions {
 
   public CacheManagerOptions(ClusterManager clusterManager, DatabaseBuilder.Settings config, boolean localL2Caching) {
     this.clusterManager = clusterManager;
-    this.databaseBuilder = config;
+    this.serverName = config.getName();
     this.localL2Caching = localL2Caching;
     this.currentTenantProvider = config.getCurrentTenantProvider();
+    this.tenantPartitionedCache = config.isTenantPartitionedCache();
   }
 
   public CacheManagerOptions with(ServerCacheOptions beanDefault, ServerCacheOptions queryDefault) {
@@ -55,7 +58,7 @@ public final class CacheManagerOptions {
   }
 
   public String getServerName() {
-    return (databaseBuilder == null) ? "db" : databaseBuilder.getName();
+    return serverName;
   }
 
   public boolean isLocalL2Caching() {
@@ -85,4 +88,8 @@ public final class CacheManagerOptions {
   public QueryCacheEntryValidate getQueryCacheEntryValidate() {
     return queryCacheEntryValidate;
   }
+
+  public boolean isTenantPartitionedCache() {
+    return tenantPartitionedCache;
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java

@@ -9,6 +9,7 @@ import io.ebean.config.CurrentTenantProvider;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.util.AnnotationUtil;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
@@ -32,6 +33,7 @@ final class DefaultCacheHolder {
   private final ServerCacheOptions queryDefault;
   private final CurrentTenantProvider tenantProvider;
   private final QueryCacheEntryValidate queryCacheEntryValidate;
+  private final boolean tenantPartitionedCache;
 
   DefaultCacheHolder(CacheManagerOptions builder) {
     this.cacheFactory = builder.getCacheFactory();
@@ -39,6 +41,7 @@ final class DefaultCacheHolder {
     this.queryDefault = builder.getQueryDefault();
     this.tenantProvider = builder.getCurrentTenantProvider();
     this.queryCacheEntryValidate = builder.getQueryCacheEntryValidate();
+    this.tenantPartitionedCache = builder.isTenantPartitionedCache();
   }
 
   void visitMetrics(MetricVisitor visitor) {
@@ -56,16 +59,31 @@ final class DefaultCacheHolder {
     return getCacheInternal(beanType, ServerCacheType.COLLECTION_IDS, collectionProperty);
   }
 
+  private String tenantKey(String beanName) {
+    if (tenantPartitionedCache) {
+      return beanName + '.' + tenantProvider.currentId();
+    }
+    return beanName;
+  }
+
   private String key(String beanName, ServerCacheType type) {
+    if (tenantPartitionedCache) {
+      return beanName + '.' + tenantProvider.currentId() + type.code();
+    }
     return beanName + type.code();
   }
 
   private String key(String beanName, String collectionProperty, ServerCacheType type) {
-    if (collectionProperty != null) {
-      return beanName + "." + collectionProperty + type.code();
-    } else {
-      return beanName + type.code();
+    StringBuilder sb = new StringBuilder(beanName.length() + 64);
+    sb.append(beanName);
+    if (tenantPartitionedCache) {
+      sb.append('.').append(tenantProvider.currentId());
     }
+    if (collectionProperty != null) {
+      sb.append('.').append(collectionProperty);
+    }
+    sb.append(type.code());
+    return sb.toString();
   }
 
   /**
@@ -82,12 +100,15 @@ final class DefaultCacheHolder {
     if (type == ServerCacheType.COLLECTION_IDS) {
       lock.lock();
       try {
-        collectIdCaches.computeIfAbsent(beanType.getName(), s -> new ConcurrentSkipListSet<>()).add(key);
+        collectIdCaches.computeIfAbsent(tenantKey(beanType.getName()), s -> new ConcurrentSkipListSet<>()).add(key);
       } finally {
         lock.unlock();
       }
     }
-    return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, tenantProvider, queryCacheEntryValidate));
+    // in partitioned mode each ServerCache instance is already tenant-scoped via its key,
+    // so the tenantProvider is not needed inside the cache itself
+    CurrentTenantProvider cacheProvider = tenantPartitionedCache ? null : tenantProvider;
+    return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, cacheProvider, queryCacheEntryValidate));
   }
 
   void clearAll() {
@@ -100,17 +121,75 @@ final class DefaultCacheHolder {
 
   public void clear(String name) {
     log.log(DEBUG, "clear {0}", name);
-    clearIfExists(key(name, ServerCacheType.QUERY));
-    clearIfExists(key(name, ServerCacheType.BEAN));
-    clearIfExists(key(name, ServerCacheType.NATURAL_KEY));
-    Set<String> keys = collectIdCaches.get(name);
-    if (keys != null) {
-      for (String collectionIdKey : keys) {
-        clearIfExists(collectionIdKey);
+    if (tenantPartitionedCache) {
+      // In partitioned mode, tenantProvider.currentId() may be null/wrong on a background
+      // invalidation thread. Scan all cache entries for this entity type across all tenants.
+      clearAllTenantsFor(name);
+    } else {
+      clearIfExists(key(name, ServerCacheType.QUERY));
+      clearIfExists(key(name, ServerCacheType.BEAN));
+      clearIfExists(key(name, ServerCacheType.NATURAL_KEY));
+      Set<String> keys = collectIdCaches.get(name);
+      if (keys != null) {
+        for (String collectionIdKey : keys) {
+          clearIfExists(collectionIdKey);
+        }
       }
     }
   }
 
+  private void clearAllTenantsFor(String name) {
+    // Keys in partitioned mode: beanName.tenantId_X or beanName.tenantId.prop_X
+    // collectIdCaches keys: beanName.tenantId
+    // Both start with beanName + '.' so we can use prefix scan.
+    String prefix = name + '.';
+    for (Map.Entry<String, ServerCache> entry : allCaches.entrySet()) {
+      if (entry.getKey().startsWith(prefix)) {
+        log.log(TRACE, "clear cache {0}", entry.getKey());
+        entry.getValue().clear();
+      }
+    }
+    lock.lock();
+    try {
+      for (Map.Entry<String, Set<String>> entry : collectIdCaches.entrySet()) {
+        if (entry.getKey().startsWith(prefix)) {
+          for (String collectionIdKey : entry.getValue()) {
+            clearIfExists(collectionIdKey);
+          }
+        }
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  /**
+   * Remove all cache entries belonging to the given tenant.
+   * Call this when a tenant is deactivated to prevent unbounded memory growth.
+   */
+  void clearTenant(Object tenantId) {
+    String tenantIdStr = String.valueOf(tenantId);
+    // Keys look like: beanName.tenantId_X  or  beanName.tenantId.prop_X
+    String segmentBeforeTypeCode = '.' + tenantIdStr + '_';
+    String segmentBeforeProperty = '.' + tenantIdStr + '.';
+    allCaches.entrySet().removeIf(e -> {
+      String k = e.getKey();
+      return k.contains(segmentBeforeTypeCode) || k.contains(segmentBeforeProperty);
+    });
+    // collectIdCaches keys look like: beanName.tenantId
+    String collectKeySuffix = '.' + tenantIdStr;
+    lock.lock();
+    try {
+      collectIdCaches.entrySet().removeIf(e -> e.getKey().endsWith(collectKeySuffix));
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  boolean isTenantPartitionedCache() {
+    return tenantPartitionedCache;
+  }
+
   private void clearIfExists(String fullKey) {
     ServerCache cache = allCaches.get(fullKey);
     if (cache != null) {

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java

@@ -154,4 +154,14 @@ public final class DefaultServerCacheManager implements SpiCacheManager {
     return cacheHolder.getCache(beanType, ServerCacheType.BEAN);
   }
 
+  @Override
+  public boolean isTenantPartitionedCache() {
+    return cacheHolder.isTenantPartitionedCache();
+  }
+
+  @Override
+  public void clearTenant(Object tenantId) {
+    cacheHolder.clearTenant(tenantId);
+  }
+
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java

@@ -88,4 +88,17 @@ public interface SpiCacheManager {
    */
   void clearLocal(Class<?> beanType);
 
+  /**
+   * Returns true if this cache manager runs in tenant-partitioned mode.
+   * In this mode caches are namespaced per tenant to improve cache-hit ratio.
+   */
+  boolean isTenantPartitionedCache();
+
+  /**
+   * Remove all cache entries belonging to the given tenant.
+   * Call this when a tenant is deactivated to prevent unbounded memory growth
+   * in tenant-partitioned mode.
+   */
+  void clearTenant(Object tenantId);
+
 }

ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.changelog;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
+import io.avaje.json.JsonWriter;
+import io.avaje.json.stream.JsonStream;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.event.changelog.ChangeType;
@@ -15,13 +15,13 @@ import java.util.Map;
  */
 final class ChangeJsonBuilder {
 
-  private final JsonFactory jsonFactory = new JsonFactory();
+  private final JsonStream jsonStream = JsonStream.builder().build();
 
   /**
    * Write the bean change as JSON.
    */
   void writeBeanJson(Writer writer, BeanChange bean, ChangeSet changeSet) throws IOException {
-    try (JsonGenerator generator = jsonFactory.createGenerator(writer)) {
+    try (JsonWriter generator = jsonStream.writer(writer)) {
       writeBeanChange(generator, bean, changeSet);
       generator.flush();
     }
@@ -30,58 +30,67 @@ final class ChangeJsonBuilder {
   /**
    * Write the bean change as JSON document containing the transaction header details.
    */
-  private void writeBeanChange(JsonGenerator gen, BeanChange bean, ChangeSet changeSet) throws IOException {
-    gen.writeStartObject();
-    gen.writeNumberField("ts", bean.getEventTime());
-    gen.writeStringField("change", bean.getEvent().getCode());
-    gen.writeStringField("type", bean.getType());
-    gen.writeStringField("id", bean.getId().toString());
+  private void writeBeanChange(JsonWriter gen, BeanChange bean, ChangeSet changeSet) {
+    gen.beginObject();
+    gen.name("ts");
+    gen.value(bean.getEventTime());
+    gen.name("change");
+    gen.value(bean.getEvent().getCode());
+    gen.name("type");
+    gen.value(bean.getType());
+    gen.name("id");
+    gen.value(bean.getId().toString());
     if (bean.getTenantId() != null) {
-      gen.writeStringField("tenantId", bean.getTenantId().toString());
+      gen.name("tenantId");
+      gen.value(bean.getTenantId().toString());
     }
     writeBeanTransactionDetails(gen, changeSet);
     writeBeanValues(gen, bean);
-    gen.writeEndObject();
+    gen.endObject();
   }
 
   /**
    * Denormalise by writing the transaction header details.
    */
-  private void writeBeanTransactionDetails(JsonGenerator gen, ChangeSet changeSet) throws IOException {
+  private void writeBeanTransactionDetails(JsonWriter gen, ChangeSet changeSet) {
     String source = changeSet.getSource();
     if (source != null) {
-      gen.writeStringField("source", source);
+      gen.name("source");
+      gen.value(source);
     }
     String userId = changeSet.getUserId();
     if (userId != null) {
-      gen.writeStringField("userId", userId);
+      gen.name("userId");
+      gen.value(userId);
     }
     String userIpAddress = changeSet.getUserIpAddress();
     if (userIpAddress != null) {
-      gen.writeStringField("userIpAddress", userIpAddress);
+      gen.name("userIpAddress");
+      gen.value(userIpAddress);
     }
     Map<String, String> userContext = changeSet.getUserContext();
     if (userContext != null && !userContext.isEmpty()) {
-      gen.writeObjectFieldStart("userContext");
+      gen.name("userContext");
+      gen.beginObject();
       for (Map.Entry<String, String> entry : userContext.entrySet()) {
-        gen.writeStringField(entry.getKey(), entry.getValue());
+        gen.name(entry.getKey());
+        gen.value(entry.getValue());
       }
-      gen.writeEndObject();
+      gen.endObject();
     }
   }
 
   /**
    * For insert and update write the new/old values.
    */
-  private void writeBeanValues(JsonGenerator gen, BeanChange bean) throws IOException {
+  private void writeBeanValues(JsonWriter gen, BeanChange bean) {
     if (bean.getEvent() != ChangeType.DELETE) {
-      gen.writeFieldName("data");
-      gen.writeRaw(":");
-      gen.writeRaw(bean.getData());
+      gen.name("data");
+      gen.rawValue(bean.getData());
       String oldData = bean.getOldData();
       if (oldData != null) {
-        gen.writeRaw(",\"oldData\":");
-        gen.writeRaw(oldData);
+        gen.name("oldData");
+        gen.rawValue(oldData);
       }
     }
   }

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -1197,15 +1197,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> boolean exists(SpiQuery<T> ormQuery) {
     SpiQuery<T> ormQueryCopy = ormQuery.copy();
-    ormQueryCopy.setMaxRows(1);
     SpiOrmQueryRequest<?> request = createQueryRequest(Type.EXISTS, ormQueryCopy);
-    List<Object> ids = request.getFromQueryCache();
-    if (ids != null) {
-      return !ids.isEmpty();
+    Object cached = request.getFromQueryCache();
+    if (cached != null) {
+      return (Boolean) cached;
     }
     try {
       request.initTransIfRequired();
-      return !request.findIds().isEmpty();
+      return request.findExists();
     } finally {
       request.endTransIfRequired();
     }
@@ -1234,6 +1233,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> int delete(SpiQuery<T> query) {
+    return delete(query, false);
+  }
+
+  @Override
+  public <T> int deletePermanent(SpiQuery<T> query) {
+    return delete(query, true);
+  }
+
+  private <T> int delete(SpiQuery<T> query, boolean permanent) {
+    if (query.getId() != null && query.whereExpressions() == null && query.descriptor().isSoftDelete()) {
+      return executeInTrans((txn) -> persister.delete(query.getBeanType(), query.getId(), txn, permanent), query.transaction());
+    }
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.DELETE, query);
     try {
       request.initTransIfRequired();
@@ -1247,7 +1258,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
         if (ids.isEmpty()) {
           return 0;
         } else {
-          return persister.deleteByIds(request.descriptor(), ids, request.transaction(), false);
+          return persister.deleteByIds(request.descriptor(), ids, request.transaction(), permanent);
         }
       }
     } finally {

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import io.avaje.json.stream.JsonStream;
 import io.ebean.DatabaseBuilder;
 import io.ebean.ExpressionFactory;
 import io.ebean.annotation.Platform;
@@ -81,6 +81,7 @@ public final class InternalConfiguration {
   private final Binder binder;
   private final DeployCreateProperties deployCreateProperties;
   private final DeployUtil deployUtil;
+  private final DataSourceSupplier dataSourceSupplier;
   private final BeanDescriptorManager beanDescriptorManager;
   private final CQueryEngine cQueryEngine;
   private final ClusterManager clusterManager;
@@ -89,7 +90,7 @@ public final class InternalConfiguration {
   private final boolean jacksonCorePresent;
   private final ExpressionFactory expressionFactory;
   private final SpiBackgroundExecutor backgroundExecutor;
-  private final JsonFactory jsonFactory;
+  private final JsonStream jsonStream;
   private final DocStoreFactory docStoreFactory;
   private final List<Plugin> plugins = new ArrayList<>();
   private final MultiValueBind multiValueBind;
@@ -108,7 +109,7 @@ public final class InternalConfiguration {
     this.tableModState = new TableModState();
     this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(service(DocStoreFactory.class));
-    this.jsonFactory = config.getJsonFactory();
+    this.jsonStream = config.getJsonStream();
     this.clusterManager = clusterManager;
     this.backgroundExecutor = backgroundExecutor;
     this.bootupClasses = bootupClasses;
@@ -124,6 +125,7 @@ public final class InternalConfiguration {
 
     final InternalConfigXmlMap xmlMap = initExternalMapping();
     this.dtoBeanManager = new DtoBeanManager(typeManager, xmlMap.readDtoMapping());
+    this.dataSourceSupplier = createDataSourceSupplier();
     this.beanDescriptorManager = new BeanDescriptorManager(this);
     Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlMap.xmlDeployment());
     Map<String, String> draftTableMap = beanDescriptorManager.draftTableMap();
@@ -292,7 +294,7 @@ public final class InternalConfiguration {
   }
 
   SpiJsonContext createJsonContext(SpiEbeanServer server) {
-    return jacksonCorePresent ? new DJsonContext(server, jsonFactory, typeManager) : null;
+    return jacksonCorePresent ? new DJsonContext(server, jsonStream, typeManager) : null;
   }
 
   AutoTuneService createAutoTuneService(SpiEbeanServer server) {
@@ -391,7 +393,7 @@ public final class InternalConfiguration {
 
     TransactionManagerOptions options =
       new TransactionManagerOptions(server, notifyL2CacheInForeground, config, scopeManager, clusterManager, backgroundExecutor,
-        indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
+        indexUpdateProcessor, beanDescriptorManager, dataSourceSupplier, profileHandler(), logManager,
         tableModState, cacheNotify);
 
     if (config.isDocStoreOnly()) {
@@ -409,9 +411,16 @@ public final class InternalConfiguration {
   }
 
   /**
-   * Return the DataSource supplier based on the tenancy mode.
+   * Return the DataSource supplier (multi-tenant aware) based on the tenancy mode.
    */
-  private DataSourceSupplier dataSource() {
+  public DataSourceSupplier getDataSourceSupplier() {
+    return dataSourceSupplier;
+  }
+
+  /**
+   * Create the DataSource supplier based on the tenancy mode.
+   */
+  private DataSourceSupplier createDataSourceSupplier() {
     switch (config.getTenantMode()) {
       case DB:
       case DB_WITH_MASTER:
@@ -580,7 +589,8 @@ public final class InternalConfiguration {
       return QueryPlanManager.NOOP;
     }
     long threshold = config.getQueryPlanThresholdMicros();
-    return new CQueryPlanManager(transactionManager, threshold, queryPlanLogger(databasePlatform.platform(), config), extraMetrics);
+    return new CQueryPlanManager(transactionManager, config.getCurrentTenantProvider(),
+      threshold, queryPlanLogger(databasePlatform.platform(), config), extraMetrics);
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java

@@ -49,6 +49,11 @@ public interface OrmQueryEngine {
    */
   <T> int findCount(OrmQueryRequest<T> request);
 
+  /**
+   * Execute the exists query using SELECT EXISTS(...).
+   */
+  <T> boolean findExists(OrmQueryRequest<T> request);
+
   /**
    * Execute the find id's query.
    */

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -42,7 +42,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   private SpiQuerySecondary secondaryQueries;
   private List<T> cacheBeans;
   private boolean inlineCountDistinct;
-  private Set<String> dependentTables;
   private SpiQueryManyJoin manyJoin;
 
   public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery<T> query, SpiTransaction t) {
@@ -128,6 +127,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
   }
 
+  /**
+   * Return the secondary queries (fetchQuery and lazy joins) extracted from the query detail.
+   */
+  public SpiQuerySecondary secondaryQueries() {
+    return secondaryQueries;
+  }
+
   /**
    * For use with QueryIterator and secondary queries this returns the minimum
    * batch size that should be loaded before executing the secondary queries.
@@ -356,6 +362,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return queryEngine.findCount(this);
   }
 
+  @Override
+  public boolean findExists() {
+    return queryEngine.findExists(this);
+  }
+
   @Override
   public <A> List<A> findIds() {
     return queryEngine.findIds(this);
@@ -667,7 +678,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   }
 
   public void putToQueryCache(Object result) {
-    beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.startTime()));
+    CQueryPlan plan = queryPlan();
+    if (plan != null) {
+      // only cache when we have the plan's dependent tables
+      beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, plan.dependentTables(), transaction.startTime()));
+    }
   }
 
   /**
@@ -737,15 +752,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return inlineCountDistinct;
   }
 
-  public void addDependentTables(Set<String> tables) {
-    if (tables != null && !tables.isEmpty()) {
-      if (dependentTables == null) {
-        dependentTables = new LinkedHashSet<>();
-      }
-      dependentTables.addAll(tables);
-    }
-  }
-
   /**
    * Return true if no MaxRows or use LIMIT in SQL update.
    */