Skip to content

Commit 30e48b4

Browse files
Use Java 21 for tests
Use this link to re-run the recipe: https://app.moderne.io/builder/H0eeUs6x1?organizationId=ODQ2MGExMTUtNDg0My00N2EwLTgzMGMtNGE1NGExMTBmZDkw Co-authored-by: Moderne <[email protected]>
1 parent 946d0ce commit 30e48b4

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/test/java/org/openrewrite/java/logging/log4j/Slf4jToLog4jTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void mavenPom() {
191191
while (matcher.find()) {
192192
versions.add(matcher.group(1));
193193
}
194-
return String.format("""
194+
return """
195195
<project>
196196
<groupId>org.example</groupId>
197197
<artifactId>example-lib</artifactId>
@@ -204,7 +204,7 @@ void mavenPom() {
204204
</dependency>
205205
</dependencies>
206206
</project>
207-
""", versions.isEmpty() ? "" : versions.getFirst(), versions.size() > 1 ? versions.get(1) : "");
207+
""".formatted(versions.isEmpty() ? "" : versions.getFirst(), versions.size() > 1 ? versions.get(1) : "");
208208
}
209209
)
210210
)

src/test/java/org/openrewrite/java/logging/slf4j/StripToStringFromArgumentsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void method(Logger log, Marker marker, String message, Object o1, Object o2, Obj
8787
}
8888
}
8989
""";
90-
@Language("java") String before = String.format(testTemplate, method, arguments);
91-
@Language("java") String after = String.format(testTemplate, method, expectedArguments);
90+
@Language("java") String before = testTemplate.formatted(method, arguments);
91+
@Language("java") String after = testTemplate.formatted(method, expectedArguments);
9292

9393
// Ideally we'd only call `rewriteRun(java(before, after));` but the only way to expect a no-change is to call `rewrite(java(before))`
9494
if (before.equals(after)) {

src/test/java/org/openrewrite/java/logging/slf4j/WrapExpensiveLogStatementsInConditionalsTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void allLogMethods(String method, String check) {
8484
//language=java
8585
rewriteRun(
8686
java(
87-
String.format("""
87+
"""
8888
import org.slf4j.Logger;
8989
9090
class A {
@@ -96,8 +96,8 @@ String expensiveOp() {
9696
return "expensive";
9797
}
9898
}
99-
""", method),
100-
String.format("""
99+
""".formatted(method),
100+
"""
101101
import org.slf4j.Logger;
102102
103103
class A {
@@ -111,7 +111,7 @@ String expensiveOp() {
111111
return "expensive";
112112
}
113113
}
114-
""", check, method)
114+
""".formatted(check, method)
115115
)
116116
);
117117
}
@@ -600,7 +600,7 @@ void wrapWhenExpensiveArgument(String logArgument) {
600600
//language=java
601601
rewriteRun(
602602
java(
603-
String.format("""
603+
"""
604604
import java.nio.charset.StandardCharsets;
605605
import java.util.Optional;
606606
import org.slf4j.Logger;
@@ -622,8 +622,8 @@ boolean isSomething(int i) {
622622
return true;
623623
}
624624
}
625-
""", logArgument),
626-
String.format("""
625+
""".formatted(logArgument),
626+
"""
627627
import java.nio.charset.StandardCharsets;
628628
import java.util.Optional;
629629
import org.slf4j.Logger;
@@ -647,7 +647,7 @@ boolean isSomething(int i) {
647647
return true;
648648
}
649649
}
650-
""", logArgument)
650+
""".formatted(logArgument)
651651
)
652652
);
653653
}
@@ -672,7 +672,7 @@ void dontWrapWhenCheapArgument(String logArgument) {
672672
//language=java
673673
rewriteRun(
674674
java(
675-
String.format("""
675+
"""
676676
import org.slf4j.Logger;
677677
678678
class A {
@@ -686,7 +686,7 @@ boolean isSomething() {
686686
return true;
687687
}
688688
}
689-
""", logArgument)
689+
""".formatted(logArgument)
690690
)
691691
);
692692
}

0 commit comments

Comments
 (0)