From c9da881322b16ef16264a588fafd691f63627295 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 5 Oct 2018 09:25:10 +0100
Subject: [PATCH] Polish "Drop support for "all" from
 management.metrics.distribution.sla"

Closes gh-14684
---
 .../autoconfigure/metrics/PropertiesMeterFilter.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
index 55f5c80c5f..e514c36ffb 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
@@ -104,18 +104,17 @@ public class PropertiesMeterFilter implements MeterFilter {
 		if (values.isEmpty()) {
 			return defaultValue;
 		}
-		return this.baseLookup(values, id, () -> defaultValue);
+		return doLookup(values, id, () -> defaultValue);
 	}
 
 	private <T> T lookupWithFallbackToAll(Map<String, T> values, Id id, T defaultValue) {
 		if (values.isEmpty()) {
 			return defaultValue;
 		}
-		return this.baseLookup(values, id,
-				() -> values.getOrDefault("all", defaultValue));
+		return doLookup(values, id, () -> values.getOrDefault("all", defaultValue));
 	}
 
-	private <T> T baseLookup(Map<String, T> values, Id id, Supplier<T> defaultValue) {
+	private <T> T doLookup(Map<String, T> values, Id id, Supplier<T> defaultValue) {
 		String name = id.getName();
 		while (StringUtils.hasLength(name)) {
 			T result = values.get(name);