From 4857b45ea59c4609b33a42f064c4260af394e9c9 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 23 Oct 2018 16:17:40 +0200 Subject: [PATCH] Replace lambdas with method reference or call Closes gh-14937 --- .../autoconfigure/condition/ConditionsReportEndpoint.java | 3 +-- .../boot/actuate/endpoint/annotation/EndpointDiscoverer.java | 3 ++- .../springframework/boot/actuate/endpoint/web/PathMapper.java | 2 +- .../autoconfigure/cassandra/CassandraAutoConfiguration.java | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java index 4430d4b95a..2f73389401 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java @@ -123,8 +123,7 @@ public class ConditionsReportEndpoint { this.negativeMatches = new LinkedHashMap<>(); this.exclusions = report.getExclusions(); this.unconditionalClasses = report.getUnconditionalClasses(); - report.getConditionAndOutcomesBySource().forEach( - (source, conditionAndOutcomes) -> add(source, conditionAndOutcomes)); + report.getConditionAndOutcomesBySource().forEach(this::add); this.parentId = (context.getParent() != null) ? context.getParent().getId() : null; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java index 35c6a8151e..5bfde9aa9a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -147,7 +148,7 @@ public abstract class EndpointDiscoverer, O exten private void addExtensionBeans(Collection endpointBeans) { Map byId = endpointBeans.stream() - .collect(Collectors.toMap(EndpointBean::getId, (bean) -> bean)); + .collect(Collectors.toMap(EndpointBean::getId, Function.identity())); String[] beanNames = BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors( this.applicationContext, EndpointExtension.class); for (String beanName : beanNames) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java index 17e647b6a1..8eed7ea3cd 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java @@ -49,7 +49,7 @@ public interface PathMapper { */ @Deprecated static PathMapper useEndpointId() { - return (id) -> id.toString(); + return EndpointId::toString; } /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java index ac414ef5cf..c46c731054 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java @@ -80,8 +80,7 @@ public class CassandraAutoConfiguration { map.from(this::getSocketOptions).to(builder::withSocketOptions); map.from(properties::isSsl).whenTrue().toCall(builder::withSSL); map.from(this::getPoolingOptions).to(builder::withPoolingOptions); - map.from(properties::getContactPoints) - .as((list) -> StringUtils.toStringArray(list)) + map.from(properties::getContactPoints).as(StringUtils::toStringArray) .to(builder::addContactPoints); map.from(properties::isJmxEnabled).whenFalse() .toCall(builder::withoutJMXReporting);