Polish Spring Integration metrics support

See gh-7722
This commit is contained in:
Phillip Webb
2016-12-21 15:34:46 -08:00
parent d69e43b433
commit b87e02dde0
8 changed files with 86 additions and 67 deletions

View File

@@ -92,7 +92,7 @@ public class PublicMetricsAutoConfigurationTests {
public void metricReaderPublicMetrics() throws Exception {
load();
assertThat(this.context.getBeansOfType(MetricReaderPublicMetrics.class))
.hasSize(1);
.hasSize(2);
}
@Test

View File

@@ -16,7 +16,6 @@
package org.springframework.boot.actuate.metrics.integration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,7 +52,7 @@ public class SpringIntegrationMetricReaderNoJmxTests {
}
@Configuration
@Import({IntegrationAutoConfiguration.class, PublicMetricsAutoConfiguration.class})
@Import({ IntegrationAutoConfiguration.class, PublicMetricsAutoConfiguration.class })
protected static class TestConfiguration {
}

View File

@@ -56,7 +56,8 @@ public class SpringIntegrationMetricReaderTests {
protected static class TestConfiguration {
@Bean
public SpringIntegrationMetricReader reader(IntegrationManagementConfigurer managementConfigurer) {
public SpringIntegrationMetricReader reader(
IntegrationManagementConfigurer managementConfigurer) {
return new SpringIntegrationMetricReader(managementConfigurer);
}