root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish 

Closes gh-6835
This commit is contained in:
Phillip Webb 2016-09-16 11:54:50 -07:00
parent faab9047d6
commit 3172d434a7
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java
View File

@ -80,8 +80,8 @@ public class EndpointDocumentation {
private MvcEndpoints mvcEndpoints; private MvcEndpoints mvcEndpoints;
@Autowired @Autowired
@Qualifier("metricFilter") @Qualifier("metricsFilter")
private Filter metricFilter; private Filter metricsFilter;
@Autowired @Autowired
@Qualifier("webRequestLoggingFilter") @Qualifier("webRequestLoggingFilter")
@ -95,7 +95,7 @@ public class EndpointDocumentation {
@Before @Before
public void setUp() { public void setUp() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context) this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
.addFilters(this.metricFilter, this.traceFilter) .addFilters(this.metricsFilter, this.traceFilter)
.apply(documentationConfiguration(this.restDocumentation)).build(); .apply(documentationConfiguration(this.restDocumentation)).build();
} }

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java
View File

@ -55,7 +55,7 @@ public class MetricFilterAutoConfiguration {
private GaugeService gaugeService; private GaugeService gaugeService;
@Bean @Bean
public MetricsFilter metricFilter() { public MetricsFilter metricsFilter() {
return new MetricsFilter(this.counterService, this.gaugeService); return new MetricsFilter(this.counterService, this.gaugeService);
} }

6
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
View File

@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests {
given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider"); given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider");
Connection connection = mock(Connection.class); Connection connection = mock(Connection.class);
given(connection.getMetaData()).willReturn(connectionMetaData); given(connection.getMetaData()).willReturn(connectionMetaData);
willThrow(new JMSException("Could not start", "123")) willThrow(new JMSException("Could not start", "123")).given(connection).start();
.given(connection).start(); given(connectionFactory.createConnection()).willReturn(connection);
given(connectionFactory.createConnection())
.willReturn(connection);
JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory); JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory);
Health health = indicator.health(); Health health = indicator.health();
assertEquals(Status.DOWN, health.getStatus()); assertEquals(Status.DOWN, health.getStatus());