diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java index ba0b390241..0848a449d8 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java @@ -240,17 +240,6 @@ public abstract class EndpointDiscoverer, O exten && isExtensionTypeExposed(extensionBean.getBeanType()); } - /** - * Determine if an extension bean should be exposed. Subclasses can override this - * method to provide additional logic. - * @param extensionBean the extension bean - * @return {@code true} if the extension is exposed - */ - @Deprecated - protected boolean isExtensionExposed(Object extensionBean) { - return true; - } - /** * Determine if an extension bean should be exposed. Subclasses can override this * method to provide additional logic. @@ -263,18 +252,7 @@ public abstract class EndpointDiscoverer, O exten private boolean isEndpointExposed(EndpointBean endpointBean) { return isFilterMatch(endpointBean.getFilter(), endpointBean) && !isEndpointFiltered(endpointBean) - && isEndpointExposed(endpointBean.getBean()); - } - - /** - * Determine if an endpoint bean should be exposed. Subclasses can override this - * method to provide additional logic. - * @param endpointBean the endpoint bean - * @return {@code true} if the endpoint is exposed - */ - @Deprecated - protected boolean isEndpointExposed(Object endpointBean) { - return true; + && isEndpointTypeExposed(endpointBean.getBeanType()); } /**