Replace Collectors.toList with Stream.toList
Closes gh-29203
This commit is contained in:
committed by
Brian Clozel
parent
9d263668d5
commit
0ccb64fe10
@@ -19,7 +19,6 @@ package org.springframework.cache.annotation;
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -77,7 +76,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware {
|
||||
@Autowired
|
||||
void setConfigurers(ObjectProvider<CachingConfigurer> configurers) {
|
||||
Supplier<CachingConfigurer> configurer = () -> {
|
||||
List<CachingConfigurer> candidates = configurers.stream().collect(Collectors.toList());
|
||||
List<CachingConfigurer> candidates = configurers.stream().toList();
|
||||
if (CollectionUtils.isEmpty(candidates)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ import java.util.List;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
@@ -72,7 +71,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
|
||||
@Autowired
|
||||
void setConfigurers(ObjectProvider<AsyncConfigurer> configurers) {
|
||||
Supplier<AsyncConfigurer> configurer = SingletonSupplier.of(() -> {
|
||||
List<AsyncConfigurer> candidates = configurers.stream().collect(Collectors.toList());
|
||||
List<AsyncConfigurer> candidates = configurers.stream().toList();
|
||||
if (CollectionUtils.isEmpty(candidates)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ package org.springframework.context.annotation;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@@ -156,7 +155,7 @@ class ConfigurationClassAndBeanMethodTests {
|
||||
private static List<BeanMethod> getBeanMethods(ConfigurationClass configurationClass) {
|
||||
List<BeanMethod> beanMethods = configurationClass.getBeanMethods().stream()
|
||||
.sorted(Comparator.comparing(beanMethod -> beanMethod.getMetadata().getMethodName()))
|
||||
.collect(Collectors.toList());
|
||||
.toList();
|
||||
assertThat(beanMethods).hasSize(3);
|
||||
return beanMethods;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.Collections;
|
||||
import java.util.Enumeration;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.springframework.context.index.CandidateComponentsIndexLoader;
|
||||
@@ -63,7 +62,7 @@ public class CandidateComponentsTestClassLoader extends ClassLoader {
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException("Invalid resource " + r, ex);
|
||||
}
|
||||
}).collect(Collectors.toList())));
|
||||
}).toList()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user