Skip to content

Commit 7df5f84

Browse files
committed
Uses .toList() instead of .collect(Collectors.toList()) wherever possible
1 parent 46538dd commit 7df5f84

File tree

6 files changed

+10
-19
lines changed

6 files changed

+10
-19
lines changed

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/api/MultipleTypeEqualsVerifierApi.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ public MultipleTypeEqualsVerifierApi withFieldnameToGetterConverter(Function<Str
106106
* @since 0.1
107107
*/
108108
public void verify() {
109-
List<EqualsVerifierReport> failures =
110-
report().stream().filter(r -> !r.isSuccessful()).collect(Collectors.toList());
109+
List<EqualsVerifierReport> failures = report().stream().filter(r -> !r.isSuccessful()).toList();
111110
if (failures.isEmpty()) {
112111
return;
113112
}
@@ -133,6 +132,6 @@ public void verify() {
133132
* @since 3.0
134133
*/
135134
public List<EqualsVerifierReport> report() {
136-
return types.stream().map(t -> ev.forClass(t).report(false)).collect(Collectors.toList());
135+
return types.stream().map(t -> ev.forClass(t).report(false)).toList();
137136
}
138137
}

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.LinkedHashSet;
44
import java.util.List;
55
import java.util.function.Function;
6-
import java.util.stream.Collectors;
76

87
import nl.jqno.equalsverifier.internal.instantiation.vintage.VintageValueProvider;
98
import nl.jqno.equalsverifier.internal.reflection.FieldProbe;
@@ -30,7 +29,7 @@ final class RecordObjectAccessor<T> extends ObjectAccessor<T> {
3029
/** {@inheritDoc} */
3130
@Override
3231
public T copy(Objenesis objenesis) {
33-
List<?> params = probe.fields().map(this::getField).collect(Collectors.toList());
32+
List<?> params = probe.fields().map(this::getField).toList();
3433
return callRecordConstructor(params);
3534
}
3635

@@ -49,7 +48,7 @@ public ObjectAccessor<T> scramble(
4948
}
5049

5150
private ObjectAccessor<T> makeAccessor(Function<FieldProbe, Object> determineValue) {
52-
List<Object> params = probe.fields().map(determineValue).collect(Collectors.toList());
51+
List<Object> params = probe.fields().map(determineValue).toList();
5352
T newObject = callRecordConstructor(params);
5453
return ObjectAccessor.of(newObject);
5554
}

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private List<FieldProbe> createKotlinFieldList() {
117117
if (includeSuperclasses) {
118118
for (Class<?> c : SuperclassIterable.of(type)) {
119119
List<FieldProbe> superFields =
120-
addFieldsFor(c).stream().filter(p -> !names.contains(p.getName())).collect(Collectors.toList());
120+
addFieldsFor(c).stream().filter(p -> !names.contains(p.getName())).toList();
121121
result.addAll(superFields);
122122
superFields.stream().map(FieldProbe::getName).forEach(names::add);
123123
}

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/PackageScanner.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ private static List<File> getDirs(String packageName, PackageScanOptions options
4444
ClassLoader cl = Thread.currentThread().getContextClassLoader();
4545
String path = packageName.replace('.', '/');
4646
return rethrow(
47-
() -> Collections
48-
.list(cl.getResources(path))
49-
.stream()
50-
.flatMap(r -> getResourcePath(r, options))
51-
.collect(Collectors.toList()),
47+
() -> Collections.list(cl.getResources(path)).stream().flatMap(r -> getResourcePath(r, options)).toList(),
5248
e -> "Could not scan package " + packageName);
5349
}
5450

@@ -86,7 +82,7 @@ private static List<Class<?>> getClassesInDir(String packageName, File dir, Pack
8682
.filter(
8783
c -> options.mustExtend() == null
8884
|| (options.mustExtend().isAssignableFrom(c) && !options.mustExtend().equals(c)))
89-
.collect(Collectors.toList());
85+
.toList();
9086
}
9187

9288
private static Class<?> fileToClass(String packageName, File file) {

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Validations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public static void validatePackageContainsClasses(String packageName, List<Class
209209
}
210210

211211
public static void validateTypesAreKnown(Collection<Class<?>> types, List<Class<?>> knownTypes) {
212-
List<Class<?>> unknownTypes = types.stream().filter(t -> !knownTypes.contains(t)).collect(Collectors.toList());
212+
List<Class<?>> unknownTypes = types.stream().filter(t -> !knownTypes.contains(t)).toList();
213213
String message = "Unknown class(es) found: "
214214
+ unknownTypes.stream().map(t -> t.getCanonicalName()).collect(Collectors.joining(", "));
215215
validate(!unknownTypes.isEmpty(), message);

equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/PackageScannerTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55

66
import java.util.*;
7-
import java.util.stream.Collectors;
87

98
import nl.jqno.equalsverifier.ScanOption;
109
import nl.jqno.equalsverifier.internal.exceptions.ReflectionException;
@@ -96,8 +95,7 @@ void happyPathExceptPredicate() {
9695
@Test
9796
void filterOutTestClasses() {
9897
List<Class<?>> classes = PackageScanner.getClassesIn("nl.jqno.equalsverifier.internal.reflection", opts);
99-
List<Class<?>> testClasses =
100-
classes.stream().filter(c -> c.getName().endsWith("Test")).collect(Collectors.toList());
98+
List<Class<?>> testClasses = classes.stream().filter(c -> c.getName().endsWith("Test")).toList();
10199
assertThat(testClasses).isEqualTo(Collections.emptyList());
102100
assertThat(classes.size() - testClasses.size() > 0).isTrue();
103101
}
@@ -106,8 +104,7 @@ void filterOutTestClasses() {
106104
void filterOutTestClassesRecursively() {
107105
opts = PackageScanOptions.process(ScanOption.recursive());
108106
List<Class<?>> classes = PackageScanner.getClassesIn("nl.jqno.equalsverifier.internal.reflection", opts);
109-
List<Class<?>> testClasses =
110-
classes.stream().filter(c -> c.getName().endsWith("Test")).collect(Collectors.toList());
107+
List<Class<?>> testClasses = classes.stream().filter(c -> c.getName().endsWith("Test")).toList();
111108
assertThat(testClasses).isEqualTo(Collections.emptyList());
112109
assertThat(classes.size() - testClasses.size() > 0).isTrue();
113110
}

0 commit comments

Comments
 (0)