Upgrade test sources to Java 25

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

.gitignore

@@ -23,6 +23,7 @@ derby.log
 **/.flattened-pom.xml
 
 .java-version
+.sdkmanrc
 .gitignore
 .checkstyle
 

pom.xml

@@ -89,7 +89,7 @@
 
     <!-- default bytecode version for src/main -->
     <main.java.version>17</main.java.version>
-    <latest.java.version>21</latest.java.version>
+    <latest.java.version>25</latest.java.version>
 
     <git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
 
@@ -1055,7 +1055,7 @@
                     <recipe>org.openrewrite.java.testing.junit5.AssertToAssertions</recipe>
                     <recipe>org.openrewrite.java.testing.assertj.JUnitToAssertj</recipe>
                     <recipe>org.openrewrite.java.testing.assertj.Assertj</recipe>
-                    <recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
+                    <recipe>org.openrewrite.java.migrate.UpgradeToJava25</recipe>
                   </activeRecipes>
                   <exclusions>
                     <exclusion>**/src/main/java/**</exclusion>

querydsl-libraries/querydsl-core/pom.xml

@@ -43,10 +43,16 @@
       <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 

querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/NameBasedProjection.java

@@ -31,8 +31,8 @@ private Map<String, Expression<?>> collectExpressions(EntityPathBase<?>... entit
         if (!map.containsKey(name)) {
           try {
             Object val = f.get(entity);
-            if (val instanceof Expression) {
-              map.put(name, (Expression<?>) val);
+            if (val instanceof Expression<?> expression) {
+              map.put(name, expression);
             }
           } catch (IllegalAccessException e) {
 

querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java

@@ -14,84 +14,88 @@
 package com.querydsl.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 
 import com.querydsl.core.types.ExpressionUtils;
 import com.querydsl.core.types.Templates;
 import com.querydsl.core.types.ToStringVisitor;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-public class BooleanBuilderTest {
+class BooleanBuilderTest {
 
   private final BooleanExpression first = BooleanConstant.TRUE;
 
   private final BooleanExpression second = BooleanConstant.FALSE;
 
   @Test
-  public void null_in_constructor() {
+  void null_in_constructor() {
     assertThat(new BooleanBuilder(null).getValue()).isNull();
   }
 
   @Test
-  public void and_empty() {
+  void and_empty() {
     var builder = new BooleanBuilder();
     builder.and(new BooleanBuilder());
     assertThat(ExpressionUtils.extract(builder)).isNull();
   }
 
   @Test
-  public void and_any_of() {
+  void and_any_of() {
     var builder = new BooleanBuilder();
     builder.andAnyOf(first, null);
     assertThat(builder.getValue()).isEqualTo(first);
   }
 
   @Test
-  public void and_any_of2() {
+  void and_any_of2() {
     var builder = new BooleanBuilder();
     builder.andAnyOf(null, first);
     assertThat(builder.getValue()).isEqualTo(first);
   }
 
   @Test
-  public void or_all_of() {
+  void or_all_of() {
     var builder = new BooleanBuilder();
     builder.orAllOf(first, null);
     assertThat(builder.getValue()).isEqualTo(first);
   }
 
   @Test
-  public void or_all_of2() {
+  void or_all_of2() {
     var builder = new BooleanBuilder();
     builder.orAllOf(null, first);
     assertThat(builder.getValue()).isEqualTo(first);
   }
 
-  @Test(expected = QueryException.class)
-  @Ignore
-  public void wrapped_booleanBuilder() {
-    new BooleanBuilder(new BooleanBuilder());
+  @Test
+  @Disabled
+  void wrapped_booleanBuilder() {
+    assertThatExceptionOfType(QueryException.class)
+        .isThrownBy(
+            () -> {
+              new BooleanBuilder(new BooleanBuilder());
+            });
   }
 
   @Test
-  public void basic() {
+  void basic() {
     //        new BooleanBuilder().and(first).or(second);
-    assertThat(new BooleanBuilder().and(first).or(second).toString())
-        .isEqualTo(first.or(second).toString());
+    assertThat(new BooleanBuilder().and(first).or(second)).hasToString(first.or(second).toString());
   }
 
   @Test
-  public void advanced() {
+  void advanced() {
     var builder = new BooleanBuilder();
     builder.andAnyOf(first, second, first);
     builder.orAllOf(first, second, first);
     assertThat(builder).hasToString("true || false || true || true && false && true");
   }
 
   @Test
-  public void if_then_else() {
+  void if_then_else() {
     var builder = new BooleanBuilder();
     builder.and(null);
     builder.or(null);
@@ -100,60 +104,59 @@ public void if_then_else() {
   }
 
   @Test
-  public void and_null_supported() {
+  void and_null_supported() {
     assertThat(first.and(null)).isEqualTo(first);
   }
 
   @Test
-  public void or_null_supported() {
+  void or_null_supported() {
     assertThat(first.or(null)).isEqualTo(first);
   }
 
   @Test
-  public void and_not() {
+  void and_not() {
     var builder = new BooleanBuilder();
     builder.and(first).andNot(second);
     assertThat(builder.getValue()).isEqualTo(first.and(second.not()));
   }
 
   @Test
-  public void or_not() {
+  void or_not() {
     var builder = new BooleanBuilder();
     builder.and(first).orNot(second);
     assertThat(builder.getValue()).isEqualTo(first.or(second.not()));
   }
 
   @Test
-  public void not() {
+  void not() {
     var builder = new BooleanBuilder();
     builder.and(first).not();
     assertThat(builder.getValue()).isEqualTo(first.not());
   }
 
   @Test
-  public void booleanBuilder_equals_booleanBuilder() {
+  void booleanBuilder_equals_booleanBuilder() {
     assertThat(new BooleanBuilder(first)).isEqualTo(new BooleanBuilder(first));
   }
 
   @Test
-  public void constant_equals_booleanBuilder() {
-    assertThat(first.equals(new BooleanBuilder(first))).isFalse();
+  void constant_equals_booleanBuilder() {
+    assertThat(first).isNotEqualTo(new BooleanBuilder(first));
   }
 
   @Test
-  public void booleanBuilder_equals_constant() {
-    assertThat(new BooleanBuilder(first).equals(first)).isFalse();
+  void booleanBuilder_equals_constant() {
+    assertThat(new BooleanBuilder(first)).isNotEqualTo(first);
   }
 
   @Test
-  public void hashCode_() {
-    assertThat(new BooleanBuilder(first).hashCode())
-        .isEqualTo(new BooleanBuilder(first).hashCode());
-    assertThat(new BooleanBuilder().hashCode()).isEqualTo(new BooleanBuilder().hashCode());
+  void hashCode_() {
+    assertThat(new BooleanBuilder(first)).hasSameHashCodeAs(new BooleanBuilder(first));
+    assertThat(new BooleanBuilder()).hasSameHashCodeAs(new BooleanBuilder());
   }
 
   @Test
-  public void toString_() {
+  void toString_() {
     var builder = new BooleanBuilder().and(first);
     assertThat(builder).hasToString("true");
     builder.or(Expressions.booleanPath("condition"));
@@ -173,7 +176,7 @@ public void toString_() {
   //    }
 
   @Test
-  public void accept() {
+  void accept() {
     var builder = new BooleanBuilder();
     builder.and(first);
     builder.or(Expressions.booleanPath("condition"));

querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java

@@ -27,10 +27,10 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** The Class CoverageTest. */
-public class CoverageTest {
+class CoverageTest {
 
   private MatchingFiltersFactory matchers =
       new MatchingFiltersFactory(QuerydslModule.COLLECTIONS, Target.MEM);
@@ -43,7 +43,7 @@ public class CoverageTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void test() throws IllegalArgumentException, IllegalAccessException {
+  void test() throws Exception {
     // make sure all Operators are covered in expression factory methods
     Set<Operator> usedOperators = new HashSet<>();
     List<Expression<?>> exprs = new ArrayList<>();

querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java

@@ -5,29 +5,32 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-public class CycleClassInitDependencyTest {
+class CycleClassInitDependencyTest {
 
   private static ClassLoader loader;
 
-  @BeforeClass
-  public static void overrideClassLoader() {
+  @BeforeAll
+  static void overrideClassLoader() {
     loader = Thread.currentThread().getContextClassLoader();
     Collection<URL> urls = new ClassGraph().getClasspathURLs();
     ClassLoader cl = URLClassLoader.newInstance(urls.toArray(new URL[0]), null /*no delegation*/);
     Thread.currentThread().setContextClassLoader(cl);
   }
 
-  @AfterClass
-  public static void resetClassLoader() {
+  @AfterAll
+  static void resetClassLoader() {
     Thread.currentThread().setContextClassLoader(loader);
   }
 
-  @Test(timeout = 2000)
-  public void test() {
+  @Test
+  @Timeout(value = 2000, unit = TimeUnit.MILLISECONDS)
+  void test() {
 
     // each thread wants to load one part of the dependency circle
     ThreadSafety.check(

querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java

@@ -18,12 +18,12 @@
 import com.querydsl.core.types.dsl.DateExpression;
 import java.sql.Date;
 import java.util.Calendar;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class DateConstantTest {
+class DateConstantTest {
 
   @Test
-  public void test() {
+  void test() {
     // 1.1.2000
     var cal = Calendar.getInstance();
     cal.set(Calendar.DAY_OF_MONTH, 1);

querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java

@@ -18,12 +18,12 @@
 import com.querydsl.core.types.dsl.DateTimeExpression;
 import java.util.Calendar;
 import java.util.Date;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class DateTimeConstantTest {
+class DateTimeConstantTest {
 
   @Test
-  public void test() {
+  void test() {
     var cal = Calendar.getInstance();
     cal.set(Calendar.DAY_OF_MONTH, 1);
     cal.set(Calendar.MONTH, 0);