Merge pull request spring-projects#12725 from izeye:destroy-method

* pr/12725: Remove destroyMethod attribute in @bean for MeterRegistry
michalfotyga · Apr 3, 2018 · 958f3d5 · 958f3d5
2 parents 3568019 + 4ab4398
commit 958f3d5
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/.../actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java b/.../actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java
@@ -142,7 +142,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) {
 			return new AtlasMeterRegistry(config, clock);
 		}

diff --git a/...uate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java b/...uate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
@@ -154,7 +154,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) {
 			return new DatadogMeterRegistry(config, clock);
 		}

diff --git a/...uate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java b/...uate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java
@@ -142,7 +142,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) {
 			return new GangliaMeterRegistry(config, clock);
 		}

diff --git a/...te/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java b/...te/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
@@ -145,7 +145,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) {
 			return new GraphiteMeterRegistry(config, clock);
 		}

diff --git a/...ctuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java b/...ctuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java
@@ -142,7 +142,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) {
 			return new InfluxMeterRegistry(config, clock);
 		}

diff --git a/...boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java b/...boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java
@@ -158,7 +158,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) {
 			return new JmxMeterRegistry(config, clock);
 		}

diff --git a/...te/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java b/...te/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
@@ -172,7 +172,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) {
 			return new NewRelicMeterRegistry(config, clock);
 		}

diff --git a/...te/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java b/...te/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
@@ -164,7 +164,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) {
 			return new SignalFxMeterRegistry(config, clock);
 		}

diff --git a/...ctuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java b/...ctuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java
@@ -160,7 +160,7 @@ public String get(String k) {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) {
 			return new StatsdMeterRegistry(config, clock);
 		}

diff --git a/.../autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java b/.../autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java
@@ -146,7 +146,7 @@ public String uri() {
 	@Import(BaseConfiguration.class)
 	static class CustomRegistryConfiguration {
 
-		@Bean(destroyMethod = "stop")
+		@Bean
 		public WavefrontMeterRegistry customRegistry(WavefrontConfig config,
 				Clock clock) {
 			return new WavefrontMeterRegistry(config, clock);