From 3172d434a7b232763d6a18659db832a804ff7938 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 16 Sep 2016 11:54:50 -0700 Subject: [PATCH] Polish Closes gh-6835 --- .../boot/actuate/hypermedia/EndpointDocumentation.java | 6 +++--- .../autoconfigure/MetricFilterAutoConfiguration.java | 2 +- .../boot/actuate/health/JmsHealthIndicatorTests.java | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java index 1a4b5b2b6d6..8ff3b06c1a3 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java @@ -80,8 +80,8 @@ public class EndpointDocumentation { private MvcEndpoints mvcEndpoints; @Autowired - @Qualifier("metricFilter") - private Filter metricFilter; + @Qualifier("metricsFilter") + private Filter metricsFilter; @Autowired @Qualifier("webRequestLoggingFilter") @@ -95,7 +95,7 @@ public class EndpointDocumentation { @Before public void setUp() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context) - .addFilters(this.metricFilter, this.traceFilter) + .addFilters(this.metricsFilter, this.traceFilter) .apply(documentationConfiguration(this.restDocumentation)).build(); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 20d0453e1c6..8c27975df64 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -55,7 +55,7 @@ public class MetricFilterAutoConfiguration { private GaugeService gaugeService; @Bean - public MetricsFilter metricFilter() { + public MetricsFilter metricsFilter() { return new MetricsFilter(this.counterService, this.gaugeService); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java index 76f2beffeac..8221c8c2510 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java @@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests { given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider"); Connection connection = mock(Connection.class); given(connection.getMetaData()).willReturn(connectionMetaData); - willThrow(new JMSException("Could not start", "123")) - .given(connection).start(); - given(connectionFactory.createConnection()) - .willReturn(connection); + willThrow(new JMSException("Could not start", "123")).given(connection).start(); + given(connectionFactory.createConnection()).willReturn(connection); JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory); Health health = indicator.health(); assertEquals(Status.DOWN, health.getStatus());