Merge branch 'master' into feature/migrate-avaje-lang-to-jspecify

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

@@ -20,7 +20,7 @@
  * @param <SELF> The type of the builder
  * @param <T>    The entity bean type
  */
-public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
+public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends QueryBuilderProjection<SELF, T> {
 
   /**
    * Set root table alias.

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

@@ -6,7 +6,7 @@
  * @param <SELF> The builder type
  * @param <T>    The entity bean type
  */
-public interface QueryBuilderProjection<SELF, T> {
+public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {
 
   /**
    * Apply the path properties replacing the select and fetch clauses.

ebean-api/src/main/resources/META-INF/ebean-version.mf

@@ -1 +1 @@
-ebean-version: 145
+ebean-version: 148

ebean-net-postgis-types/pom.xml

@@ -78,7 +78,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-postgis-types/pom.xml

@@ -86,7 +86,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-querybean/pom.xml

@@ -96,7 +96,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

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

@@ -44,7 +44,7 @@
  * @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 QueryBuilder<R, T> {
+public interface IQueryBean<T, R extends IQueryBean<T, R>> extends QueryBuilder<R, T> {
 
   /**
    * Return the underlying query.
@@ -64,6 +64,7 @@ public interface IQueryBean<T, R> extends QueryBuilder<R, T> {
    *
    * @param properties The properties to include in the DISTINCT ON clause.
    */
+  @SuppressWarnings("unchecked")
   R distinctOn(TQProperty<R, ?>... properties);
 
   /**

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

@@ -57,7 +57,7 @@
  * @param <R> the specific root query bean type (e.g. QCustomer)
  */
 @NullMarked
-public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
+public abstract class QueryBean<T, R extends QueryBean<T, R>> implements IQueryBean<T, R> {
 
   /**
    * The underlying query.

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

@@ -1,5 +1,9 @@
 package org.querytest;
 
+import io.ebean.QueryBuilder;
+import io.ebean.QueryBuilderProjection;
+import io.ebean.typequery.IQueryBean;
+import io.ebean.typequery.QueryBean;
 import org.example.domain.Customer;
 import org.example.domain.query.QCustomer;
 import org.junit.jupiter.api.Test;
@@ -46,4 +50,29 @@ void notApply() {
     q.findList();
     assertThat(q.getGeneratedSql()).isEqualTo("select /* QueryAlsoIfTest.notApply */ t0.id, t0.name from be_customer t0 where t0.name is not null");
   }
+
+  @Test
+  void queryBuilders_expect_fluidUseOfSELF() {
+    var q = new QCustomer();
+    checkQueryBean(q);
+    checkIQueryBean(q);
+    checkQueryBuilder(q);
+    checkQueryBuilderProjection(q);
+  }
+
+  private void checkQueryBean(QueryBean<?, ?> queryBean) {
+    queryBean.setFirstRow(10).setMaxRows(10);
+  }
+
+  private void checkIQueryBean(IQueryBean<?, ?> iQueryBean) {
+    iQueryBean.setFirstRow(10).setMaxRows(20);
+  }
+
+  private void checkQueryBuilderProjection(QueryBuilderProjection<?, ?> queryBuilder) {
+    queryBuilder.fetch("a").fetch("b");
+  }
+
+  private void checkQueryBuilder(QueryBuilder<?,?> queryBuilder) {
+    queryBuilder.setFirstRow(10).setMaxRows(10);
+  }
 }

ebean-redis/pom.xml

@@ -72,7 +72,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-spring-txn/pom.xml

@@ -99,7 +99,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/pom.xml

@@ -309,7 +309,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>

pom.xml

@@ -53,8 +53,8 @@
     <ebean-migration.version>14.2.0</ebean-migration.version>
     <ebean-test-containers.version>7.4</ebean-test-containers.version>
     <ebean-datasource.version>9.0</ebean-datasource.version>
-    <ebean-agent.version>14.7.0</ebean-agent.version>
-    <ebean-maven-plugin.version>14.7.0</ebean-maven-plugin.version>
+    <ebean-agent.version>14.7.1</ebean-agent.version>
+    <ebean-maven-plugin.version>14.7.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

tests/test-java16/pom.xml

@@ -52,7 +52,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.6.0</tile>
+            <tile>io.ebean.tile:enhancement:14.7.1</tile>
           </tiles>
         </configuration>
       </plugin>