Commit 994f08d2 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish "Fix annotation lookup on proxied EndpointExtension"

See gh-17807
parent 9083da28
...@@ -114,15 +114,6 @@ public class EndpointDiscovererTests { ...@@ -114,15 +114,6 @@ public class EndpointDiscovererTests {
load(TestEndpointConfiguration.class, this::hasTestEndpoint); 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 @Test
public void getEndpointsWhenHasEndpointInParentContextShouldReturnEndpoint() { public void getEndpointsWhenHasEndpointInParentContextShouldReturnEndpoint() {
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext( AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(
...@@ -247,6 +238,15 @@ public class EndpointDiscovererTests { ...@@ -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 @Test
public void getEndpointsShouldApplyFilters() { public void getEndpointsShouldApplyFilters() {
load(SpecializedEndpointsConfiguration.class, (context) -> { load(SpecializedEndpointsConfiguration.class, (context) -> {
...@@ -401,11 +401,6 @@ public class EndpointDiscovererTests { ...@@ -401,11 +401,6 @@ public class EndpointDiscovererTests {
} }
@Import({ TestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class, SpecializedTestEndpoint.class })
static class ProxiedSpecializedEndpointsConfiguration {
}
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class }) @Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class })
static class SpecializedEndpointsConfiguration { static class SpecializedEndpointsConfiguration {
...@@ -416,6 +411,11 @@ public class EndpointDiscovererTests { ...@@ -416,6 +411,11 @@ public class EndpointDiscovererTests {
} }
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class })
static class ProxiedSpecializedEndpointsConfiguration {
}
@Endpoint(id = "test") @Endpoint(id = "test")
static class TestEndpoint { static class TestEndpoint {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment