Skip to content

Commit de674db

Browse files
wilkinsonawilkinsona
committed
Merge branch '2.0.x'
2 parents 7675733 + b1d159b commit de674db

15 files changed

+59
-344
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.appoptics;
1818

19-
import java.util.Map;
20-
2119
import io.micrometer.appoptics.AppOpticsConfig;
2220
import io.micrometer.appoptics.AppOpticsMeterRegistry;
2321
import io.micrometer.core.instrument.Clock;
2422
import org.junit.Test;
2523

2624
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2825
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2926
import org.springframework.context.annotation.Bean;
3027
import org.springframework.context.annotation.Configuration;
3128
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.util.ReflectionTestUtils;
3329

3430
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.mockito.Mockito.spy;
36-
import static org.mockito.Mockito.verify;
3731

3832
/**
3933
* Tests for {@link AppOpticsMetricsExportAutoConfiguration}.
@@ -89,27 +83,14 @@ public void allowsCustomRegistryToBeUsed() {
8983
public void stopsMeterRegistryWhenContextIsClosed() {
9084
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
9185
.run((context) -> {
92-
AppOpticsMeterRegistry registry = spyOnDisposableBean(
93-
AppOpticsMeterRegistry.class, context);
86+
AppOpticsMeterRegistry registry = context
87+
.getBean(AppOpticsMeterRegistry.class);
88+
assertThat(registry.isClosed()).isFalse();
9489
context.close();
95-
verify(registry).stop();
90+
assertThat(registry.isClosed()).isTrue();
9691
});
9792
}
9893

99-
@SuppressWarnings("unchecked")
100-
private <T> T spyOnDisposableBean(Class<T> type,
101-
AssertableApplicationContext context) {
102-
String[] names = context.getBeanNamesForType(type);
103-
assertThat(names).hasSize(1);
104-
String registryBeanName = names[0];
105-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
106-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
107-
Object registryAdapter = disposableBeans.get(registryBeanName);
108-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
109-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
110-
return registry;
111-
}
112-
11394
@Configuration
11495
static class BaseConfiguration {
11596

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.atlas;
1818

19-
import java.util.Map;
20-
2119
import com.netflix.spectator.atlas.AtlasConfig;
2220
import io.micrometer.atlas.AtlasMeterRegistry;
2321
import io.micrometer.core.instrument.Clock;
2422
import org.junit.Test;
2523

2624
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2825
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2926
import org.springframework.context.annotation.Bean;
3027
import org.springframework.context.annotation.Configuration;
3128
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.util.ReflectionTestUtils;
3329

3430
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.mockito.Mockito.spy;
36-
import static org.mockito.Mockito.verify;
3731

3832
/**
3933
* Tests for {@link AtlasMetricsExportAutoConfiguration}.
@@ -89,27 +83,14 @@ public void allowsCustomRegistryToBeUsed() {
8983
public void stopsMeterRegistryWhenContextIsClosed() {
9084
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
9185
.run((context) -> {
92-
AtlasMeterRegistry registry = spyOnDisposableBean(
93-
AtlasMeterRegistry.class, context);
86+
AtlasMeterRegistry registry = context
87+
.getBean(AtlasMeterRegistry.class);
88+
assertThat(registry.isClosed()).isFalse();
9489
context.close();
95-
verify(registry).stop();
90+
assertThat(registry.isClosed()).isTrue();
9691
});
9792
}
9893

99-
@SuppressWarnings("unchecked")
100-
private <T> T spyOnDisposableBean(Class<T> type,
101-
AssertableApplicationContext context) {
102-
String[] names = context.getBeanNamesForType(type);
103-
assertThat(names).hasSize(1);
104-
String registryBeanName = names[0];
105-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
106-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
107-
Object registryAdapter = disposableBeans.get(registryBeanName);
108-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
109-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
110-
return registry;
111-
}
112-
11394
@Configuration
11495
static class BaseConfiguration {
11596

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
1818

19-
import java.util.Map;
20-
2119
import io.micrometer.core.instrument.Clock;
2220
import io.micrometer.datadog.DatadogConfig;
2321
import io.micrometer.datadog.DatadogMeterRegistry;
2422
import org.junit.Test;
2523

2624
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2825
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2926
import org.springframework.context.annotation.Bean;
3027
import org.springframework.context.annotation.Configuration;
3128
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.util.ReflectionTestUtils;
3329

3430
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.mockito.Mockito.spy;
36-
import static org.mockito.Mockito.verify;
3731

3832
/**
3933
* Tests for {@link DatadogMetricsExportAutoConfiguration}.
@@ -98,27 +92,14 @@ public void stopsMeterRegistryWhenContextIsClosed() {
9892
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
9993
.withPropertyValues("management.metrics.export.datadog.api-key=abcde")
10094
.run((context) -> {
101-
DatadogMeterRegistry registry = spyOnDisposableBean(
102-
DatadogMeterRegistry.class, context);
95+
DatadogMeterRegistry registry = context
96+
.getBean(DatadogMeterRegistry.class);
97+
assertThat(registry.isClosed()).isFalse();
10398
context.close();
104-
verify(registry).stop();
99+
assertThat(registry.isClosed()).isTrue();
105100
});
106101
}
107102

108-
@SuppressWarnings("unchecked")
109-
private <T> T spyOnDisposableBean(Class<T> type,
110-
AssertableApplicationContext context) {
111-
String[] names = context.getBeanNamesForType(type);
112-
assertThat(names).hasSize(1);
113-
String registryBeanName = names[0];
114-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
115-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
116-
Object registryAdapter = disposableBeans.get(registryBeanName);
117-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
118-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
119-
return registry;
120-
}
121-
122103
@Configuration
123104
static class BaseConfiguration {
124105

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.dynatrace;
1818

19-
import java.util.Map;
2019
import java.util.function.Function;
2120

2221
import io.micrometer.core.instrument.Clock;
@@ -25,16 +24,12 @@
2524
import org.junit.Test;
2625

2726
import org.springframework.boot.autoconfigure.AutoConfigurations;
28-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2927
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3028
import org.springframework.context.annotation.Bean;
3129
import org.springframework.context.annotation.Configuration;
3230
import org.springframework.context.annotation.Import;
33-
import org.springframework.test.util.ReflectionTestUtils;
3431

3532
import static org.assertj.core.api.Assertions.assertThat;
36-
import static org.mockito.Mockito.spy;
37-
import static org.mockito.Mockito.verify;
3833

3934
/**
4035
* Tests for {@link DynatraceMetricsExportAutoConfiguration}.
@@ -99,10 +94,11 @@ public void allowsCustomRegistryToBeUsed() {
9994
public void stopsMeterRegistryWhenContextIsClosed() {
10095
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
10196
.with(mandatoryProperties()).run((context) -> {
102-
DynatraceMeterRegistry registry = spyOnDisposableBean(
103-
DynatraceMeterRegistry.class, context);
97+
DynatraceMeterRegistry registry = context
98+
.getBean(DynatraceMeterRegistry.class);
99+
assertThat(registry.isClosed()).isFalse();
104100
context.close();
105-
verify(registry).stop();
101+
assertThat(registry.isClosed()).isTrue();
106102
});
107103
}
108104

@@ -113,20 +109,6 @@ private Function<ApplicationContextRunner, ApplicationContextRunner> mandatoryPr
113109
"management.metrics.export.dynatrace.device-id=test");
114110
}
115111

116-
@SuppressWarnings("unchecked")
117-
private <T> T spyOnDisposableBean(Class<T> type,
118-
AssertableApplicationContext context) {
119-
String[] names = context.getBeanNamesForType(type);
120-
assertThat(names).hasSize(1);
121-
String registryBeanName = names[0];
122-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
123-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
124-
Object registryAdapter = disposableBeans.get(registryBeanName);
125-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
126-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
127-
return registry;
128-
}
129-
130112
@Configuration
131113
static class BaseConfiguration {
132114

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.elastic;
1818

19-
import java.util.Map;
20-
2119
import io.micrometer.core.instrument.Clock;
2220
import io.micrometer.elastic.ElasticConfig;
2321
import io.micrometer.elastic.ElasticMeterRegistry;
2422
import org.junit.Test;
2523

2624
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2825
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2926
import org.springframework.context.annotation.Bean;
3027
import org.springframework.context.annotation.Configuration;
3128
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.util.ReflectionTestUtils;
3329

3430
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.mockito.Mockito.spy;
36-
import static org.mockito.Mockito.verify;
3731

3832
/**
3933
* Tests for {@link ElasticMetricsExportAutoConfiguration}.
@@ -90,27 +84,14 @@ public void allowsCustomRegistryToBeUsed() {
9084
public void stopsMeterRegistryWhenContextIsClosed() {
9185
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
9286
.run((context) -> {
93-
ElasticMeterRegistry registry = spyOnDisposableBean(
94-
ElasticMeterRegistry.class, context);
87+
ElasticMeterRegistry registry = context
88+
.getBean(ElasticMeterRegistry.class);
89+
assertThat(registry.isClosed()).isFalse();
9590
context.close();
96-
verify(registry).stop();
91+
assertThat(registry.isClosed()).isTrue();
9792
});
9893
}
9994

100-
@SuppressWarnings("unchecked")
101-
private <T> T spyOnDisposableBean(Class<T> type,
102-
AssertableApplicationContext context) {
103-
String[] names = context.getBeanNamesForType(type);
104-
assertThat(names).hasSize(1);
105-
String registryBeanName = names[0];
106-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
107-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
108-
Object registryAdapter = disposableBeans.get(registryBeanName);
109-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
110-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
111-
return registry;
112-
}
113-
11495
@Configuration
11596
static class BaseConfiguration {
11697

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.ganglia;
1818

19-
import java.util.Map;
20-
2119
import io.micrometer.core.instrument.Clock;
2220
import io.micrometer.ganglia.GangliaConfig;
2321
import io.micrometer.ganglia.GangliaMeterRegistry;
2422
import org.junit.Test;
2523

2624
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2825
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2926
import org.springframework.context.annotation.Bean;
3027
import org.springframework.context.annotation.Configuration;
3128
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.util.ReflectionTestUtils;
3329

3430
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.mockito.Mockito.spy;
36-
import static org.mockito.Mockito.verify;
3731

3832
/**
3933
* Tests for {@link GangliaMetricsExportAutoConfiguration}.
@@ -89,27 +83,14 @@ public void allowsCustomRegistryToBeUsed() {
8983
public void stopsMeterRegistryWhenContextIsClosed() {
9084
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
9185
.run((context) -> {
92-
GangliaMeterRegistry registry = spyOnDisposableBean(
93-
GangliaMeterRegistry.class, context);
86+
GangliaMeterRegistry registry = context
87+
.getBean(GangliaMeterRegistry.class);
88+
assertThat(registry.isClosed()).isFalse();
9489
context.close();
95-
verify(registry).stop();
90+
assertThat(registry.isClosed()).isTrue();
9691
});
9792
}
9893

99-
@SuppressWarnings("unchecked")
100-
private <T> T spyOnDisposableBean(Class<T> type,
101-
AssertableApplicationContext context) {
102-
String[] names = context.getBeanNamesForType(type);
103-
assertThat(names).hasSize(1);
104-
String registryBeanName = names[0];
105-
Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils
106-
.getField(context.getAutowireCapableBeanFactory(), "disposableBeans");
107-
Object registryAdapter = disposableBeans.get(registryBeanName);
108-
T registry = (T) spy(ReflectionTestUtils.getField(registryAdapter, "bean"));
109-
ReflectionTestUtils.setField(registryAdapter, "bean", registry);
110-
return registry;
111-
}
112-
11394
@Configuration
11495
static class BaseConfiguration {
11596

0 commit comments

Comments
 (0)