Browse Source

Merge pull request #12725 from izeye:destroy-method

* pr/12725:
  Remove destroyMethod attribute in @Bean for MeterRegistry
pull/12683/merge
Stephane Nicoll 8 years ago
parent
commit
958f3d5bf5
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java
  2. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
  3. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java
  4. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
  5. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java
  6. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java
  7. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
  8. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
  9. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java
  10. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java

@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests { @@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) {
return new AtlasMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java

@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests { @@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) {
return new DatadogMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java

@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests { @@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) {
return new GangliaMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java

@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests { @@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) {
return new GraphiteMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java

@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests { @@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) {
return new InfluxMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java

@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests { @@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) {
return new JmxMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java

@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests { @@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) {
return new NewRelicMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java

@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests { @@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) {
return new SignalFxMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java

@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests { @@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) {
return new StatsdMeterRegistry(config, clock);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java

@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests { @@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class)
static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop")
@Bean
public WavefrontMeterRegistry customRegistry(WavefrontConfig config,
Clock clock) {
return new WavefrontMeterRegistry(config, clock);

Loading…
Cancel
Save