Skip to content

Commit 1a67bd9

Browse files
velovelo
committed
Upgrade test sources to Java 25
Signed-off-by: Marvin Froeder <velo.br@gmail.com>
1 parent 34f66d2 commit 1a67bd9

File tree

120 files changed

+1612
-1615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1612
-1615
lines changed

‎.circleci/config.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
executors:
1717
java:
1818
docker:
19-
- image: velo/toolchains-4-ci-builds:latest
19+
- image: velo/toolchains-4-ci-builds:with-25
2020

2121
# common commands
2222
commands:
@@ -128,7 +128,7 @@ jobs:
128128
<<: *defaults
129129
working_directory: ~/querydsl
130130
docker:
131-
- image: velo/toolchains-4-ci-builds:latest
131+
- image: velo/toolchains-4-ci-builds:with-25
132132
steps:
133133
- checkout
134134
- resolve-dependencies
@@ -140,7 +140,7 @@ jobs:
140140
<<: *defaults
141141
working_directory: ~/querydsl
142142
docker:
143-
- image: velo/toolchains-4-ci-builds:latest
143+
- image: velo/toolchains-4-ci-builds:with-25
144144
steps:
145145
- checkout
146146
- restore_cache:
@@ -173,7 +173,7 @@ jobs:
173173
<<: *defaults
174174
working_directory: ~/querydsl
175175
docker:
176-
- image: velo/toolchains-4-ci-builds:latest
176+
- image: velo/toolchains-4-ci-builds:with-25
177177
steps:
178178
- checkout
179179
- restore_cache:
@@ -207,7 +207,7 @@ jobs:
207207
<<: *defaults
208208
working_directory: ~/querydsl
209209
docker:
210-
- image: velo/toolchains-4-ci-builds:latest
210+
- image: velo/toolchains-4-ci-builds:with-25
211211
steps:
212212
- checkout
213213
- run:
@@ -232,7 +232,7 @@ jobs:
232232
<<: *defaults
233233
working_directory: ~/querydsl
234234
docker:
235-
- image: velo/toolchains-4-ci-builds:latest
235+
- image: velo/toolchains-4-ci-builds:with-25
236236
- image: mysql:5.6.38
237237
environment:
238238
- MYSQL_ROOT_PASSWORD=querydsl
@@ -254,7 +254,7 @@ jobs:
254254
<<: *defaults
255255
working_directory: ~/querydsl
256256
docker:
257-
- image: velo/toolchains-4-ci-builds:latest
257+
- image: velo/toolchains-4-ci-builds:with-25
258258
- image: postgis/postgis:16-3.4-alpine
259259
environment:
260260
- POSTGRES_USER=querydsl
@@ -275,7 +275,7 @@ jobs:
275275
<<: *defaults
276276
working_directory: ~/querydsl
277277
docker:
278-
- image: velo/toolchains-4-ci-builds:latest
278+
- image: velo/toolchains-4-ci-builds:with-25
279279
- image: cubrid/cubrid:11.3
280280
environment:
281281
- CUBRID_DB=demodb
@@ -294,7 +294,7 @@ jobs:
294294
<<: *defaults
295295
working_directory: ~/querydsl
296296
docker:
297-
- image: velo/toolchains-4-ci-builds:latest
297+
- image: velo/toolchains-4-ci-builds:with-25
298298
- image: gvenzl/oracle-xe:slim-faststart
299299
environment:
300300
- ORACLE_PASSWORD=querydsl
@@ -316,7 +316,7 @@ jobs:
316316
<<: *defaults
317317
working_directory: ~/querydsl
318318
docker:
319-
- image: velo/toolchains-4-ci-builds:latest
319+
- image: velo/toolchains-4-ci-builds:with-25
320320
- image: mongo:8.0.9
321321
steps:
322322
- checkout
@@ -333,7 +333,7 @@ jobs:
333333
<<: *defaults
334334
working_directory: ~/querydsl
335335
docker:
336-
- image: velo/toolchains-4-ci-builds:latest
336+
- image: velo/toolchains-4-ci-builds:with-25
337337
- image: jacobalberty/firebird:2.5.9-ss
338338
environment:
339339
- ISC_PASSWORD=masterkey
@@ -356,7 +356,7 @@ jobs:
356356
<<: *defaults
357357
working_directory: ~/querydsl
358358
docker:
359-
- image: velo/toolchains-4-ci-builds:latest
359+
- image: velo/toolchains-4-ci-builds:with-25
360360
steps:
361361
- checkout
362362
- restore_cache:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
uses: actions/setup-java@v4.0.0
9494
with:
9595
distribution: 'temurin'
96-
java-version: '21'
96+
java-version: '25'
9797

9898
- name: Compile project
99-
run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true
99+
run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true -pl !querydsl-tooling/querydsl-kotlin-codegen,!querydsl-tooling/querydsl-ksp-codegen,!querydsl-libraries/querydsl-kotlin
100100

101101
- name: Perform CodeQL Analysis
102102
uses: github/codeql-action/analyze@v3

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ derby.log
2323
**/.flattened-pom.xml
2424

2525
.java-version
26+
.sdkmanrc
2627
.gitignore
2728
.checkstyle
2829

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
<!-- default bytecode version for src/main -->
9191
<main.java.version>17</main.java.version>
92-
<latest.java.version>21</latest.java.version>
92+
<latest.java.version>25</latest.java.version>
9393

9494
<git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
9595

@@ -1055,7 +1055,7 @@
10551055
<recipe>org.openrewrite.java.testing.junit5.AssertToAssertions</recipe>
10561056
<recipe>org.openrewrite.java.testing.assertj.JUnitToAssertj</recipe>
10571057
<recipe>org.openrewrite.java.testing.assertj.Assertj</recipe>
1058-
<recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
1058+
<recipe>org.openrewrite.java.migrate.UpgradeToJava25</recipe>
10591059
</activeRecipes>
10601060
<exclusions>
10611061
<exclusion>**/src/main/java/**</exclusion>

‎querydsl-libraries/querydsl-core/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@
4343
<version>2.9.1</version>
4444
<scope>test</scope>
4545
</dependency>
46+
<dependency>
47+
<groupId>org.junit.jupiter</groupId>
48+
<artifactId>junit-jupiter-params</artifactId>
49+
<scope>test</scope>
50+
</dependency>
4651

4752
<dependency>
4853
<groupId>jakarta.annotation</groupId>
4954
<artifactId>jakarta.annotation-api</artifactId>
55+
<scope>provided</scope>
5056
</dependency>
5157
</dependencies>
5258

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ private Map<String, Expression<?>> collectExpressions(EntityPathBase<?>... entit
3131
if (!map.containsKey(name)) {
3232
try {
3333
Object val = f.get(entity);
34-
if (val instanceof Expression) {
35-
map.put(name, (Expression<?>) val);
34+
if (val instanceof Expression<?> expression) {
35+
map.put(name, expression);
3636
}
3737
} catch (IllegalAccessException e) {
3838

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

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,84 +14,88 @@
1414
package com.querydsl.core;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17+
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
1718

1819
import com.querydsl.core.types.ExpressionUtils;
1920
import com.querydsl.core.types.Templates;
2021
import com.querydsl.core.types.ToStringVisitor;
2122
import com.querydsl.core.types.dsl.BooleanExpression;
2223
import com.querydsl.core.types.dsl.Expressions;
23-
import org.junit.Ignore;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Disabled;
25+
import org.junit.jupiter.api.Test;
2526

26-
public class BooleanBuilderTest {
27+
class BooleanBuilderTest {
2728

2829
private final BooleanExpression first = BooleanConstant.TRUE;
2930

3031
private final BooleanExpression second = BooleanConstant.FALSE;
3132

3233
@Test
33-
public void null_in_constructor() {
34+
void null_in_constructor() {
3435
assertThat(new BooleanBuilder(null).getValue()).isNull();
3536
}
3637

3738
@Test
38-
public void and_empty() {
39+
void and_empty() {
3940
var builder = new BooleanBuilder();
4041
builder.and(new BooleanBuilder());
4142
assertThat(ExpressionUtils.extract(builder)).isNull();
4243
}
4344

4445
@Test
45-
public void and_any_of() {
46+
void and_any_of() {
4647
var builder = new BooleanBuilder();
4748
builder.andAnyOf(first, null);
4849
assertThat(builder.getValue()).isEqualTo(first);
4950
}
5051

5152
@Test
52-
public void and_any_of2() {
53+
void and_any_of2() {
5354
var builder = new BooleanBuilder();
5455
builder.andAnyOf(null, first);
5556
assertThat(builder.getValue()).isEqualTo(first);
5657
}
5758

5859
@Test
59-
public void or_all_of() {
60+
void or_all_of() {
6061
var builder = new BooleanBuilder();
6162
builder.orAllOf(first, null);
6263
assertThat(builder.getValue()).isEqualTo(first);
6364
}
6465

6566
@Test
66-
public void or_all_of2() {
67+
void or_all_of2() {
6768
var builder = new BooleanBuilder();
6869
builder.orAllOf(null, first);
6970
assertThat(builder.getValue()).isEqualTo(first);
7071
}
7172

72-
@Test(expected = QueryException.class)
73-
@Ignore
74-
public void wrapped_booleanBuilder() {
75-
new BooleanBuilder(new BooleanBuilder());
73+
@Test
74+
@Disabled
75+
void wrapped_booleanBuilder() {
76+
assertThatExceptionOfType(QueryException.class)
77+
.isThrownBy(
78+
() -> {
79+
new BooleanBuilder(new BooleanBuilder());
80+
});
7681
}
7782

7883
@Test
79-
public void basic() {
84+
void basic() {
8085
// new BooleanBuilder().and(first).or(second);
81-
assertThat(new BooleanBuilder().and(first).or(second).toString())
82-
.isEqualTo(first.or(second).toString());
86+
assertThat(new BooleanBuilder().and(first).or(second)).hasToString(first.or(second).toString());
8387
}
8488

8589
@Test
86-
public void advanced() {
90+
void advanced() {
8791
var builder = new BooleanBuilder();
8892
builder.andAnyOf(first, second, first);
8993
builder.orAllOf(first, second, first);
9094
assertThat(builder).hasToString("true || false || true || true && false && true");
9195
}
9296

9397
@Test
94-
public void if_then_else() {
98+
void if_then_else() {
9599
var builder = new BooleanBuilder();
96100
builder.and(null);
97101
builder.or(null);
@@ -100,60 +104,59 @@ public void if_then_else() {
100104
}
101105

102106
@Test
103-
public void and_null_supported() {
107+
void and_null_supported() {
104108
assertThat(first.and(null)).isEqualTo(first);
105109
}
106110

107111
@Test
108-
public void or_null_supported() {
112+
void or_null_supported() {
109113
assertThat(first.or(null)).isEqualTo(first);
110114
}
111115

112116
@Test
113-
public void and_not() {
117+
void and_not() {
114118
var builder = new BooleanBuilder();
115119
builder.and(first).andNot(second);
116120
assertThat(builder.getValue()).isEqualTo(first.and(second.not()));
117121
}
118122

119123
@Test
120-
public void or_not() {
124+
void or_not() {
121125
var builder = new BooleanBuilder();
122126
builder.and(first).orNot(second);
123127
assertThat(builder.getValue()).isEqualTo(first.or(second.not()));
124128
}
125129

126130
@Test
127-
public void not() {
131+
void not() {
128132
var builder = new BooleanBuilder();
129133
builder.and(first).not();
130134
assertThat(builder.getValue()).isEqualTo(first.not());
131135
}
132136

133137
@Test
134-
public void booleanBuilder_equals_booleanBuilder() {
138+
void booleanBuilder_equals_booleanBuilder() {
135139
assertThat(new BooleanBuilder(first)).isEqualTo(new BooleanBuilder(first));
136140
}
137141

138142
@Test
139-
public void constant_equals_booleanBuilder() {
140-
assertThat(first.equals(new BooleanBuilder(first))).isFalse();
143+
void constant_equals_booleanBuilder() {
144+
assertThat(first).isNotEqualTo(new BooleanBuilder(first));
141145
}
142146

143147
@Test
144-
public void booleanBuilder_equals_constant() {
145-
assertThat(new BooleanBuilder(first).equals(first)).isFalse();
148+
void booleanBuilder_equals_constant() {
149+
assertThat(new BooleanBuilder(first)).isNotEqualTo(first);
146150
}
147151

148152
@Test
149-
public void hashCode_() {
150-
assertThat(new BooleanBuilder(first).hashCode())
151-
.isEqualTo(new BooleanBuilder(first).hashCode());
152-
assertThat(new BooleanBuilder().hashCode()).isEqualTo(new BooleanBuilder().hashCode());
153+
void hashCode_() {
154+
assertThat(new BooleanBuilder(first)).hasSameHashCodeAs(new BooleanBuilder(first));
155+
assertThat(new BooleanBuilder()).hasSameHashCodeAs(new BooleanBuilder());
153156
}
154157

155158
@Test
156-
public void toString_() {
159+
void toString_() {
157160
var builder = new BooleanBuilder().and(first);
158161
assertThat(builder).hasToString("true");
159162
builder.or(Expressions.booleanPath("condition"));
@@ -173,7 +176,7 @@ public void toString_() {
173176
// }
174177

175178
@Test
176-
public void accept() {
179+
void accept() {
177180
var builder = new BooleanBuilder();
178181
builder.and(first);
179182
builder.or(Expressions.booleanPath("condition"));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import java.util.HashSet;
2828
import java.util.List;
2929
import java.util.Set;
30-
import org.junit.Test;
30+
import org.junit.jupiter.api.Test;
3131

3232
/** The Class CoverageTest. */
33-
public class CoverageTest {
33+
class CoverageTest {
3434

3535
private MatchingFiltersFactory matchers =
3636
new MatchingFiltersFactory(QuerydslModule.COLLECTIONS, Target.MEM);
@@ -43,7 +43,7 @@ public class CoverageTest {
4343

4444
@SuppressWarnings("unchecked")
4545
@Test
46-
public void test() throws IllegalArgumentException, IllegalAccessException {
46+
void test() throws Exception {
4747
// make sure all Operators are covered in expression factory methods
4848
Set<Operator> usedOperators = new HashSet<>();
4949
List<Expression<?>> exprs = new ArrayList<>();

0 commit comments

Comments
 (0)