Skip to content

Commit 994f08d

Browse files
committed
Polish "Fix annotation lookup on proxied EndpointExtension"
See gh-17807
1 parent 9083da2 commit 994f08d

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,6 @@ public void getEndpointsWhenHasEndpointShouldReturnEndpoint() {
114114
load(TestEndpointConfiguration.class, this::hasTestEndpoint);
115115
}
116116

117-
@Test
118-
public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() {
119-
load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> {
120-
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context);
121-
Map<EndpointId, SpecializedExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
122-
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"));
123-
});
124-
}
125-
126117
@Test
127118
public void getEndpointsWhenHasEndpointInParentContextShouldReturnEndpoint() {
128119
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(
@@ -247,6 +238,15 @@ public void getEndpointShouldFindParentExtension() {
247238
});
248239
}
249240

241+
@Test
242+
public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() {
243+
load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> {
244+
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context);
245+
Map<EndpointId, SpecializedExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
246+
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"));
247+
});
248+
}
249+
250250
@Test
251251
public void getEndpointsShouldApplyFilters() {
252252
load(SpecializedEndpointsConfiguration.class, (context) -> {
@@ -401,11 +401,6 @@ public TestEndpoint scopedTargetTestEndpoint() {
401401

402402
}
403403

404-
@Import({ TestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class, SpecializedTestEndpoint.class })
405-
static class ProxiedSpecializedEndpointsConfiguration {
406-
407-
}
408-
409404
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class })
410405
static class SpecializedEndpointsConfiguration {
411406

@@ -416,6 +411,11 @@ static class SubSpecializedEndpointsConfiguration {
416411

417412
}
418413

414+
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class })
415+
static class ProxiedSpecializedEndpointsConfiguration {
416+
417+
}
418+
419419
@Endpoint(id = "test")
420420
static class TestEndpoint {
421421

0 commit comments

Comments
 (0)