Skip to content

Commit 276c44b

Browse files
committed
Avoid test failures due to shared JavaTemplates
1 parent cb161e6 commit 276c44b

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
8484

8585
@RequiredArgsConstructor
8686
private static final class ReplaceCollectorToListVisitor extends JavaIsoVisitor<ExecutionContext> {
87-
private static final JavaTemplate template = JavaTemplate
88-
.builder("#{any(java.util.stream.Stream)}.toList()")
89-
.build();
9087
private final boolean convertToList;
9188

9289
@Override
@@ -97,9 +94,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
9794
}
9895
Expression command = method.getArguments().get(0);
9996
if (COLLECT_TO_UNMODIFIABLE_LIST.matches(command) ||
100-
convertToList && COLLECT_TO_LIST.matches(command)) {
97+
convertToList && COLLECT_TO_LIST.matches(command)) {
10198
maybeRemoveImport("java.util.stream.Collectors");
102-
J.MethodInvocation toList = template.apply(updateCursor(result), result.getCoordinates().replace(), result.getSelect());
99+
J.MethodInvocation toList = JavaTemplate.apply("#{any(java.util.stream.Stream)}.toList()",
100+
updateCursor(result), result.getCoordinates().replace(), result.getSelect());
103101
return toList.getPadding().withSelect(result.getPadding().getSelect());
104102
}
105103
return result;

src/test/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpecTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package org.openrewrite.java.migrate.joda;
1717

1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.parallel.Execution;
20+
import org.junit.jupiter.api.parallel.ExecutionMode;
1921
import org.openrewrite.Cursor;
2022
import org.openrewrite.DocumentExample;
2123
import org.openrewrite.ExecutionContext;
@@ -37,6 +39,7 @@
3739
import static org.openrewrite.java.Assertions.java;
3840
import static org.openrewrite.test.RewriteTest.toRecipe;
3941

42+
@Execution(ExecutionMode.SAME_THREAD)
4043
class JodaTimeFlowSpecTest implements RewriteTest {
4144
@Override
4245
public void defaults(RecipeSpec spec) {

src/test/java/org/openrewrite/java/migrate/joda/JodaTimeRecipeTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
package org.openrewrite.java.migrate.joda;
1717

1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.parallel.Execution;
20+
import org.junit.jupiter.api.parallel.ExecutionMode;
1921
import org.openrewrite.DocumentExample;
2022
import org.openrewrite.java.JavaParser;
2123
import org.openrewrite.test.RecipeSpec;
2224
import org.openrewrite.test.RewriteTest;
2325

2426
import static org.openrewrite.java.Assertions.java;
2527

28+
@Execution(ExecutionMode.SAME_THREAD)
2629
class JodaTimeRecipeTest implements RewriteTest {
2730
@Override
2831
public void defaults(RecipeSpec spec) {
@@ -223,7 +226,7 @@ public DateTime foo(String city) {
223226
import java.time.Duration;
224227
import java.time.ZoneId;
225228
import java.time.ZonedDateTime;
226-
229+
227230
class A {
228231
public ZonedDateTime foo(String city) {
229232
ZoneId dtz;

src/test/java/org/openrewrite/java/migrate/joda/JodaTimeScannerTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package org.openrewrite.java.migrate.joda;
1717

1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.parallel.Execution;
20+
import org.junit.jupiter.api.parallel.ExecutionMode;
1921
import org.openrewrite.java.JavaParser;
2022
import org.openrewrite.java.tree.J;
2123
import org.openrewrite.test.RecipeSpec;
@@ -29,6 +31,7 @@
2931
import static org.openrewrite.java.Assertions.java;
3032
import static org.openrewrite.test.RewriteTest.toRecipe;
3133

34+
@Execution(ExecutionMode.SAME_THREAD)
3235
class JodaTimeScannerTest implements RewriteTest {
3336
@Override
3437
public void defaults(RecipeSpec spec) {
@@ -215,12 +218,12 @@ void detectUnsafeVarsInInitializer() {
215218
import java.util.stream.Collectors;
216219
import java.util.stream.Stream;
217220
import java.util.List;
218-
221+
219222
class A {
220223
public Period period() {
221224
return new Period();
222225
}
223-
226+
224227
public void foo() {
225228
List<Integer> list = Stream.of(1, 2, 3).peek(i -> {
226229
Period p1 = period();
@@ -251,12 +254,12 @@ void detectUnsafeVarsInChainedLambdaExpressions() {
251254
import java.util.stream.Collectors;
252255
import java.util.stream.Stream;
253256
import java.util.List;
254-
257+
255258
class A {
256259
public Period period() {
257260
return new Period();
258261
}
259-
262+
260263
public void foo() {
261264
List<Integer> list = Stream.of(1, 2, 3).peek(i -> {
262265
Period p1 = period();

src/test/java/org/openrewrite/java/migrate/joda/JodaTimeVisitorTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package org.openrewrite.java.migrate.joda;
1717

1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.parallel.Execution;
20+
import org.junit.jupiter.api.parallel.ExecutionMode;
1921
import org.openrewrite.DocumentExample;
2022
import org.openrewrite.java.JavaParser;
2123
import org.openrewrite.test.RecipeSpec;
@@ -26,6 +28,7 @@
2628
import static org.openrewrite.java.Assertions.java;
2729
import static org.openrewrite.test.RewriteTest.toRecipe;
2830

31+
@Execution(ExecutionMode.SAME_THREAD)
2932
class JodaTimeVisitorTest implements RewriteTest {
3033
@Override
3134
public void defaults(RecipeSpec spec) {

0 commit comments

Comments
 (0)