Sync master into querydsl-7.0

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.openfeign.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>6.11-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>Querydsl</name>
@@ -87,6 +87,9 @@
   </distributionManagement>
 
   <properties>
+    <!-- removing old modules on 7.0 release -->
+    <japicmp.skip>true</japicmp.skip>
+
     <failIfNoTests>false</failIfNoTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.homepage>http://www.querydsl.com</project.homepage>
@@ -96,13 +99,13 @@
     <argLine>-Xms256m -Xmx512m</argLine>
 
     <!-- default bytecode version for src/main -->
-    <main.java.version>11</main.java.version>
+    <main.java.version>17</main.java.version>
     <latest.java.version>21</latest.java.version>
 
     <git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
 
     <junit.version>5.11.3</junit.version>
-    <ecj.version>3.33.0</ecj.version>
+    <ecj.version>3.40.0</ecj.version>
     <jdo.version>3.2.1</jdo.version>
     <springboot.version>3.4.0</springboot.version>
     <spring.version>6.2.1</spring.version>
@@ -125,17 +128,16 @@
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
     <!-- JPA deps -->
-    <hibernate.version>6.6.3.Final</hibernate.version>
+    <hibernate.version>7.0.0.Beta1</hibernate.version>
     <hibernate.validator.version>8.0.2.Final</hibernate.validator.version>
-    <eclipselink.version>4.0.4</eclipselink.version>
-    <jpa.version>3.1.0</jpa.version>
+    <eclipselink.version>5.0.0-B04</eclipselink.version>
+    <jpa.version>3.2.0</jpa.version>
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
 
     <assertj.version>3.26.3</assertj.version>
     <mvn.version>3.9.9</mvn.version>
     <guava.version>33.3.1-jre</guava.version>
     <codegen.version>0.6.8</codegen.version>
-    <mysema.lang.version>0.2.4</mysema.lang.version>
     <byte-buddy.version>1.15.11</byte-buddy.version>
     <slf4j.version>2.0.16</slf4j.version>
     <surefire.version>3.5.2</surefire.version>
@@ -1055,7 +1057,7 @@
                 <configuration>
                   <exportDatatables>true</exportDatatables>
                   <activeRecipes>
-                    <recipe>org.openrewrite.java.migrate.Java8toJava11</recipe>
+                    <recipe>org.openrewrite.java.migrate.UpgradeToJava17</recipe>
                   </activeRecipes>
                 </configuration>
               </execution>

querydsl-docs/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-docs</artifactId>

querydsl-examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-examples</artifactId>
@@ -27,10 +27,6 @@
     <module>querydsl-example-r2dbc-sql-codegen</module>
   </modules>
 
-  <properties>
-    <main.java.version>17</main.java.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

querydsl-examples/querydsl-example-jpa-guice/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-guice</artifactId>

querydsl-examples/querydsl-example-jpa-quarkus/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-quarkus</artifactId>

querydsl-examples/querydsl-example-jpa-spring/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-spring</artifactId>

querydsl-examples/querydsl-example-kotlin-codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-codegen</artifactId>
   <name>Querydsl example - Kotlin Codegen</name>

querydsl-examples/querydsl-example-kotlin-jpa/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin</artifactId>
   <name>Querydsl example - Kotlin JPA</name>

querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-mongodb</artifactId>
   <name>Querydsl example - Kotlin MongoDB</name>

querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-r2dbc-sql-codegen</artifactId>

querydsl-examples/querydsl-example-sql-guice/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-sql-guice</artifactId>

querydsl-examples/querydsl-example-sql-spring/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-sql-spring</artifactId>

querydsl-libraries/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-libraries</artifactId>
@@ -98,8 +98,6 @@
                     <exclude>org.hibernate:hibernate-envers:*:*:compile</exclude>
                     <exclude>org.hibernate.validator:hibernate-validator:*:*:compile</exclude>
                     <exclude>org.eclipse.persistence:eclipselink:*:*:compile</exclude>
-                    <exclude>org.datanucleus:javax.jdo:*:*:compile</exclude>
-                    <exclude>org.springframework.roo:org.springframework.roo.annotations:*:*:compile</exclude>
                     <exclude>org.mongodb.morphia:morphia:*:*:compile</exclude>
                     <exclude>org.joda:joda-money:*:*:compile</exclude>
                     <exclude>org.batoo.jpa:batoo-jpa:*:*:compile</exclude>
@@ -112,6 +110,9 @@
                     <exclude>jakarta.xml.bind:jakarta.xml.bind-api:*:*:compile</exclude>
                     <!-- Ban any API's that were moved to jakarta -->
                     <exclude>javax.*:*:*:*:*</exclude>
+                    <!-- Ban libraries that support was dropped -->
+                    <exclude>org.datanucleus:javax.jdo:*:*:*</exclude>
+                    <exclude>org.springframework.roo:org.springframework.roo.annotations:*:*:compile</exclude>
                     <!-- The following database drivers should be in test scope -->
                     <exclude>org.hsqldb:hsqldb:*:*:compile</exclude>
                     <exclude>com.h2database:h2:*:*:compile</exclude>

querydsl-libraries/querydsl-collections/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.github.openfeign.querydsl</groupId>

querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java

@@ -13,8 +13,7 @@
  */
 package com.querydsl.collections;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.NonUniqueResultException;
@@ -180,7 +179,7 @@ public <P> Q leftJoin(MapExpression<?, P> target, Path<P> alias) {
   public CloseableIterator<T> iterate() {
     @SuppressWarnings("unchecked") // This is the built type
     var projection = (Expression<T>) queryMixin.getMetadata().getProjection();
-    return new IteratorAdapter<>(fetch().iterator());
+    return CloseableIterator.of(fetch().iterator());
   }
 
   @Override

querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java

@@ -13,8 +13,8 @@
  */
 package com.querydsl.collections;
 
-import com.mysema.commons.lang.IteratorAdapter;
 import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.JoinExpression;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.QueryMetadata;
@@ -163,10 +163,10 @@ private List evaluateSingleSource(
     final List<Expression<?>> sources = Collections.<Expression<?>>singletonList(source);
     final Iterable<?> iterable = iterables.values().iterator().next();
     List<?> list;
-    if (iterable instanceof List) {
-      list = (List) iterable;
+    if (iterable instanceof List<?> list1) {
+      list = list1;
     } else {
-      list = IteratorAdapter.asList(iterable.iterator());
+      list = CloseableIterator.asList(iterable.iterator());
     }
 
     // from & where

querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/MultiComparator.java

@@ -15,6 +15,7 @@
 
 import com.querydsl.codegen.utils.Evaluator;
 import com.querydsl.core.util.NullSafeComparableComparator;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Comparator;
 
@@ -29,7 +30,7 @@ public class MultiComparator<T> implements Comparator<T>, Serializable {
   @SuppressWarnings("unchecked")
   private static final Comparator<Object> naturalOrder = new NullSafeComparableComparator();
 
-  private static final long serialVersionUID = 1121416260773566299L;
+  @Serial private static final long serialVersionUID = 1121416260773566299L;
 
   private final boolean[] asc;
 
@@ -45,8 +46,8 @@ public MultiComparator(Evaluator<Object[]> ev, boolean[] directions, boolean[] n
 
   @Override
   public int compare(T o1, T o2) {
-    if (o1 instanceof Object[]) {
-      return innerCompare(ev.evaluate((Object[]) o1), ev.evaluate((Object[]) o2));
+    if (o1 instanceof Object[] objects) {
+      return innerCompare(ev.evaluate(objects), ev.evaluate((Object[]) o2));
     } else {
       return innerCompare(ev.evaluate(o1), ev.evaluate(o2));
     }

querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java

@@ -7,7 +7,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.annotations.QueryEntity;

querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java

@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.QueryModifiers;
 import com.querydsl.core.QueryResults;
 import com.querydsl.core.types.dsl.Expressions;
@@ -55,7 +55,8 @@ private void assertResultSize(int total, int size, QueryModifiers modifiers) {
     assertThat(createQuery(modifiers).fetchCount()).isEqualTo(total);
 
     // via iterator
-    assertThat(IteratorAdapter.asList(createQuery(modifiers).select(var).iterate())).hasSize(size);
+    assertThat(CloseableIterator.asList(createQuery(modifiers).select(var).iterate()))
+        .hasSize(size);
   }
 
   private CollQuery<?> createQuery(QueryModifiers modifiers) {

querydsl-libraries/querydsl-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-core</artifactId>
@@ -18,11 +18,6 @@
       <artifactId>annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.mysema.commons</groupId>
-      <artifactId>mysema-commons-lang</artifactId>
-      <version>${mysema.lang.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>

querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/BooleanBuilder.java

@@ -17,6 +17,7 @@
 import com.querydsl.core.types.ExpressionUtils;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.Visitor;
+import java.io.Serial;
 import java.util.Objects;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,7 +39,7 @@
  */
 public final class BooleanBuilder implements Predicate, Cloneable {
 
-  private static final long serialVersionUID = -4129485177345542519L;
+  @Serial private static final long serialVersionUID = -4129485177345542519L;
 
   @Nullable private Predicate predicate;
 
@@ -113,8 +114,8 @@ public BooleanBuilder clone() throws CloneNotSupportedException {
   public boolean equals(Object o) {
     if (o == this) {
       return true;
-    } else if (o instanceof BooleanBuilder) {
-      return Objects.equals(((BooleanBuilder) o).getValue(), predicate);
+    } else if (o instanceof BooleanBuilder builder) {
+      return Objects.equals(builder.getValue(), predicate);
     } else {
       return false;
     }