Drop java 11 support

.circleci/config.yml

@@ -301,27 +301,6 @@ jobs:
           command: |
             ./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.Firebird
       - save-test-results
-  testMSSQL:
-    <<: *defaults
-    working_directory: ~/querydsl
-    docker:
-      - image: velo/toolchains-4-ci-builds:with-21
-      - image: mcr.microsoft.com/mssql/server:2022-latest
-        environment:
-          - ACCEPT_EULA=Y
-          - SA_PASSWORD=Password1!
-          - MSSQL_PID=Express
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - querydsl-dependencies-{{ checksum "pom.xml" }}
-            - querydsl-dependencies-
-      - run:
-          name: 'Test'
-          command: |
-            ./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.SQLServer
-      - save-test-results
   testEmbedded:
     <<: *defaults
     working_directory: ~/querydsl
@@ -443,12 +422,6 @@ workflows:
             - 'Resolve dependencies'
           filters:
             <<: *all-branches
-      - testMSSQL:
-          name: 'Test SQL Server'
-          requires:
-            - 'Resolve dependencies'
-          filters:
-            <<: *all-branches
       - testEmbedded:
           name: 'Test Embedded databases'
           requires:

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.openfeign.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>6.10-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>Querydsl</name>
@@ -96,7 +96,7 @@
     <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>
@@ -1055,7 +1055,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.10-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.10-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.10-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.10-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.10-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.10-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.10-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.10-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.10-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.10-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.10-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.10-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-libraries</artifactId>

querydsl-libraries/querydsl-collections/pom.xml

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

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

@@ -163,8 +163,8 @@ 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());
     }

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-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.10-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-core</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;
     }

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

@@ -28,6 +28,7 @@
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.ValidatingVisitor;
 import com.querydsl.core.util.CollectionUtils;
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -50,7 +51,7 @@
  */
 public class DefaultQueryMetadata implements QueryMetadata, Cloneable {
 
-  private static final long serialVersionUID = 317736313966701232L;
+  @Serial private static final long serialVersionUID = 317736313966701232L;
 
   private boolean distinct;
 
@@ -158,7 +159,7 @@ private void addLastJoin() {
   public void addJoin(JoinType joinType, Expression<?> expr) {
     addLastJoin();
     if (!exprInJoins.contains(expr)) {
-      if (expr instanceof Path && ((Path<?>) expr).getMetadata().isRoot()) {
+      if (expr instanceof Path<?> path && path.getMetadata().isRoot()) {
         exprInJoins.add(expr);
       } else {
         validate(expr);
@@ -378,8 +379,7 @@ public void setValidatingVisitor(ValidatingVisitor visitor) {
 
   @Override
   public boolean equals(Object o) {
-    if (o instanceof QueryMetadata) {
-      var q = (QueryMetadata) o;
+    if (o instanceof QueryMetadata q) {
       return q.getFlags().equals(flags)
           && q.getGroupBy().equals(groupBy)
           && Objects.equals(q.getHaving(), having)

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

@@ -17,6 +17,7 @@
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.ParamExpression;
 import com.querydsl.core.types.Predicate;
+import java.io.Serial;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,7 @@
  */
 public final class EmptyMetadata implements QueryMetadata {
 
-  private static final long serialVersionUID = 134750105981272499L;
+  @Serial private static final long serialVersionUID = 134750105981272499L;
 
   public static final QueryMetadata DEFAULT = new EmptyMetadata();
 

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

@@ -17,6 +17,7 @@
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.util.CollectionUtils;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Objects;
@@ -31,7 +32,7 @@
 @Immutable
 public final class JoinExpression implements Serializable {
 
-  private static final long serialVersionUID = -1131755765747174886L;
+  @Serial private static final long serialVersionUID = -1131755765747174886L;
 
   @Nullable private final Predicate condition;
 
@@ -107,8 +108,7 @@ public int hashCode() {
   public boolean equals(Object o) {
     if (o == this) {
       return true;
-    } else if (o instanceof JoinExpression) {
-      var j = (JoinExpression) o;
+    } else if (o instanceof JoinExpression j) {
       return Objects.equals(condition, j.condition)
           && Objects.equals(target, j.target)
           && Objects.equals(type, j.type);

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

@@ -16,6 +16,7 @@
 import com.querydsl.core.annotations.Immutable;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.ExpressionUtils;
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -48,7 +49,7 @@ public enum Position {
     END
   }
 
-  private static final long serialVersionUID = -688265393547206465L;
+  @Serial private static final long serialVersionUID = -688265393547206465L;
 
   private final Expression<?> flag;
 
@@ -106,8 +107,8 @@ public int hashCode() {
   public boolean equals(Object obj) {
     if (obj == this) {
       return true;
-    } else if (obj instanceof JoinFlag) {
-      return ((JoinFlag) obj).flag.equals(flag);
+    } else if (obj instanceof JoinFlag joinFlag) {
+      return joinFlag.flag.equals(flag);
     } else {
       return false;
     }

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

@@ -13,6 +13,8 @@
  */
 package com.querydsl.core;
 
+import java.io.Serial;
+
 /**
  * {@code NonUniqueResultException} is thrown for query results where one result row is expected,
  * but multiple are retrieved.
@@ -21,7 +23,7 @@
  */
 public class NonUniqueResultException extends QueryException {
 
-  private static final long serialVersionUID = -1757423191400510323L;
+  @Serial private static final long serialVersionUID = -1757423191400510323L;
 
   public NonUniqueResultException() {
     super("Only one result is allowed for fetchOne calls");