diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index 7a28ef5566..578698519b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -744,8 +744,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto final FactoryBean factory = (FactoryBean) bean; boolean isEagerInit; if (System.getSecurityManager() != null && factory instanceof SmartFactoryBean) { - isEagerInit = AccessController.doPrivileged((PrivilegedAction) () -> - ((SmartFactoryBean) factory).isEagerInit(), + isEagerInit = AccessController.doPrivileged((PrivilegedAction) + ((SmartFactoryBean) factory)::isEagerInit, getAccessControlContext()); } else { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java index b346d02bb1..e12080fffd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java @@ -57,8 +57,8 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg protected Class getTypeForFactoryBean(final FactoryBean factoryBean) { try { if (System.getSecurityManager() != null) { - return AccessController.doPrivileged((PrivilegedAction>) () -> - factoryBean.getObjectType(), getAccessControlContext()); + return AccessController.doPrivileged((PrivilegedAction>) + factoryBean::getObjectType, getAccessControlContext()); } else { return factoryBean.getObjectType(); @@ -151,8 +151,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg if (System.getSecurityManager() != null) { AccessControlContext acc = getAccessControlContext(); try { - object = AccessController.doPrivileged((PrivilegedExceptionAction) () -> - factory.getObject(), acc); + object = AccessController.doPrivileged((PrivilegedExceptionAction) factory::getObject, acc); } catch (PrivilegedActionException pae) { throw pae.getException(); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java index 0b223f1fa3..42449980d3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java @@ -72,7 +72,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { try { if (System.getSecurityManager() != null) { constructorToUse = AccessController.doPrivileged( - (PrivilegedExceptionAction>) () -> clazz.getDeclaredConstructor()); + (PrivilegedExceptionAction>) clazz::getDeclaredConstructor); } else { constructorToUse = clazz.getDeclaredConstructor(); diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java index a05aff87ab..e9c5ed9458 100644 --- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java +++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java @@ -24,6 +24,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; import io.reactivex.BackpressureStrategy; +import io.reactivex.Flowable; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -249,7 +250,7 @@ public class ReactiveAdapterRegistry { registry.registerReactiveType( multiValue(io.reactivex.Flowable.class, io.reactivex.Flowable::empty), source -> (io.reactivex.Flowable) source, - source-> io.reactivex.Flowable.fromPublisher(source) + Flowable::fromPublisher ); registry.registerReactiveType( multiValue(io.reactivex.Observable.class, io.reactivex.Observable::empty), diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java index c5af0d7631..51a5980352 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java @@ -88,7 +88,7 @@ public class ConvertingComparator implements Comparator { * @return a new {@link ConvertingComparator} instance */ public static ConvertingComparator, K> mapEntryKeys(Comparator comparator) { - return new ConvertingComparator<>(comparator, source -> source.getKey()); + return new ConvertingComparator<>(comparator, Map.Entry::getKey); } /** @@ -98,7 +98,7 @@ public class ConvertingComparator implements Comparator { * @return a new {@link ConvertingComparator} instance */ public static ConvertingComparator, V> mapEntryValues(Comparator comparator) { - return new ConvertingComparator<>(comparator, source -> source.getValue()); + return new ConvertingComparator<>(comparator, Map.Entry::getValue); } diff --git a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java index 81d9426dc5..2d9a306d56 100644 --- a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java +++ b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java @@ -109,7 +109,7 @@ public class PropertyPlaceholderHelper { */ public String replacePlaceholders(String value, final Properties properties) { Assert.notNull(properties, "'properties' must not be null"); - return replacePlaceholders(value, placeholderName -> properties.getProperty(placeholderName)); + return replacePlaceholders(value, properties::getProperty); } /** diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java index d5a24687c3..a087055d8a 100644 --- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java @@ -583,7 +583,7 @@ public abstract class ReflectionUtils { */ public static Method[] getAllDeclaredMethods(Class leafClass) { final List methods = new ArrayList<>(32); - doWithMethods(leafClass, method -> methods.add(method)); + doWithMethods(leafClass, methods::add); return methods.toArray(new Method[methods.size()]); } diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java index 5dfb7c771b..d4720c5a48 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java @@ -54,7 +54,7 @@ public class UrlBasedCorsConfigurationSource implements CorsConfigurationSource public void setCorsConfigurations(@Nullable Map corsConfigurations) { this.corsConfigurations.clear(); if (corsConfigurations != null) { - corsConfigurations.forEach((path, config) -> registerCorsConfiguration(path, config)); + corsConfigurations.forEach(this::registerCorsConfiguration); } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java index 18e125894d..1073b43ae7 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java @@ -18,6 +18,7 @@ package org.springframework.web.reactive.config; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; @@ -101,7 +102,7 @@ public class WebFluxConfigurerComposite implements WebFluxConfigurer { @Nullable private T createSingleBean(Function factory, Class beanType) { - List result = this.delegates.stream().map(factory).filter(t -> t != null).collect(Collectors.toList()); + List result = this.delegates.stream().map(factory).filter(Objects::nonNull).collect(Collectors.toList()); if (result.isEmpty()) { return null; }