root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish "Fix annotation lookup on proxied EndpointExtension" 

See gh-17807
This commit is contained in:
Stephane Nicoll 2019-08-08 13:58:03 +02:00
parent 9083da2876
commit 994f08d234
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,15 +114,6 @@ public class EndpointDiscovererTests {
load(TestEndpointConfiguration.class, this::hasTestEndpoint);
}
@Test
public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() {
load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> {
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context);
Map<EndpointId, SpecializedExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"));
});
}
@Test
public void getEndpointsWhenHasEndpointInParentContextShouldReturnEndpoint() {
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(
@ -247,6 +238,15 @@ public class EndpointDiscovererTests {
});
}
@Test
public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() {
load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> {
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context);
Map<EndpointId, SpecializedExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"));
});
}
@Test
public void getEndpointsShouldApplyFilters() {
load(SpecializedEndpointsConfiguration.class, (context) -> {
@ -401,11 +401,6 @@ public class EndpointDiscovererTests {
}
@Import({ TestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class, SpecializedTestEndpoint.class })
static class ProxiedSpecializedEndpointsConfiguration {
}
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class })
static class SpecializedEndpointsConfiguration {
@ -416,6 +411,11 @@ public class EndpointDiscovererTests {
}
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class })
static class ProxiedSpecializedEndpointsConfiguration {
}
@Endpoint(id = "test")
static class TestEndpoint {