Skip to content

Commit 61034e6

Browse files
authored
Migrate src/test/java to Java 21 (#238)
Migrate src/test/java to Java 21 https://docs.openrewrite.org/recipes/java/migrate/upgradetojava21 Modernize test code to use java 21 latest features $ mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-migrate-java:RELEASE -Drewrite.activeRecipes=org.openrewrite.java.migrate.UpgradeToJava21 -Pexamples -pl -:querydsl-example-kotlin Co-authored-by: Marvin Froeder <[email protected]>
1 parent 42a1bad commit 61034e6

File tree

86 files changed

+932
-669
lines changed

Some content is hidden

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

86 files changed

+932
-669
lines changed

querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,15 @@ public void test() throws Throwable {
6969
for (Expression<?> expr : exprs) {
7070
for (Field field : expr.getClass().getFields()) {
7171
Object rv = field.get(expr);
72-
if (rv instanceof Expression) {
73-
if (rv instanceof StringExpression) {
74-
StringExpression str = (StringExpression) rv;
72+
if (rv instanceof Expression expression) {
73+
if (rv instanceof StringExpression str) {
7574
toVisit.add(str.toLowerCase());
7675
toVisit.add(str.charAt(0));
7776
toVisit.add(str.isEmpty());
78-
} else if (rv instanceof BooleanExpression) {
79-
BooleanExpression b = (BooleanExpression) rv;
77+
} else if (rv instanceof BooleanExpression b) {
8078
toVisit.add(b.not());
8179
}
82-
toVisit.add((Expression<?>) rv);
80+
toVisit.add(expression);
8381
}
8482
}
8583
}

querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ public abstract static class Component implements Serializable {
3030
@Transient
3131
public Container getContainer() {
3232
Component temp = this.parent;
33-
if (this.parent instanceof HibernateProxy) {
34-
temp =
35-
(Component)
36-
((HibernateProxy) this.parent).getHibernateLazyInitializer().getImplementation();
33+
if (this.parent instanceof HibernateProxy proxy) {
34+
temp = (Component) proxy.getHibernateLazyInitializer().getImplementation();
3735
}
3836

39-
if (temp instanceof Container) {
40-
return (Container) temp;
37+
if (temp instanceof Container container) {
38+
return container;
4139
} else {
4240
if (!temp.isRoot()) {
4341
return temp.getParent().getContainer();

querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public class SurefireBooterTest {
1111
@Test
1212
public void test() throws IOException {
1313
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
14-
if (classLoader instanceof URLClassLoader) {
15-
URLClassLoader cl = (URLClassLoader) classLoader;
14+
if (classLoader instanceof URLClassLoader cl) {
1615
if (cl.getURLs().length == 1 && cl.getURLs()[0].getPath().contains("surefirebooter")) {
1716
URL url = cl.findResource("META-INF/MANIFEST.MF");
1817
Manifest manifest = new Manifest(url.openStream());

querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/Cat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Cat(String name) {
6868

6969
public Cat(String name, String kittenName) {
7070
this(name);
71-
kittens.get(0).setName(kittenName);
71+
kittens.getFirst().setName(kittenName);
7272
}
7373

7474
public Cat(String name, int id) {

querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ public void defaultsGeneratedAnnotation() throws IOException {
207207
serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
208208
var generatedSource = String.valueOf(writer);
209209
assertThat(generatedSource)
210-
.contains(
211-
String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName()));
210+
.contains("import %s;".formatted(GeneratedAnnotationResolver.resolveDefault().getName()));
212211
assertThat(generatedSource)
213212
.containsIgnoringNewLines(
214213
"@Generated(\"com.querydsl.codegen.BeanSerializer\")\npublic class");

querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ public void customType() throws IOException {
4848
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
4949
assertThat(writer.toString())
5050
.contains(
51-
"public final com.querydsl.codegen.Point property = "
52-
+ "new com.querydsl.codegen.Point(forProperty(\"property\"));");
51+
"""
52+
public final com.querydsl.codegen.Point property = \
53+
new com.querydsl.codegen.Point(forProperty("property"));\
54+
""");
5355
}
5456
}

querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ public void defaultGeneratedAnnotation() throws IOException {
212212
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
213213
final var generatedSource = writer.toString();
214214
assertThat(generatedSource)
215-
.contains(
216-
String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName()));
215+
.contains("import %s;".formatted(GeneratedAnnotationResolver.resolveDefault().getName()));
217216
assertThat(generatedSource)
218217
.containsIgnoringNewLines(
219218
"@Generated(\"com.querydsl.codegen.DefaultEmbeddableSerializer\")\npublic class");

querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ public void different_package() throws IOException {
6161
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
6262
assertThat(writer.toString())
6363
.contains(
64-
"public class QEntitySerializerTest_Entity "
65-
+ "extends EntityPathBase<EntitySerializerTest.Entity>");
64+
"""
65+
public class QEntitySerializerTest_Entity \
66+
extends EntityPathBase<EntitySerializerTest.Entity>\
67+
""");
6668
CompileUtils.assertCompiles("QEntitySerializerTest_Entity", writer.toString());
6769
}
6870

@@ -224,8 +226,7 @@ public void defaultGeneratedAnnotation() throws IOException {
224226
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
225227
String generatedSourceCode = writer.toString();
226228
assertThat(generatedSourceCode)
227-
.contains(
228-
String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName()));
229+
.contains("import %s;".formatted(GeneratedAnnotationResolver.resolveDefault().getName()));
229230
assertThat(generatedSourceCode)
230231
.containsIgnoringNewLines(
231232
"@Generated(\"com.querydsl.codegen.DefaultEntitySerializer\")\npublic class");

querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public void defaultGeneratedAnnotation() throws IOException {
7474
serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
7575
String generatedSource = writer.toString();
7676
assertThat(generatedSource)
77-
.contains(
78-
String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName()));
77+
.contains("import %s;".formatted(GeneratedAnnotationResolver.resolveDefault().getName()));
7978
assertThat(generatedSource)
8079
.containsIgnoringNewLines(
8180
"@Generated(\"com.querydsl.codegen.DefaultProjectionSerializer\")\npublic class");

querydsl-collections/src/test/java/com/querydsl/collections/Cat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public Cat(String name) {
5858

5959
public Cat(String name, String kittenName) {
6060
this(name);
61-
kittens.get(0).setName(kittenName);
61+
kittens.getFirst().setName(kittenName);
6262
}
6363

6464
@QueryProjection

0 commit comments

Comments
 (0)