From e834b25ef1898e5840f3c121d4cd9adede67e002 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 29 Jan 2018 20:20:58 +0000 Subject: [PATCH] Polish --- .../logging/LoggersEndpointAutoConfigurationTests.java | 5 ++--- .../boot/actuate/autoconfigure/metrics/MetricsRun.java | 2 +- .../web/reactive/server/RouterFunctionMetrics.java | 8 +++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java index 7851f81dfa..5a6f469b63 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java @@ -58,9 +58,8 @@ public class LoggersEndpointAutoConfigurationTests { this.contextRunner .withSystemProperties( "org.springframework.boot.logging.LoggingSystem=none") - .run((context) -> { - assertThat(context).doesNotHaveBean(LoggersEndpoint.class); - }); + .run((context) -> assertThat(context) + .doesNotHaveBean(LoggersEndpoint.class)); } @Configuration diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsRun.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsRun.java index a9e63e072e..d83017a729 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsRun.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsRun.java @@ -75,7 +75,7 @@ public final class MetricsRun { propertyValues.add("management.metrics.use-global-registry=false"); List keep = Arrays.asList(implementations); IMPLEMENTATIONS.stream() - .filter((implementation) -> !keep.contains(implementations)) + .filter((implementation) -> !keep.contains(implementation)) .map(MetricsRun::disableExport).forEach(propertyValues::add); return propertyValues.toArray(new String[0]); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java index 29a6539a66..cf3e7e44a6 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java @@ -127,11 +127,9 @@ public class RouterFunctionMetrics { public Mono filter(ServerRequest request, HandlerFunction next) { long start = System.nanoTime(); - return next.handle(request).doOnSuccess((response) -> { - timer(start, request, response); - }).doOnError((error) -> { - timer(start, request, null); - }); + return next.handle(request) + .doOnSuccess((response) -> timer(start, request, response)) + .doOnError((error) -> timer(start, request, null)); } private Iterable getDefaultTags(ServerRequest request,