Skip to content

Commit c1443c0

Browse files
committed
Revert "refactor: Replace Stream.collect(Collectors.toUnmodifiableList()) with Stream.toList()"
This reverts commit 2fe03e5.
1 parent 2fe03e5 commit c1443c0

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

rewrite-core/src/test/java/org/openrewrite/RecipeEstimatedEffortTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
import static java.util.Collections.emptyList;
3939
import static java.util.Objects.requireNonNull;
40+
import static java.util.stream.Collectors.toList;
4041
import static org.assertj.core.api.Assertions.assertThat;
4142
import static org.openrewrite.Tree.randomId;
4243
import static org.openrewrite.marker.GitProvenance.AutoCRLF.False;
@@ -231,7 +232,7 @@ public Collection<SourceFile> generate(AtomicBoolean shouldCreate, ExecutionCont
231232
if (shouldCreate.get()) {
232233
return PlainTextParser.builder().build().parse(fileContents)
233234
.map(brandNewFile -> (SourceFile) brandNewFile.withSourcePath(Paths.get(relativeFileName)))
234-
.toList();
235+
.collect(toList());
235236
}
236237
return emptyList();
237238
}

rewrite-java-test/src/test/java/org/openrewrite/java/RenameVariableTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929

30+
import static java.util.stream.Collectors.toList;
3031
import static org.openrewrite.java.Assertions.java;
3132
import static org.openrewrite.test.RewriteTest.toRecipe;
3233

@@ -82,17 +83,17 @@ public J visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ct
8283
List<J.VariableDeclarations> variableDecls = classDecl.getBody().getStatements().stream()
8384
.filter(J.VariableDeclarations.class::isInstance)
8485
.map(J.VariableDeclarations.class::cast)
85-
.toList();
86+
.collect(toList());
8687

8788
if (includeMethodParameters) {
8889
variableDecls.addAll(
89-
classDecl.getBody().getStatements().stream()
90+
classDecl.getBody().getStatements().stream()
9091
.filter(J.MethodDeclaration.class::isInstance)
9192
.map(J.MethodDeclaration.class::cast)
9293
.flatMap(it -> it.getParameters().stream())
9394
.filter(J.VariableDeclarations.class::isInstance)
9495
.map(J.VariableDeclarations.class::cast)
95-
.toList()
96+
.collect(toList())
9697
);
9798
}
9899

rewrite-java-test/src/test/java/org/openrewrite/java/UpdateSourcePositionsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.util.List;
2727
import java.util.function.UnaryOperator;
28+
import java.util.stream.Collectors;
2829

2930
import static org.assertj.core.api.Assertions.assertThat;
3031

@@ -66,7 +67,7 @@ public Consumer<String> demo() {
6667
}
6768
}
6869
"""
69-
).toList();
70+
).collect(Collectors.toList());
7071
Result result = new UpdateSourcePositions().run(new InMemoryLargeSourceSet(cus), new InMemoryExecutionContext(), 1).getChangeset().getAllResults().getFirst();
7172
assertThat(printWithLines(result.getAfter())).isEqualTo(
7273
"""
@@ -97,7 +98,7 @@ void test() {
9798
}
9899
}
99100
"""
100-
).toList();
101+
).collect(Collectors.toList());
101102
Result result = new UpdateSourcePositions().run(new InMemoryLargeSourceSet(cus), new InMemoryExecutionContext(), 1).getChangeset().getAllResults().getFirst();
102103
assertThat(printWithLines(result.getAfter())).isEqualTo(
103104
"""

rewrite-java-test/src/test/java/org/openrewrite/java/internal/TypesInUseTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.openrewrite.java.tree.TypeUtils;
2121
import org.openrewrite.test.RewriteTest;
2222

23+
import java.util.stream.Collectors;
24+
2325
import static org.assertj.core.api.Assertions.assertThat;
2426
import static org.openrewrite.java.Assertions.java;
2527

@@ -54,7 +56,7 @@ public class Foo {}
5456
spec -> spec.afterRecipe(cu -> {
5557
var foundTypes = cu.getTypesInUse().getVariables().stream()
5658
.map(v -> TypeUtils.asFullyQualified(v.getType()).getFullyQualifiedName())
57-
.toList();
59+
.collect(Collectors.toList());
5860
assertThat(foundTypes).containsExactlyInAnyOrder("org.openrewrite.test.YesOrNo$Status");
5961
})
6062
)

0 commit comments

Comments
 (0)