Skip to content

Commit db67750

Browse files
committed
Merge pull request #24317 from dreis2211
* pr/24317: Remove deprecated code in EndpointDiscoverer Closes gh-24317
2 parents 258f1d6 + 0389a07 commit db67750

File tree

1 file changed

+1
-23
lines changed
  • spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation

1 file changed

+1
-23
lines changed

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,6 @@ private boolean isExtensionExposed(EndpointBean endpointBean, ExtensionBean exte
240240
&& isExtensionTypeExposed(extensionBean.getBeanType());
241241
}
242242

243-
/**
244-
* Determine if an extension bean should be exposed. Subclasses can override this
245-
* method to provide additional logic.
246-
* @param extensionBean the extension bean
247-
* @return {@code true} if the extension is exposed
248-
*/
249-
@Deprecated
250-
protected boolean isExtensionExposed(Object extensionBean) {
251-
return true;
252-
}
253-
254243
/**
255244
* Determine if an extension bean should be exposed. Subclasses can override this
256245
* method to provide additional logic.
@@ -263,18 +252,7 @@ protected boolean isExtensionTypeExposed(Class<?> extensionBeanType) {
263252

264253
private boolean isEndpointExposed(EndpointBean endpointBean) {
265254
return isFilterMatch(endpointBean.getFilter(), endpointBean) && !isEndpointFiltered(endpointBean)
266-
&& isEndpointExposed(endpointBean.getBean());
267-
}
268-
269-
/**
270-
* Determine if an endpoint bean should be exposed. Subclasses can override this
271-
* method to provide additional logic.
272-
* @param endpointBean the endpoint bean
273-
* @return {@code true} if the endpoint is exposed
274-
*/
275-
@Deprecated
276-
protected boolean isEndpointExposed(Object endpointBean) {
277-
return true;
255+
&& isEndpointTypeExposed(endpointBean.getBeanType());
278256
}
279257

280258
/**

0 commit comments

Comments
 (0)