Skip to content

Commit 92e84bc

Browse files
committed
Remove usages of Collectors.toList()
1 parent d4aa7b1 commit 92e84bc

File tree

16 files changed

+22
-37
lines changed

16 files changed

+22
-37
lines changed

java-compiler-testing/src/main/java/io/github/ascopes/jct/compilers/impl/JctCompilationFactoryImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package io.github.ascopes.jct.compilers.impl;
1717

1818
import static java.util.Objects.requireNonNull;
19-
import static java.util.stream.Collectors.toList;
2019

2120
import io.github.ascopes.jct.compilers.JctCompilation;
2221
import io.github.ascopes.jct.compilers.JctCompilationFactory;
@@ -139,7 +138,7 @@ public JctCompilation createCompilation(
139138
.arguments(flags)
140139
.compilationUnits(Set.copyOf(compilationUnits))
141140
.fileManager(fileManager)
142-
.outputLines(writer.getContent().lines().collect(toList()))
141+
.outputLines(writer.getContent().lines().toList())
143142
.diagnostics(diagnosticListener.getDiagnostics())
144143
.success(success)
145144
.failOnWarnings(compiler.isFailOnWarnings())

java-compiler-testing/src/main/java/io/github/ascopes/jct/ex/package-info.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@
1919
*/
2020
package io.github.ascopes.jct.ex;
2121

22-
import org.apiguardian.api.API;
23-
import org.apiguardian.api.API.Status;

java-compiler-testing/src/main/java/io/github/ascopes/jct/filemanagers/config/package-info.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@
1919
*/
2020
package io.github.ascopes.jct.filemanagers.config;
2121

22-
import org.apiguardian.api.API;
23-
import org.apiguardian.api.API.Status;

java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.github.ascopes.jct.ex.JctIllegalInputException;
2424
import io.github.ascopes.jct.ex.JctJunitConfigurerException;
2525
import java.lang.reflect.Constructor;
26-
import java.lang.reflect.InaccessibleObjectException;
2726
import java.lang.reflect.InvocationTargetException;
2827
import java.util.stream.IntStream;
2928
import java.util.stream.Stream;

java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/StringUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.List;
2323
import java.util.Objects;
2424
import java.util.function.Function;
25-
import java.util.stream.Collectors;
2625
import me.xdrop.fuzzywuzzy.FuzzySearch;
2726
import me.xdrop.fuzzywuzzy.ToStringFunction;
2827
import me.xdrop.fuzzywuzzy.model.BoundExtractedResult;
@@ -282,7 +281,7 @@ public static <T> String resultNotFoundWithFuzzySuggestions(
282281
.map(BoundExtractedResult::getReferent)
283282
.map(userFriendlyStringifier)
284283
.sorted()
285-
.collect(Collectors.toList());
284+
.toList();
286285

287286
if (!closestMatches.isEmpty()) {
288287
errorBuilder.append(" Maybe you meant:");

java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/VisibleForTestingOnly.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20-
import java.lang.annotation.Inherited;
2120
import java.lang.annotation.Retention;
2221
import java.lang.annotation.RetentionPolicy;
2322
import java.lang.annotation.Target;

java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctFlagBuilderImplTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.github.ascopes.jct.compilers.DebuggingInfo;
2626
import io.github.ascopes.jct.fixtures.Fixtures;
2727
import java.util.List;
28-
import java.util.stream.Collectors;
2928
import java.util.stream.Stream;
3029
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.DisplayName;
@@ -467,7 +466,7 @@ void addsAnnotationProcessorOptions() {
467466
var options = Stream
468467
.generate(Fixtures::someText)
469468
.limit(5)
470-
.collect(Collectors.toList());
469+
.toList();
471470

472471
// When
473472
flagBuilder.annotationProcessorOptions(options);
@@ -476,7 +475,7 @@ void addsAnnotationProcessorOptions() {
476475
assertThat(flagBuilder.build())
477476
.containsSequence(options.stream()
478477
.map("-A"::concat)
479-
.collect(Collectors.toList()));
478+
.toList());
480479
}
481480

482481
@DisplayName(".annotationProcessorOptions(...) returns the flag builder")
@@ -486,7 +485,7 @@ void returnsFlagBuilder() {
486485
var options = Stream
487486
.generate(Fixtures::someText)
488487
.limit(5)
489-
.collect(Collectors.toList());
488+
.toList();
490489

491490
// Then
492491
assertThat(flagBuilder.annotationProcessorOptions(options))
@@ -505,7 +504,7 @@ void addsCompilerOptions() {
505504
var options = Stream
506505
.generate(Fixtures::someText)
507506
.limit(5)
508-
.collect(Collectors.toList());
507+
.toList();
509508

510509
// When
511510
flagBuilder.compilerOptions(options);
@@ -522,7 +521,7 @@ void returnsFlagBuilder() {
522521
var options = Stream
523522
.generate(Fixtures::someText)
524523
.limit(5)
525-
.collect(Collectors.toList());
524+
.toList();
526525

527526
// Then
528527
assertThat(flagBuilder.compilerOptions(options))

java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationFactoryImplTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static io.github.ascopes.jct.fixtures.Fixtures.someText;
2424
import static io.github.ascopes.jct.fixtures.Fixtures.someTraceDiagnostic;
2525
import static io.github.ascopes.jct.utils.IterableUtils.flatten;
26-
import static java.util.stream.Collectors.toList;
2726
import static org.assertj.core.api.Assertions.assertThat;
2827
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2928
import static org.mockito.ArgumentMatchers.any;
@@ -388,7 +387,7 @@ void teeWriterLogsShouldBePlacedInTheCompilationResult() throws IOException {
388387

389388
// Then
390389
assertThat(result.getOutputLines())
391-
.containsExactlyElementsOf(lines.lines().collect(toList()));
390+
.containsExactlyElementsOf(lines.lines().toList());
392391

393392
// Ensure we flushed before we called toString, otherwise data might be missing.
394393
order.verify(teeWriter).flush();

java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationImplTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void getArgumentsReturnsExpectedValue(int argumentCount) {
5555
var arguments = Stream
5656
.generate(Fixtures::someFlag)
5757
.limit(argumentCount)
58-
.collect(Collectors.toList());
58+
.toList();
5959

6060
var compilation = filledBuilder()
6161
.arguments(arguments)
@@ -102,7 +102,7 @@ void getOutputLinesReturnsExpectedValue(int lineCount) {
102102
.generate(UUID::randomUUID)
103103
.map(Objects::toString)
104104
.limit(lineCount)
105-
.collect(Collectors.toList());
105+
.toList();
106106

107107
var compilation = filledBuilder()
108108
.outputLines(lines)
@@ -141,7 +141,7 @@ void getDiagnosticsReturnsExpectedValue(int diagnosticCount) {
141141
var diagnostics = Stream
142142
.generate(Fixtures::someTraceDiagnostic)
143143
.limit(diagnosticCount)
144-
.collect(Collectors.toList());
144+
.toList();
145145

146146
var compilation = filledBuilder()
147147
.diagnostics(diagnostics)

java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void addPathsDelegatesMultipleCallsToTheRepository() {
135135
var pathRoots = Stream
136136
.generate(Fixtures::somePathRoot)
137137
.limit(10)
138-
.collect(Collectors.toList());
138+
.toList();
139139

140140
// When
141141
fileManager.addPaths(location, pathRoots);

java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Fixtures.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import java.util.Random;
4545
import java.util.Set;
4646
import java.util.UUID;
47-
import java.util.stream.Collectors;
4847
import java.util.stream.Stream;
4948
import javax.tools.Diagnostic;
5049
import javax.tools.Diagnostic.Kind;
@@ -180,7 +179,7 @@ public static List<String> someFlags() {
180179
return Stream
181180
.generate(Fixtures::someFlag)
182181
.limit(someInt(2, 4))
183-
.collect(Collectors.toList());
182+
.toList();
184183
}
185184

186185
/**

java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/AbstractCompilersProviderTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import io.github.ascopes.jct.ex.JctJunitConfigurerException;
3434
import io.github.ascopes.jct.fixtures.Fixtures;
3535
import java.lang.reflect.InvocationTargetException;
36-
import java.util.stream.Collectors;
3736
import java.util.stream.Stream;
3837
import org.junit.jupiter.api.DisplayName;
3938
import org.junit.jupiter.api.Test;
@@ -131,7 +130,7 @@ void configuringTheProviderRespectsTheMinimumVersionBound() {
131130
provider.configureInternals(10, 17, versionStrategy);
132131
var compilers = provider.provideArguments(mock(ExtensionContext.class))
133132
.map(args -> (JctCompiler) args.get()[0])
134-
.collect(Collectors.toList());
133+
.toList();
135134

136135
// Then
137136
assertThat(compilers).hasSize(3);
@@ -155,7 +154,7 @@ void configuringTheProviderRespectsTheMaximumVersionBound() {
155154
provider.configureInternals(15, 20, versionStrategy);
156155
var compilers = provider.provideArguments(mock(ExtensionContext.class))
157156
.map(args -> (JctCompiler) args.get()[0])
158-
.collect(Collectors.toList());
157+
.toList();
159158

160159
// Then
161160
assertThat(compilers).hasSize(3);
@@ -185,7 +184,7 @@ void configuringTheProviderWithConfigurersWillUseConfigurers() {
185184
);
186185
var compilers = provider.provideArguments(mock(ExtensionContext.class))
187186
.map(args -> (JctCompiler) args.get()[0])
188-
.collect(Collectors.toList());
187+
.toList();
189188

190189
// Then
191190
assertSoftly(softly -> {

java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JavacCompilersProviderTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.github.ascopes.jct.compilers.JctCompilerConfigurer;
2626
import io.github.ascopes.jct.compilers.impl.JavacJctCompilerImpl;
2727
import java.lang.reflect.AnnotatedElement;
28-
import java.util.stream.Collectors;
2928
import org.junit.jupiter.api.DisplayName;
3029
import org.junit.jupiter.api.Test;
3130
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -51,7 +50,7 @@ void providerUsesTheUserProvidedVersionRangesWhenValid() {
5150
var consumer = initialize(test, new JavacCompilersProvider());
5251
var compilers = consumer.provideArguments(context)
5352
.map(args -> (JavacJctCompilerImpl) args.get()[0])
54-
.collect(Collectors.toList());
53+
.toList();
5554

5655
// Then
5756
assertThat(compilers)
@@ -87,7 +86,7 @@ void providerUsesTheMinCompilerVersionAllowedIfExceeded() {
8786
var consumer = initialize(test, new JavacCompilersProvider());
8887
var compilers = consumer.provideArguments(context)
8988
.map(args -> (JavacJctCompilerImpl) args.get()[0])
90-
.collect(Collectors.toList());
89+
.toList();
9190

9291
// Then
9392
assertThat(compilers)
@@ -123,7 +122,7 @@ void providerUsesTheMaxCompilerVersionAllowedIfExceeded() {
123122
var consumer = initialize(test, new JavacCompilersProvider());
124123
var compilers = consumer.provideArguments(context)
125124
.map(args -> (JavacJctCompilerImpl) args.get()[0])
126-
.collect(Collectors.toList());
125+
.toList();
127126

128127
// Then
129128
assertThat(compilers)

java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/SpecialLocationsUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private List<Path> allExcept(Path... excludedPaths) {
180180
return paths
181181
.stream()
182182
.filter(not(List.of(excludedPaths)::contains))
183-
.collect(Collectors.toList());
183+
.toList();
184184
}
185185

186186
private String toPathString() {

java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringSlicerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.assertj.core.api.BDDAssertions.thenCode;
2020

2121
import java.util.List;
22-
import java.util.stream.Collectors;
2322
import java.util.stream.Stream;
2423
import org.junit.jupiter.api.DisplayName;
2524
import org.junit.jupiter.api.Test;
@@ -82,7 +81,7 @@ void slicingStringIntoStreamReturnsTheExpectedResult(
8281
// When
8382
var actual = slicer
8483
.splitToStream(input)
85-
.collect(Collectors.toList());
84+
.toList();
8685

8786
// Then
8887
then(actual).isEqualTo(expected);

java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/MemoryFileSystemProviderImplTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.nio.file.Path;
3131
import java.nio.file.StandardOpenOption;
3232
import java.util.ArrayList;
33-
import java.util.stream.Collectors;
3433
import java.util.stream.Stream;
3534
import org.junit.jupiter.api.DisplayName;
3635
import org.junit.jupiter.api.Nested;
@@ -54,7 +53,7 @@ void theClassIsSingleton() {
5453
var instances = Stream
5554
.generate(MemoryFileSystemProvider::getInstance)
5655
.limit(10)
57-
.collect(Collectors.toList());
56+
.toList();
5857

5958
// Then
6059
assertThat(instances)

0 commit comments

Comments
 (0)