From 64bcba47a96ef869908fb12f320a2c94da6905ee Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 30 Sep 2015 10:37:59 +0100 Subject: [PATCH] Polish contribution - Add @author tag - Remove unnecessary final modifiers - Avoid writing to volatile field when new gauge is used Closes gh-3977 --- .../metrics/dropwizard/DropwizardMetricServices.java | 12 +++++++----- .../dropwizard/DropwizardMetricServicesTests.java | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java index 4f24bfa038d..45b3beb063a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java @@ -46,6 +46,8 @@ import com.codahale.metrics.Timer; * * * @author Dave Syer + * @author Jay Anderson + * @author Andy Wilkinson */ public class DropwizardMetricServices implements CounterService, GaugeService { @@ -103,15 +105,15 @@ public class DropwizardMetricServices implements CounterService, GaugeService { } } - private void setGaugeValue(final String name, final double value) { + private void setGaugeValue(String name, double value) { // NOTE: Dropwizard provides no way to do this atomically SimpleGauge gauge = this.gauges.get(name); if (gauge == null) { - final SimpleGauge newGauge = new SimpleGauge(value); + SimpleGauge newGauge = new SimpleGauge(value); gauge = this.gauges.putIfAbsent(name, newGauge); if (gauge == null) { - gauge = newGauge; - this.registry.register(name, gauge); + this.registry.register(name, newGauge); + return; } } gauge.setValue(value); @@ -161,7 +163,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService { return this.value; } - public void setValue(final double value) { + public void setValue(double value) { this.value = value; } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java index 0666a596424..4e7aadd091b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java @@ -65,9 +65,10 @@ public class DropwizardMetricServicesTests { @Test public void setGauge() { this.writer.submit("foo", 2.1); - this.writer.submit("foo", 2.3); @SuppressWarnings("unchecked") Gauge gauge = (Gauge) this.registry.getMetrics().get("gauge.foo"); + assertEquals(new Double(2.1), gauge.getValue()); + this.writer.submit("foo", 2.3); assertEquals(new Double(2.3), gauge.getValue()); }