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

Merge pull request #24317 from dreis2211 

* pr/24317:
  Remove deprecated code in EndpointDiscoverer

Closes gh-24317
This commit is contained in:
Madhura Bhave 2020-12-03 16:59:53 -08:00
parent 258f1d6c78 0389a07f7c
commit db677501ea
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,17 +240,6 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
&& isExtensionTypeExposed(extensionBean.getBeanType()); && 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 * Determine if an extension bean should be exposed. Subclasses can override this
* method to provide additional logic. * method to provide additional logic.
@ -263,18 +252,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
private boolean isEndpointExposed(EndpointBean endpointBean) { private boolean isEndpointExposed(EndpointBean endpointBean) {
return isFilterMatch(endpointBean.getFilter(), endpointBean) && !isEndpointFiltered(endpointBean) return isFilterMatch(endpointBean.getFilter(), endpointBean) && !isEndpointFiltered(endpointBean)
&& isEndpointExposed(endpointBean.getBean()); && isEndpointTypeExposed(endpointBean.getBeanType());
}
/**
* 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;
} }
/** /**