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

Merge branch '2.1.x' 

Closes gh-18882
This commit is contained in:
Andy Wilkinson 2019-11-05 11:05:51 +00:00
parent a65374b16b ed50bf2494
commit ce01f7f150
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
View File

@ -424,7 +424,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
}
private Class<?> getFilter(Class<?> type) {
return MergedAnnotations.from(type).get(FilteredEndpoint.class)
return MergedAnnotations.from(type, SearchStrategy.TYPE_HIERARCHY).get(FilteredEndpoint.class)
.getValue(MergedAnnotation.VALUE, Class.class).orElse(null);
}

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

@ -209,7 +209,8 @@ class EndpointDiscovererTests {
load(SpecializedEndpointsConfiguration.class, (context) -> {
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context);
Map<EndpointId, SpecializedExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"));
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized"),
EndpointId.of("specialized-superclass"));
});
}
@ -252,7 +253,7 @@ class EndpointDiscovererTests {
load(SpecializedEndpointsConfiguration.class, (context) -> {
EndpointFilter<SpecializedExposableEndpoint> filter = (endpoint) -> {
EndpointId id = endpoint.getEndpointId();
return !id.equals(EndpointId.of("specialized"));
return !id.equals(EndpointId.of("specialized")) && !id.equals(EndpointId.of("specialized-superclass"));
};
SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context,
Collections.singleton(filter));
@ -401,7 +402,8 @@ class EndpointDiscovererTests {
}
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class })
@Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedSuperclassTestEndpoint.class,
SpecializedExtension.class })
static class SpecializedEndpointsConfiguration {
}
@ -494,6 +496,20 @@ class EndpointDiscovererTests {
}
@SpecializedEndpoint(id = "specialized-superclass")
static class AbstractFilteredEndpoint {
}
static class SpecializedSuperclassTestEndpoint extends AbstractFilteredEndpoint {
@ReadOperation
public Object getAll() {
return null;
}
}
static class SubSpecializedTestEndpoint extends SpecializedTestEndpoint {
@ReadOperation