From 5632d043ff8730be790a5ff3ae044b6a0574d2b5 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 29 Jan 2018 19:51:51 -0800 Subject: [PATCH] Fix enums following upstream micrometer change See gh-11575 --- .../autoconfigure/metrics/export/simple/SimpleProperties.java | 2 +- .../autoconfigure/metrics/export/statsd/StatsdProperties.java | 2 +- .../boot/actuate/metrics/MetricsEndpointTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java index e6a8aff85c..df114024dd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java @@ -46,7 +46,7 @@ public class SimpleProperties { /** * Counting mode. */ - private CountingMode mode = CountingMode.Cumulative; + private CountingMode mode = CountingMode.CUMULATIVE; public boolean getEnabled() { return this.enabled; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java index 0c6f90b0b6..b0e1203c03 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java @@ -40,7 +40,7 @@ public class StatsdProperties { /** * StatsD line protocol to use. */ - private StatsdFlavor flavor = StatsdFlavor.Datadog; + private StatsdFlavor flavor = StatsdFlavor.DATADOG; /** * Host of the StatsD server to receive exported metrics. diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java index 328fde5b06..5f724c000e 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java @@ -131,7 +131,7 @@ public class MetricsEndpointTests { private Optional getCount(MetricsEndpoint.MetricResponse response) { return response.getMeasurements().stream() - .filter((ms) -> ms.getStatistic().equals(Statistic.Count)).findAny() + .filter((ms) -> ms.getStatistic().equals(Statistic.COUNT)).findAny() .map(MetricsEndpoint.Sample::getValue); }