#3461 - Add also() for query beans that takes QueryBuilder

* ebean-test: Modify postgis platform to support both net.postgis and org.postgis

Use Class.forName() to test existence of net.postgis.jdbc.DriverWrapperLW and if available use that driver rather than the older org.postgis.DriverWrapperLW one.

Also support explicitly specifying the driver to use via test property - ebean.test.postgis.driver

* Update test for net postgis to use a separate container

* Remove NetPostgisSetup as PostgisSetup handles both cases now

.github/workflows/build.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/db2luw.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/h2database.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/jdk-ea.yml

@@ -16,18 +16,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [GA,EA]
+        java_version: [GA,EA,23]
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
         release: ${{ matrix.java_version }}
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/mariadb.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

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

@@ -17,14 +17,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

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

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/mysql.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/oracle.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/postgres.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/sqlserver-2019.yml

@@ -17,14 +17,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/sqlserver.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/yugabyte.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

README.md

@@ -56,7 +56,7 @@ Work at the highest level of abstraction and drop down levels as needed.
     <tr>
       <td align="center" valign="middle">
         <a href="https://www.foconis.de/" target="_blank">
-          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
+          <img width="222px" src="https://group.foconis.com/download/ci/logo/png-72dpi/logo-quer/foconis-analytics-quer.png">
         </a>
       </td>
       <td align="center" valign="middle">

composites/ebean-clickhouse/pom.xml

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

composites/ebean-cockroach/pom.xml

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

composites/ebean-db2/pom.xml

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

composites/ebean-h2/pom.xml

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

composites/ebean-hana/pom.xml

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

composites/ebean-mariadb/pom.xml

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

composites/ebean-mysql/pom.xml

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

composites/ebean-net-postgis/pom.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>14.5.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <name>ebean-net-postgis</name>
+  <description>ebean-net-postgis composite</description>
+  <artifactId>ebean-net-postgis</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2023.1.0</postgis.jdbc.version>
+    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-net-postgis-types</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.jdbc.version}</version>
+      <exclusions>
+        <!-- exclude unnecessary checker framework -->
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>

composites/ebean-net-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.postgis.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-net-postgis/src/main/java/module-info.java

@@ -0,0 +1,10 @@
+module io.ebean.postgis {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+  // requires transitive io.ebean.postgis.types;
+
+}

composites/ebean-nuodb/pom.xml

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

composites/ebean-oracle/pom.xml

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

composites/ebean-postgis/pom.xml

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

composites/ebean-postgres/pom.xml

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

composites/ebean-sqlite/pom.xml

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

composites/ebean-sqlserver/pom.xml

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

composites/ebean-yugabyte/pom.xml

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

composites/ebean/pom.xml

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

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
@@ -24,6 +24,7 @@
     <module>ebean-oracle</module>
     <module>ebean-postgres</module>
     <module>ebean-postgis</module>
+    <module>ebean-net-postgis</module>
 <!--    <module>sqlanywhere</module>-->
     <module>ebean-sqlite</module>
     <module>ebean-sqlserver</module>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -186,15 +186,15 @@ public class OrderBy<T> implements Serializable {
     if (list.isEmpty()) {
       return null;
     }
-    StringBuilder sb = new StringBuilder();
+    var append = new StringAppend();
     for (int i = 0; i < list.size(); i++) {
       Property property = list.get(i);
       if (i > 0) {
-        sb.append(", ");
+        append.append(", ");
       }
-      sb.append(property.toStringFormat());
+      property.toStringFormat(append);
     }
-    return sb.toString();
+    return append.toString();
   }
 
   @Override
@@ -231,6 +231,55 @@ public class OrderBy<T> implements Serializable {
     return this;
   }
 
+  /**
+   * Append the order by clause.
+   */
+  public interface Append {
+
+    /**
+     * Append a property expression.
+     */
+    Append property(String property);
+
+    /**
+     * Append a literal.
+     */
+    Append append(String literal);
+
+    /**
+     * Parse and append an expression.
+     */
+    Append parse(String expression);
+  }
+
+  private static final class StringAppend implements Append {
+
+    private final StringBuilder builder = new StringBuilder();
+
+    @Override
+    public String toString() {
+      return builder.toString();
+    }
+
+    @Override
+    public Append property(String property) {
+      builder.append(property);
+      return this;
+    }
+
+    @Override
+    public Append append(String literal) {
+      builder.append(literal);
+      return this;
+    }
+
+    @Override
+    public Append parse(String raw) {
+      builder.append(raw);
+      return this;
+    }
+  }
+
   /**
    * A property and its ascending descending order.
    */
@@ -309,36 +358,25 @@ public class OrderBy<T> implements Serializable {
 
     @Override
     public String toString() {
-      return toStringFormat();
+      return property;
     }
 
-    public String toStringFormat() {
-      if (nulls == null && collation == null) {
-        if (ascending) {
-          return property;
+    public void toStringFormat(Append append) {
+      if (collation != null)  {
+        if (collation.contains("${}")) {
+          // this is a complex collation, e.g. DB2 - we must replace the property
+          append.parse(collation.replace("${}", property));
         } else {
-          return property + " desc";
+          append.property(property).append(" collate ").append(collation);
         }
       } else {
-        StringBuilder sb = new StringBuilder();
-        if (collation != null)  {
-          if (collation.contains("${}")) {
-            // this is a complex collation, e.g. DB2 - we must replace the property
-            sb.append(collation.replace("${}", property));
-          } else {
-            sb.append(property);
-            sb.append(" collate ").append(collation);
-          }
-        } else {
-          sb.append(property);
-        }
-        if (!ascending) {
-          sb.append(' ').append("desc");
-        }
-        if (nulls != null) {
-          sb.append(' ').append(nulls).append(' ').append(highLow);
-        }
-        return sb.toString();
+        append.property(property);
+      }
+      if (!ascending) {
+        append.append(" desc");
+      }
+      if (nulls != null) {
+        append.append(" ").append(nulls).append(" ").append(highLow);
       }
     }
 

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

@@ -20,6 +20,7 @@ import java.util.stream.Stream;
  * @param <SELF> The type of the builder
  * @param <T>    The entity bean type
  */
+//public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends QueryBuilderProjection<SELF, T> {
 public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
 
   /**
@@ -27,6 +28,15 @@ public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
    */
   SELF alias(String alias);
 
+  /**
+   * Apply changes to the query using a function.
+   * <p>
+   * This can be used to apply generic features to queries.
+   *
+   * @param apply The changes to apply to the query
+   */
+  SELF also(Consumer<QueryBuilder<?, ?>> apply);
+
   /**
    * Apply changes to the query conditional on the supplied predicate.
    * <p>

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

@@ -6,6 +6,7 @@ package io.ebean;
  * @param <SELF> The builder type
  * @param <T>    The entity bean type
  */
+//public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {
 public interface QueryBuilderProjection<SELF, T> {
 
   /**

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

@@ -129,7 +129,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    * When true then include a sql comment in generated SELECT queries with the query
    * label or profile location label.
    */
-  private boolean includeLabelInSql;
+  private boolean includeLabelInSql = true;
 
   /**
    * Interesting classes such as entities, embedded, ScalarTypes,

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

@@ -8,6 +8,7 @@ module io.ebean.api {
   uses io.ebean.service.SpiRawSqlService;
   uses io.ebean.service.SpiProfileLocationFactory;
   uses io.ebean.service.SpiFetchGroupService;
+  uses io.ebean.service.SpiJsonService;
 
   requires transitive java.sql;
   requires transitive io.avaje.config;

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -76,7 +76,7 @@ class DatabaseConfigTest {
     props.setProperty("skipDataSourceCheck", "true");
     props.setProperty("readOnlyDatabase", "true");
     props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");
+    props.setProperty("includeLabelInSql", "false");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,7 +97,7 @@ class DatabaseConfigTest {
     assertTrue(settings.isLoadModuleInfo());
     assertTrue(settings.skipDataSourceCheck());
     assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
+    assertFalse(settings.isIncludeLabelInSql());
     assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
 
     assertTrue(settings.isIdGeneratorAutomatic());
@@ -183,7 +183,7 @@ class DatabaseConfigTest {
     assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
     assertEquals(10, config.getQueryPlanCaptureMaxCount());
     assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());
+    assertTrue(config.isIncludeLabelInSql());
 
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());

ebean-bom/pom.xml

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

ebean-core-type/pom.xml

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

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
     </dependency>
 
     <dependency>
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -211,6 +211,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <argLine>-Dnet.bytebuddy.experimental=true</argLine>
           <useSystemClassLoader>false</useSystemClassLoader>
           <trimStackTrace>false</trimStackTrace>
           <failIfNoTests>false</failIfNoTests>

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

@@ -84,10 +84,17 @@ public final class LoadBeanRequest extends LoadRequest {
     return idList;
   }
 
+  public SpiQuery<?> createQuery(SpiEbeanServer server) {
+    final SpiQuery<?> query = server.createQuery(beanType());
+    query.usingTransaction(transaction);
+    configureQuery(query);
+    return query;
+  }
+
   /**
    * Configure the query for lazy loading execution.
    */
-  public void configureQuery(SpiQuery<?> query) {
+  private void configureQuery(SpiQuery<?> query) {
     query.setMode(Mode.LAZYLOAD_BEAN);
     query.setPersistenceContext(loadBuffer.persistenceContext());
     query.setLoadDescription(mode(), description());

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

@@ -94,6 +94,7 @@ public final class LoadManyRequest extends LoadRequest {
   public SpiQuery<?> createQuery(SpiEbeanServer server) {
     BeanPropertyAssocMany<?> many = many();
     SpiQuery<?> query = many.newQuery(server);
+    query.usingTransaction(transaction);
     String orderBy = many.lazyFetchOrderBy();
     if (orderBy != null) {
       query.orderBy(orderBy);

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

@@ -357,4 +357,8 @@ public interface SpiTransaction extends Transaction {
    */
   void postRollback(Throwable cause);
 
+  /**
+   * Set the transaction to be inactive via external transaction manager.
+   */
+  void deactivateExternal();
 }

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

@@ -447,4 +447,9 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   public void postRollback(Throwable cause) {
     transaction.postRollback(cause);
   }
+
+  @Override
+  public void deactivateExternal() {
+    transaction.deactivateExternal();
+  }
 }

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

@@ -126,9 +126,7 @@ final class DefaultBeanLoader {
     if (loadRequest.checkEmpty()) {
       throw new RuntimeException("Nothing in batch?");
     }
-    final SpiQuery<?> query = server.createQuery(loadRequest.beanType());
-    query.usingTransaction(loadRequest.transaction());
-    loadRequest.configureQuery(query);
+    final SpiQuery<?> query = loadRequest.createQuery(server);
     loadRequest.postLoad(executeQuery(loadRequest, query));
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java

@@ -514,7 +514,7 @@ final class BeanDescriptorCacheHelp<T> {
 
     if (natKeys != null && !natKeys.isEmpty()) {
       if (natLog.isLoggable(DEBUG)) {
-        natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet());
+        natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, Arrays.toString(naturalKey), natKeys.keySet());
       }
       naturalKeyCache.putAll(natKeys);
     }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java

@@ -5,6 +5,7 @@ import io.ebean.OrderBy.Property;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
+import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -17,50 +18,81 @@ final class CQueryOrderBy {
 
   private final BeanDescriptor<?> desc;
   private final OrderBy<?> orderBy;
+  private final DeployParser parser;
 
   /**
    * Create the logical order by clause.
    */
-  public static String parse(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
-    return new CQueryOrderBy(desc, orderBy).parseInternal();
+  static String parse(DeployParser parser, BeanDescriptor<?> desc, OrderBy<?> orderBy) {
+    return new CQueryOrderBy(parser, desc, orderBy).parseInternal();
   }
 
-  private CQueryOrderBy(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
+  private CQueryOrderBy(DeployParser parser, BeanDescriptor<?> desc, OrderBy<?> orderBy) {
     this.desc = desc;
+    this.parser = parser;
     this.orderBy = orderBy;
   }
 
   private String parseInternal() {
-    StringBuilder sb = new StringBuilder();
     List<Property> properties = orderBy.getProperties();
     if (properties.isEmpty()) {
       // order by clause removed by filterMany()
       return null;
     }
+    var append = new StringAppend(parser);
     for (int i = 0; i < properties.size(); i++) {
       if (i > 0) {
-        sb.append(", ");
+        append.append(", ");
       }
-      Property p = properties.get(i);
-      String expression = parseProperty(p);
-      sb.append(expression);
+      parseProperty(properties.get(i), append);
     }
-    return sb.toString();
+    return append.toString();
   }
 
-  private String parseProperty(Property p) {
-    String propName = p.getProperty();
-    ElPropertyValue el = desc.elGetValue(propName);
-    if (el == null) {
-      return p.toStringFormat();
+  private void parseProperty(Property p, StringAppend append) {
+    ElPropertyValue el = desc.elGetValue(p.getProperty());
+    if (el != null) {
+      BeanProperty beanProperty = el.beanProperty();
+      if (beanProperty instanceof BeanPropertyAssoc<?>) {
+        BeanPropertyAssoc<?> ap = (BeanPropertyAssoc<?>) beanProperty;
+        IdBinder idBinder = ap.targetDescriptor().idBinder();
+        append.parse(idBinder.orderBy(el.elName(), p.isAscending()));
+        return;
+      }
+    }
+    p.toStringFormat(append);
+  }
+
+  private static class StringAppend implements OrderBy.Append {
+
+    private final StringBuilder builder = new StringBuilder();
+    private final DeployParser parser;
+
+    StringAppend(DeployParser parser) {
+      this.parser = parser;
     }
 
-    BeanProperty beanProperty = el.beanProperty();
-    if (beanProperty instanceof BeanPropertyAssoc<?>) {
-      BeanPropertyAssoc<?> ap = (BeanPropertyAssoc<?>) beanProperty;
-      IdBinder idBinder = ap.targetDescriptor().idBinder();
-      return idBinder.orderBy(el.elName(), p.isAscending());
+    @Override
+    public String toString() {
+      return builder.toString();
+    }
+
+    @Override
+    public OrderBy.Append property(String property) {
+      builder.append(parser.property(property));
+      return this;
+    }
+
+    @Override
+    public OrderBy.Append append(String literal) {
+      builder.append(literal);
+      return this;
+    }
+
+    @Override
+    public OrderBy.Append parse(String raw) {
+      builder.append(parser.parse(raw));
+      return this;
     }
-    return p.toStringFormat();
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java

@@ -7,7 +7,6 @@ import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.core.OrmQueryRequest;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
@@ -178,10 +177,7 @@ public final class CQueryPredicates {
 
     BeanPropertyAssocMany<?> manyProperty = request.determineMany();
     if (buildSql) {
-      String logicalOrderBy = deriveOrderByWithMany(request.manyPropertyForOrderBy());
-      if (logicalOrderBy != null) {
-        dbOrderBy = deployParser.parse(logicalOrderBy);
-      }
+      dbOrderBy = deriveOrderByWithMany(deployParser, request.manyPropertyForOrderBy());
       // create a copy of the includes required to support the orderBy
       orderByIncludes = new HashSet<>(deployParser.includes());
     }
@@ -241,49 +237,47 @@ public final class CQueryPredicates {
     }
   }
 
-  private String parseOrderBy() {
+  private String parseOrderBy(DeployParser parser) {
     OrderBy<?> orderBy = query.getOrderBy();
     if (orderBy == null) {
       return null;
     }
-    return CQueryOrderBy.parse(request.descriptor(), orderBy);
+    return CQueryOrderBy.parse(parser, request.descriptor(), orderBy);
   }
 
   /**
    * There is a many property we need to make sure the ordering is appropriate.
    */
-  private String deriveOrderByWithMany(BeanPropertyAssocMany<?> manyProp) {
+  private String deriveOrderByWithMany(DeployParser parser, BeanPropertyAssocMany<?> manyProp) {
+    String orderBy = parseOrderBy(parser);
     if (manyProp == null) {
-      return parseOrderBy();
+      return orderBy;
     }
-    String orderBy = parseOrderBy();
-    BeanDescriptor<?> desc = request.descriptor();
-    String orderById = desc.defaultOrderBy();
+    String orderById = parser.parse(request.descriptor().defaultOrderBy());
     if (orderBy == null) {
       orderBy = orderById;
     }
     // check for default ordering on the many property...
     String manyOrderBy = manyProp.fetchOrderBy();
     if (manyOrderBy != null) {
-      orderBy = orderBy + ", " + CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy);
+      orderBy = orderBy + ", " + parser.parse(CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy));
     }
     if (request.isFindById()) {
       // only one master bean so should be fine...
       return orderBy;
     }
-    if (orderBy.startsWith(orderById)) {
-      return orderBy;
-    }
     // more than one top level row may be returned so
     // we need to make sure their is an order by on the
     // top level first (to ensure master/detail construction).
-    int manyPos = orderBy.indexOf(manyProp.name());
-    int idPos = orderBy.indexOf(" " + orderById);
+    int idPos = orderBy.indexOf(orderById);
+    if (idPos == 0) {
+      return orderBy;
+    }
+    int manyPos = orderBy.indexOf("${" + manyProp.name() + "}");
     if (manyPos == -1) {
       // no ordering of the many
       if (idPos == -1) {
         // append the orderById so that master level objects are ordered
-        // even if the orderBy is not unique for the master object
         return orderBy + ", " + orderById;
       }
       // orderById is already in the order by clause
@@ -292,7 +286,7 @@ public final class CQueryPredicates {
     if (idPos == -1 || idPos >= manyPos) {
       if (idPos > manyPos) {
         // there was an error with the order by...
-        String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name()
+        String msg = "A Query on [" + request.descriptor() + "] includes a join to a 'many' association [" + manyProp.name()
         + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById
         + "] must come before the many property [" + manyProp.name() + "] in the orderBy."
         + " Ebean has automatically modified the orderBy clause to do this.";

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -2,30 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
-import io.ebean.CacheMode;
-import io.ebean.CountDistinctOrder;
-import io.ebean.Database;
-import io.ebean.DtoQuery;
-import io.ebean.Expression;
-import io.ebean.ExpressionFactory;
-import io.ebean.ExpressionList;
-import io.ebean.FetchConfig;
-import io.ebean.FetchGroup;
-import io.ebean.FetchPath;
-import io.ebean.FutureIds;
-import io.ebean.FutureList;
-import io.ebean.FutureRowCount;
-import io.ebean.OrderBy;
-import io.ebean.PagedList;
-import io.ebean.PersistenceContextScope;
-import io.ebean.ProfileLocation;
-import io.ebean.Query;
-import io.ebean.QueryIterator;
-import io.ebean.QueryType;
-import io.ebean.RawSql;
-import io.ebean.Transaction;
-import io.ebean.UpdateQuery;
-import io.ebean.Version;
+import io.ebean.*;
 import io.ebean.service.SpiFetchGroupQuery;
 import io.ebeaninternal.api.SpiQueryFetch;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
@@ -230,6 +207,11 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
+  @Override
+  public Query<T> also(Consumer<QueryBuilder<?, ?>> apply) {
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+  }
+
   @Override
   public Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> apply) {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -293,6 +293,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public Query<T> also(Consumer<QueryBuilder<?, ?>> apply) {
+    apply.accept(this);
+    return this;
+  }
+
   @Override
   public Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> consumer) {
     if (predicate.getAsBoolean()) {
@@ -1367,7 +1373,9 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public final Query<T> select(FetchGroup<T> fetchGroup) {
-    this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
+    if (fetchGroup != null) {
+      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
+    }
     return this;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -609,6 +609,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
     // do nothing
   }
 
+  @Override
+  public void deactivateExternal() {
+    this.active = false;
+  }
+
   /**
    * Return true if the transaction is active.
    */

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -1082,6 +1082,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return active;
   }
 
+  @Override
+  public void deactivateExternal() {
+    this.active = false;
+  }
+
   @Override
   public final boolean isPersistCascade() {
     return persistCascade;

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java

@@ -94,9 +94,14 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
     // check current Ebean transaction
     SpiTransaction currentEbeanTransaction = scope.inScope();
     if (currentEbeanTransaction != null) {
-      // NOT expecting this so log WARNING
-      log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
-      return currentEbeanTransaction;
+      if (currentEbeanTransaction.isActive()) {
+        // NOT expecting this so log WARNING
+        log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
+        return currentEbeanTransaction;
+      } else {
+        log.log(DEBUG, "JTA Transaction - clearing inActive Ebean transaction {0}", currentEbeanTransaction.id());
+        scope.clearExternal();
+      }
     }
 
     UserTransaction ut = userTransaction();
@@ -186,27 +191,27 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
 
     @Override
     public void afterCompletion(int status) {
-      switch (status) {
-        case Status.STATUS_COMMITTED:
-          log.log(DEBUG, "Jta Txn [{0}] committed", transaction.id());
-          transaction.postCommit();
-          // Remove this transaction object as it is completed
-          transactionManager.scope().clearExternal();
-          break;
+      try {
+        switch (status) {
+          case Status.STATUS_COMMITTED:
+            log.log(DEBUG, "Jta Txn [{0}] committed", transaction.id());
+            transaction.postCommit();
+            break;
 
-        case Status.STATUS_ROLLEDBACK:
-          log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id());
-          transaction.postRollback(null);
-          // Remove this transaction object as it is completed
-          transactionManager.scope().clearExternal();
-          break;
+          case Status.STATUS_ROLLEDBACK:
+            log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id());
+            transaction.postRollback(null);
+            break;
 
-        default:
-          log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.id(), status);
+          default:
+            log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.id(), status);
+        }
+      } finally {
+        transaction.deactivateExternal();
+        transactionManager.scope().clearExternal();
+        // No matter the completion status of the transaction, we release the connection we got from the pool.
+        JdbcClose.close(transaction.internalConnection());
       }
-
-      // No matter the completion status of the transaction, we release the connection we got from the pool.
-      JdbcClose.close(transaction.internalConnection());
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -117,6 +117,10 @@ final class NoTransaction implements SpiTransaction {
     // do nothing
   }
 
+  @Override
+  public void deactivateExternal() {
+    // do nothing
+  }
 
   @Override
   public boolean isLogSql() {

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

@@ -47,7 +47,7 @@ module io.ebean.core {
   exports io.ebeanservice.docstore.api.support to io.ebean.elastic, io.ebean.test;
   exports io.ebeanservice.docstore.api.mapping to io.ebean.elastic;
 
-  exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test, io.ebean.elastic, io.ebean.spring.txn;
+  exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.postgis.types;
   exports io.ebeaninternal.api.json to io.ebean.test;
   exports io.ebeaninternal.json to io.ebean.test;
   exports io.ebeaninternal.server.autotune to io.ebean.autotune;
@@ -69,7 +69,7 @@ module io.ebean.core {
   exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic;
   exports io.ebeaninternal.server.rawsql to io.ebean.test;
   exports io.ebeaninternal.server.json to io.ebean.test, io.ebean.elastic;
-  exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test;
+  exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test, io.ebean.postgis.types;
   exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache;
   exports io.ebeaninternal.server.util to io.ebean.querybean;
 

ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java

@@ -196,10 +196,6 @@ public class InitDataSourceTest {
     public void dataSourceDown(DataSource dataSource, SQLException reason) {
     }
 
-    @Override
-    public void dataSourceWarning(DataSource dataSource, String msg) {
-    }
-
   }
 
   @Test

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-ddl-generator/src/main/java/module-info.java

@@ -15,4 +15,6 @@ module io.ebean.ddl.generator {
 
   // support existing tests
   exports io.ebeaninternal.extraddl.model to io.ebean.test;
+
+  opens io.ebeaninternal.extraddl.model to jakarta.xml.bind;
 }

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-net-postgis-types/.editorconfig

@@ -0,0 +1,17 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+spaces_around_operators = true
+max_line_length = 130
+
+[pom.xml]
+# Because of <project... line
+max_line_length = 999

ebean-net-postgis-types/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

ebean-net-postgis-types/README.md

@@ -0,0 +1,3 @@
+# ebean.postgis.types
+
+Ebean support for Postgres Geometry types

ebean-net-postgis-types/pom.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>14.5.0</version>
+  </parent>
+
+  <name>ebean net postgis types</name>
+  <artifactId>ebean-net-postgis-types</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2023.1.0</postgis.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>14.5.0</version>
+    </dependency>
+
+    <!-- provided scope -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>14.5.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+    <!-- expected to be provided -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.7.2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-test</artifactId>
+      <version>14.5.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>logback</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <!-- for testing -->
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.40</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+  </build>
+
+</project>

ebean-net-postgis-types/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java

@@ -0,0 +1,23 @@
+package io.ebean.postgis;
+
+import io.ebean.DatabaseBuilder;
+import io.ebean.core.type.ExtraTypeFactory;
+import io.ebean.core.type.ScalarType;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class PostgisExtraTypeFactory implements ExtraTypeFactory {
+
+  @Override
+  public List<ScalarType<?>> createTypes(DatabaseBuilder.Settings config, Object objectMapper) {
+    return Arrays.asList(
+      new ScalarTypePgisPoint(),
+      new ScalarTypePgisPolygon(),
+      new ScalarTypePgisLineString(),
+      new ScalarTypePgisMultiPolygon(),
+      new ScalarTypePgisMultiPoint(),
+      new ScalarTypePgisMultiLineString()
+    );
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java

@@ -0,0 +1,13 @@
+package io.ebean.postgis;
+
+import io.ebean.DatabaseBuilder;
+import io.ebeaninternal.api.GeoTypeProvider;
+import io.ebeaninternal.server.type.GeoTypeBinder;
+
+public class PostgisGeoTypeBindProvider implements GeoTypeProvider {
+
+  @Override
+  public GeoTypeBinder createBinder(DatabaseBuilder.Settings config) {
+    return new PostgisGeoTypeBinder();
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java

@@ -0,0 +1,21 @@
+package io.ebean.postgis;
+
+import io.ebean.core.type.DataBinder;
+import io.ebeaninternal.server.type.GeoTypeBinder;
+import net.postgis.jdbc.PGgeometryLW;
+import net.postgis.jdbc.geometry.Geometry;
+
+import java.sql.SQLException;
+
+class PostgisGeoTypeBinder implements GeoTypeBinder {
+
+  PostgisGeoTypeBinder() {
+  }
+
+  @Override
+  public void bind(DataBinder binder, int dataType, Object data) throws SQLException {
+      if (data instanceof Geometry) {
+        binder.setObject(new PGgeometryLW((Geometry) data));
+      }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java

@@ -0,0 +1,118 @@
+package io.ebean.postgis;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
+import net.postgis.jdbc.PGgeometry;
+import net.postgis.jdbc.PGgeometryLW;
+import net.postgis.jdbc.geometry.Geometry;
+import net.postgis.jdbc.geometry.GeometryBuilder;
+import net.postgis.jdbc.geometry.binary.BinaryParser;
+import org.postgresql.util.PGobject;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.sql.SQLException;
+import java.sql.Types;
+
+abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
+
+  private final int jdbcType;
+
+  private final Class<T> cls;
+
+  ScalarTypePgisBase(int jdbcType, Class<T> cls) {
+    this.jdbcType = jdbcType;
+    this.cls = cls;
+  }
+
+  @Override
+  public void bind(DataBinder binder, T value) throws SQLException {
+    if (value == null) {
+      binder.setNull(Types.NULL);
+    } else {
+      binder.setObject(new PGgeometryLW(value));
+    }
+  }
+
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public T read(DataReader reader) throws SQLException {
+    Object object = reader.getObject();
+    if (object == null) {
+      return null;
+    }
+    if (object instanceof PGgeometryLW) {
+      return (T) ((PGgeometryLW) object).getGeometry();
+
+    } else if (object instanceof PGgeometry) {
+      return (T) ((PGgeometry) object).getGeometry();
+
+    } else if (object instanceof PGobject) {
+      return (T) GeometryBuilder.geomFromString(((PGobject) object).getValue(), new BinaryParser(), false);
+
+    } else {
+      throw new IllegalStateException("Could not convert from " + object.getClass() + " to " + cls);
+    }
+  }
+
+
+  @Override
+  public boolean jdbcNative() {
+    return true;
+  }
+
+  @Override
+  public int jdbcType() {
+    return jdbcType;
+  }
+
+  @Override
+  public Class<T> type() {
+    return cls;
+  }
+
+  @Override
+  public T readData(DataInput dataInput) {
+    return null;
+  }
+
+  @Override
+  public void writeData(DataOutput dataOutput, T v) {
+
+  }
+
+  @Override
+  public Object toJdbcType(Object value) {
+    return null;
+  }
+
+  @Override
+  public T toBeanType(Object value) {
+    return null;
+  }
+
+  @Override
+  public String formatValue(T value) {
+    return value.toString();
+  }
+
+  @Override
+  public DocPropertyType docType() {
+    return null;
+  }
+
+  @Override
+  public T jsonRead(JsonParser parser) {
+    return null;
+  }
+
+  @Override
+  public void jsonWrite(JsonGenerator writer, T value) {
+
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.LineString;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisLineString extends ScalarTypePgisBase<LineString> {
+
+  public ScalarTypePgisLineString() {
+    super(ExtraDbTypes.LINESTRING, LineString.class);
+  }
+
+  @Override
+  public LineString parse(String value) {
+    try {
+      return new LineString(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.MultiLineString;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisMultiLineString extends ScalarTypePgisBase<MultiLineString> {
+
+  public ScalarTypePgisMultiLineString() {
+    super(ExtraDbTypes.MULTILINESTRING, MultiLineString.class);
+  }
+
+  @Override
+  public MultiLineString parse(String value) {
+    try {
+      return new MultiLineString(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.MultiPoint;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisMultiPoint extends ScalarTypePgisBase<MultiPoint> {
+
+  public ScalarTypePgisMultiPoint() {
+    super(ExtraDbTypes.MULTIPOINT, MultiPoint.class);
+  }
+
+  @Override
+  public MultiPoint parse(String value) {
+    try {
+      return new MultiPoint(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.MultiPolygon;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisMultiPolygon extends ScalarTypePgisBase<MultiPolygon> {
+
+  public ScalarTypePgisMultiPolygon() {
+    super(ExtraDbTypes.MULTIPOLYGON, MultiPolygon.class);
+  }
+
+  @Override
+  public MultiPolygon parse(String value) {
+    try {
+      return new MultiPolygon(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.Point;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisPoint extends ScalarTypePgisBase<Point> {
+
+  public ScalarTypePgisPoint() {
+    super(ExtraDbTypes.POINT, Point.class);
+  }
+
+  @Override
+  public Point parse(String value) {
+    try {
+      return new Point(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java

@@ -0,0 +1,22 @@
+package io.ebean.postgis;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import net.postgis.jdbc.geometry.Polygon;
+
+import java.sql.SQLException;
+
+public class ScalarTypePgisPolygon extends ScalarTypePgisBase<Polygon> {
+
+  public ScalarTypePgisPolygon() {
+    super(ExtraDbTypes.POLYGON, Polygon.class);
+  }
+
+  @Override
+  public Polygon parse(String value) {
+    try {
+      return new Polygon(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

ebean-net-postgis-types/src/main/java/module-info.java

@@ -0,0 +1,17 @@
+import io.ebean.core.type.ExtraTypeFactory;
+import io.ebeaninternal.api.GeoTypeProvider;
+
+/**
+ * Provides GeoTypeProvider and ExtraTypeFactory.
+ */
+module io.ebean.postgis.types {
+
+  provides ExtraTypeFactory with io.ebean.postgis.PostgisExtraTypeFactory;
+  provides GeoTypeProvider with io.ebean.postgis.PostgisGeoTypeBindProvider;
+
+  requires io.ebean.core;
+  requires org.postgresql.jdbc;
+  requires net.postgis.jdbc;
+  requires net.postgis.jdbc.geometry;
+  requires com.fasterxml.jackson.core;
+}

ebean-net-postgis-types/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory

@@ -0,0 +1 @@
+io.ebean.postgis.PostgisExtraTypeFactory

ebean-net-postgis-types/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider

@@ -0,0 +1 @@
+io.ebean.postgis.PostgisGeoTypeBindProvider

ebean-net-postgis-types/src/test/java/org/example/domain/BaseEntity.java

@@ -0,0 +1,20 @@
+package org.example.domain;
+
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+
+@MappedSuperclass
+abstract class BaseEntity {
+
+  @Id
+  Long id;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+}

ebean-net-postgis-types/src/test/java/org/example/domain/CachedBean.java

@@ -0,0 +1,43 @@
+package org.example.domain;
+
+import io.ebean.annotation.Cache;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import net.postgis.jdbc.geometry.Point;
+import net.postgis.jdbc.geometry.Polygon;
+
+@Entity
+@Table(name="mybean_cached")
+@Cache
+public class CachedBean extends BaseEntity {
+  String name;
+
+  Point point;
+
+  Polygon polygon;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Point getPoint() {
+    return point;
+  }
+
+  public void setPoint(Point point) {
+    this.point = point;
+  }
+
+  public Polygon getPolygon() {
+    return polygon;
+  }
+
+  public void setPolygon(Polygon polygon) {
+    this.polygon = polygon;
+  }
+}

ebean-net-postgis-types/src/test/java/org/example/domain/MyBean.java

@@ -0,0 +1,92 @@
+package org.example.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import net.postgis.jdbc.geometry.*;
+
+@Entity
+@Table(name="mybean")
+public class MyBean extends BaseEntity {
+
+  String name;
+
+  Point point;
+
+  Polygon poly;
+
+  LineString lineString;
+
+  MultiLineString multiLineString;
+
+  MultiPoint multiPoint;
+
+  MultiPolygon mpoly;
+
+  @Column(columnDefinition = "geometry(Point, 4326)", unique = true)
+  Point wgs84Point;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Point getPoint() {
+    return point;
+  }
+
+  public void setPoint(Point point) {
+    this.point = point;
+  }
+
+  public Polygon getPoly() {
+    return poly;
+  }
+
+  public void setPoly(Polygon poly) {
+    this.poly = poly;
+  }
+
+  public LineString getLineString() {
+    return lineString;
+  }
+
+  public void setLineString(LineString lineString) {
+    this.lineString = lineString;
+  }
+
+  public MultiLineString getMultiLineString() {
+    return multiLineString;
+  }
+
+  public void setMultiLineString(MultiLineString multiLineString) {
+    this.multiLineString = multiLineString;
+  }
+
+  public MultiPoint getMultiPoint() {
+    return multiPoint;
+  }
+
+  public void setMultiPoint(MultiPoint multiPoint) {
+    this.multiPoint = multiPoint;
+  }
+
+  public MultiPolygon getMpoly() {
+    return mpoly;
+  }
+
+  public void setMpoly(MultiPolygon mpoly) {
+    this.mpoly = mpoly;
+  }
+
+  public Point getWgs84Point() {
+    return wgs84Point;
+  }
+
+  public void setWgs84Point(final Point wgs84Point) {
+    this.wgs84Point = wgs84Point;
+  }
+}

ebean-net-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java

@@ -0,0 +1,84 @@
+package org.example.domain;
+
+import io.ebean.DB;
+import net.postgis.jdbc.geometry.Point;
+import net.postgis.jdbc.geometry.Polygon;
+import org.junit.jupiter.api.Test;
+
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestCacheSerialization {
+  @Test
+  public void testCache() throws SQLException {
+    Point p1=new Point(1.0, 2.0);
+    p1.setSrid(4674);
+
+    Polygon pol=new Polygon("SRID=4674;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(1 1, 1 2, 2 2, 2 1, 1 1))");
+
+    CachedBean tb=new CachedBean();
+    tb.setId(2080L);
+    tb.setName("Serialize Test");
+    tb.setPoint(p1);
+    tb.setPolygon(pol);
+
+    DB.insert(tb);
+
+    CachedBean r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(p1, r1.getPoint());
+    assertEquals(pol, r1.getPolygon());
+
+    CachedBean r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(p1, r2.getPoint());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertEquals(pol, r2.getPolygon());
+
+    DB.delete(tb);
+
+  }
+
+  @Test
+  public void testNullCache() throws SQLException {
+    Point p1=new Point(1.0, 2.0);
+    p1.setSrid(4674);
+    Polygon pol=new Polygon("SRID=4674;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(1 1, 1 2, 2 2, 2 1, 1 1))");
+
+    CachedBean tb=new CachedBean();
+    tb.setId(2081L);
+    tb.setName("Serialize Test");
+    tb.setPoint(p1);
+    tb.setPolygon(null);
+
+    DB.insert(tb);
+
+    CachedBean r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(p1, r1.getPoint());
+    assertNull(r1.getPolygon());
+
+    CachedBean r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(p1, r2.getPoint());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertNull(r1.getPolygon());
+
+    tb.setPoint(null);
+    tb.setPolygon(pol);
+
+    DB.save(tb);
+
+    r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(pol, r1.getPolygon());
+    assertNull(r1.getPoint());
+
+    r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(pol, r2.getPolygon());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertNull(r1.getPoint());
+
+    DB.delete(tb);
+
+  }
+}

ebean-net-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java

@@ -0,0 +1,57 @@
+package org.example.domain;
+
+import io.ebean.DB;
+import net.postgis.jdbc.geometry.*;
+import org.junit.jupiter.api.Test;
+
+import java.sql.SQLException;
+import java.util.List;
+
+public class TestInsertQuery {
+
+  /**
+   * Not automated this test yet.
+   */
+  @Test
+  public void insert() throws SQLException {
+
+
+    List<MyBean> list = DB.find(MyBean.class).findList();
+    for (MyBean MyBean : list) {
+      System.out.println(MyBean.getPoint());
+    }
+
+    List<MyBean> list1 = DB.find(MyBean.class)
+        .where()
+        .raw("st_within(st_pointfromwkb(st_point(?, ?), 4674), poly)", 1.9, 1.9)
+        .findList();
+
+    System.out.println(list1);
+
+
+    Point point = new Point("SRID=4674;POINT(2.8 1.7)");
+    Polygon poly =  new Polygon("SRID=4674;POLYGON((2 2, 2 -2, -2 -2, -2 2, 2 2))");
+    LineString lineString = new LineString("SRID=4674;LINESTRING(0 0, 1 2)");
+    MultiLineString multiLineString = new MultiLineString("SRID=4674;MULTILINESTRING((0 0, 1 2), (1 2, 3 -1))");
+    MultiPoint multiPoint = new MultiPoint("SRID=4674;MULTIPOINT((2 3), (7 8))");
+    MultiPolygon mpoly =  new MultiPolygon("SRID=4674;MULTIPOLYGON(((1 1, 1 -1, -1 -1, -1 1, 1 1)),((1 1, 3 1, 3 3, 1 3, 1 1)))");
+
+    MyBean p = new MyBean();
+    p.setName("me at "+System.currentTimeMillis());
+    p.setPoint(point);
+    p.setPoly(poly);
+    p.setLineString(lineString);
+    p.setMultiLineString(multiLineString);
+    p.setMultiPoint(multiPoint);
+    p.setMpoly(mpoly);
+
+    DB.save(p);
+
+    List<String> content =
+      DB.find(MyBean.class)
+      .select("ST_AsText(lineString)::String")
+      .findSingleAttributeList();
+
+    System.out.println(content);
+  }
+}

ebean-net-postgis-types/src/test/resources/application-test.yml

@@ -0,0 +1,18 @@
+ebean:
+  dbSchema: mynetgisapp
+  geometrySRID: 4674
+
+  test:
+#    useDocker: false
+#    shutdown: stop # stop | remove
+    platform: postgis
+    ddlMode: dropCreate # none | dropCreate | create | migration | createOnly | migrationDropCreate
+    dbName: mynetgisapp
+
+    postgis:
+      containerName: ebeanbuild_postgis2
+      port: 9433
+      image: ghcr.io/baosystems/postgis:15
+#      extensions: postgis
+#      url: jdbc:postgresql_lwgis://localhost:6432/mygisapp
+#      driver: org.postgis.DriverWrapperLW

ebean-net-postgis-types/src/test/resources/logback-test.xml

@@ -0,0 +1,23 @@
+<configuration scan="true" scanPeriod="3 seconds">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <!-- Logging for SQL etc -->
+
+    <logger name="io.ebean.docker" level="TRACE"/>
+
+    <logger name="io.ebean.SQL" level="TRACE"/>
+    <logger name="io.ebean.TXN" level="TRACE"/>
+    <logger name="io.ebean.SUM" level="TRACE"/>
+    <logger name="io.ebean.DDL" level="TRACE"/>
+
+</configuration>

ebean-net-postgis-types/src/test/resources/notused-test-ebean.properties

@@ -0,0 +1,18 @@
+
+## when running tests
+
+ebean.ddl.generate=true
+#ebean.ddl.run=true
+#ebean.ddl.createOnly=true
+
+ebean.geometrySRID=4674
+
+datasource.default=db
+
+datasource.db.username=pgis
+datasource.db.password=pgis
+datasource.db.databaseUrl=jdbc:postgresql_lwgis://127.0.0.1:5432/pgis
+datasource.db.databaseDriver=net.postgis.jdbc.DriverWrapperLW
+
+
+

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java

@@ -35,6 +35,8 @@ public class TestCacheSerialization {
     assertEquals(p1, r2.getPoint());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
     assertEquals(pol, r2.getPolygon());
 
+    DB.delete(tb);
+
   }
 
   @Test
@@ -76,5 +78,7 @@ public class TestCacheSerialization {
     assertEquals(pol, r2.getPolygon());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
     assertNull(r1.getPoint());
 
+    DB.delete(tb);
+
   }
 }

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,14 +63,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java

@@ -44,6 +44,7 @@ import java.util.Collection;
  * @param <T> the entity bean type (normal entity bean type e.g. Customer)
  * @param <R> the specific query bean type (e.g. QCustomer)
  */
+//public interface IQueryBean<T, R extends IQueryBean<T, R>> extends QueryBuilder<R, T> {
 public interface IQueryBean<T, R> extends QueryBuilder<R, T> {
 
   /**

ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java

@@ -57,6 +57,7 @@ import java.util.stream.Stream;
  * @param <R> the specific root query bean type (e.g. QCustomer)
  */
 @NonNullApi
+//public abstract class QueryBean<T, R extends QueryBean<T, R>> implements IQueryBean<T, R> {
 public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
 
   /**
@@ -88,14 +89,14 @@ public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
   /**
    * Construct using the type of bean to query on and the default database.
    */
-  public QueryBean(Class<T> beanType) {
+  protected QueryBean(Class<T> beanType) {
     this(beanType, DB.getDefault());
   }
 
   /**
    * Construct using the type of bean to query on and a given database.
    */
-  public QueryBean(Class<T> beanType, Database database) {
+  protected QueryBean(Class<T> beanType, Database database) {
     this(database.find(beanType));
   }
 
@@ -119,7 +120,7 @@ public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
    * Construct using a query.
    */
   @SuppressWarnings("unchecked")
-  public QueryBean(Query<T> query) {
+  protected QueryBean(Query<T> query) {
     this.query = query;
     this.root = (R) this;
   }
@@ -129,7 +130,7 @@ public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
    * values for select() and fetch().
    */
   @SuppressWarnings("unchecked")
-  public QueryBean(boolean aliasDummy) {
+  protected QueryBean(boolean aliasDummy) {
     this.query = null;
     this.root = (R) this;
   }
@@ -275,6 +276,13 @@ public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
     return root;
   }
 
+
+  @Override
+  public R also(Consumer<QueryBuilder<?, ?>> apply) {
+    apply.accept(this);
+    return root;
+  }
+
   @Override
   public final R alsoIf(BooleanSupplier predicate, Consumer<R> apply) {
     if (predicate.getAsBoolean()) {

ebean-querybean/src/test/java/org/querytest/QOrderTest.java

@@ -142,6 +142,22 @@ class QOrderTest {
       .findList();
   }
 
+  @Test
+  void viaNullFetchGraph() {
+    DB.getDefault();
+    LoggedSql.start();
+
+    FetchGroup<Order> fg = null;
+    new QOrder()
+      .select(fg)
+      .status.eq(Order.Status.NEW)
+      .findList();
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select /* QOrderTest.viaNullFetchGraph */ t0.id, ");
+  }
+
   @Test
   void viaFetchGraph() {
 

ebean-querybean/src/test/java/org/querytest/QueryAlsoIfTest.java

@@ -1,9 +1,12 @@
 package org.querytest;
 
+import io.ebean.QueryBuilder;
 import org.example.domain.Customer;
 import org.example.domain.query.QCustomer;
 import org.junit.jupiter.api.Test;
 
+import java.util.function.Consumer;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.example.domain.query.QCustomer.Alias.name;
 
@@ -11,6 +14,32 @@ class QueryAlsoIfTest {
 
   int dummy = 1;
 
+  @Test
+  void also() {
+    var myPager = new MyPager(10);
+    var q = new QCustomer()
+      .select(name)
+      .also(myPager)
+      .query();
+
+    q.findList();
+    assertThat(q.getGeneratedSql()).contains("select /* QueryAlsoIfTest.also */ t0.id, t0.name from be_customer t0 limit 10");
+  }
+
+  static class MyPager implements Consumer<QueryBuilder<?,?>> {
+
+    final int maxRows;
+
+    MyPager(int maxRows) {
+      this.maxRows = maxRows;
+    }
+
+    @Override
+    public void accept(QueryBuilder<?, ?> queryBuilder) {
+      queryBuilder.setMaxRows(maxRows);
+    }
+  }
+
   @Test
   void apply() {
     var q = new QCustomer()

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.3.0</version>
+    <version>14.5.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -13,51 +13,51 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.5.6</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>4.2.3</version>
+      <version>4.4.8</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.3.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>logback</artifactId>
-      <version>1.1</version>
+      <version>14.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.3.0</version>
+      <version>14.5.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java

@@ -11,11 +11,12 @@ public final class EncodeSerializable implements Encode {
   @Override
   public byte[] encode(Object value) {
     try {
-      ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream());
+      final var baos = new ByteArrayOutputStream();
+      final var oos = new ObjectOutputStream(baos);
       oos.writeObject(value);
       oos.flush();
       oos.close();
-      return new ByteArrayOutputStream().toByteArray();
+      return baos.toByteArray();
     } catch (IOException e) {
       throw new RuntimeException("Failed to decode cache data", e);
     }

ebean-redis/src/test/java/io/ebean/redis/encode/EncodeSerializableTest.java

@@ -0,0 +1,17 @@
+package io.ebean.redis.encode;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EncodeSerializableTest {
+
+  @Test
+  void encode() {
+    EncodeSerializable encodeSerializable = new EncodeSerializable();
+    byte[] asBytes = encodeSerializable.encode("HelloWorld");
+
+    Object result = encodeSerializable.decode(asBytes);
+    assertThat(result).isEqualTo("HelloWorld");
+  }
+}

ebean-redis/src/test/java/org/domain/OtherOne.java

@@ -0,0 +1,40 @@
+package org.domain;
+
+
+import io.ebean.annotation.Cache;
+import jakarta.persistence.Entity;
+
+/**
+ * Using Natural Key caching but no Near Caching so always hitting Redis.
+ */
+@SuppressWarnings("unused")
+@Cache(naturalKey = {"one", "two"})
+@Entity
+public class OtherOne extends EBase {
+
+  private final String one;
+  private final String two;
+  private String notes;
+
+  public OtherOne(String one, String two, String notes) {
+    this.one = one;
+    this.two = two;
+    this.notes = notes;
+  }
+
+  public String one() {
+    return one;
+  }
+
+  public String two() {
+    return two;
+  }
+
+  public String notes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}

ebean-redis/src/test/java/org/integration/IntegrationTest.java

@@ -3,10 +3,8 @@ package org.integration;
 import io.ebean.DB;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
-import org.domain.Person;
-import org.domain.RCust;
-import org.domain.UChild;
-import org.domain.UParent;
+import org.domain.*;
+import org.domain.query.QOtherOne;
 import org.domain.query.QPerson;
 import org.domain.query.QRCust;
 import org.junit.jupiter.api.Test;
@@ -148,6 +146,37 @@ class IntegrationTest {
     assertThat(stats2.getHitCount()).isEqualTo(3);
   }
 
+  @Test
+  void testOtherOne() {
+    DB.save(new OtherOne("A", "B", "ab"));
+    DB.save(new OtherOne("A", "C", "ac"));
+    DB.save(new OtherOne("B", "B", "bb"));
+
+    ServerCache nkeyCache = DB.cacheManager().naturalKeyCache(OtherOne.class);
+    nkeyCache.clear();
+    nkeyCache.statistics(true);
+
+    OtherOne ab0 = findOther("A", "B");
+    OtherOne ab1 = findOther("A", "B");
+    OtherOne ab2 = findOther("A", "B");
+    OtherOne bb = findOther("B", "B");
+
+    assertThat(ab0).isNotNull();
+    assertThat(ab1).isNotNull();
+    assertThat(ab2).isNotNull();
+    assertThat(bb).isNotNull();
+
+    ServerCacheStatistics statistics = nkeyCache.statistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(2);
+  }
+
+  private static OtherOne findOther(String a, String b) {
+    return new QOtherOne()
+      .one.eq(a)
+      .two.eq(b)
+      .findOne();
+  }
+
   @Test
   void test() throws InterruptedException {
 

ebean-redis/src/test/resources/logback-test.xml

@@ -1,14 +1,11 @@
-<configuration scan="true" scanPeriod="10 seconds">
+<configuration>
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>TRACE</level>
-    </filter>
     <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <root level="TRACE">
     <appender-ref ref="STDOUT"/>
   </root>