This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit d9a655c81c7097699b668f97bbaaf63d29a3ce8c Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Aug 19 10:07:51 2024 +0200 (chores) convert core/camel-health to use pattern matching for instanceof --- .../java/org/apache/camel/impl/health/ConsumerHealthCheck.java | 8 ++++---- .../org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java index bbb112111c4..6454768c2c5 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java @@ -50,9 +50,9 @@ public class ConsumerHealthCheck extends RouteHealthCheck { boolean up = builder.state().compareTo(State.UP) == 0; // if a route is configured to not to automatically start, then skip consumer checks boolean external = route.getRouteController() == null && !route.isAutoStartup(); - if (up && !external && consumer instanceof HealthCheckAware) { + if (up && !external && consumer instanceof HealthCheckAware healthCheckAware) { // health check is optional - HealthCheck hc = ((HealthCheckAware) consumer).getHealthCheck(); + HealthCheck hc = healthCheckAware.getHealthCheck(); if (hc != null) { if (LOGGER.isTraceEnabled()) { LOGGER.trace("Calling HealthCheck on consumer route: {}", route.getRouteId()); @@ -73,8 +73,8 @@ public class ConsumerHealthCheck extends RouteHealthCheck { Throwable cause = result.getError().get(); builder.error(cause); // if the caused exception is HTTP response aware then include the response status code - if (cause instanceof HttpResponseAware) { - int code = ((HttpResponseAware) cause).getHttpResponseCode(); + if (cause instanceof HttpResponseAware httpResponseAware) { + int code = httpResponseAware.getHttpResponseCode(); if (code > 0) { builder.detail(HealthCheck.HTTP_RESPONSE_CODE, code); } diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java index cf3bead7f35..e8d36777c1b 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java @@ -205,8 +205,7 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health // inject context CamelContextAware.trySetCamelContext(obj, camelContext); - if (obj instanceof HealthCheck) { - HealthCheck healthCheck = (HealthCheck) obj; + if (obj instanceof HealthCheck healthCheck) { // do we have this already if (getCheck(healthCheck.getId()).isPresent()) { return false; @@ -243,8 +242,7 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health checkIfAccepted(obj); - if (obj instanceof HealthCheck) { - HealthCheck healthCheck = (HealthCheck) obj; + if (obj instanceof HealthCheck healthCheck) { result = checks.remove(healthCheck); if (result) { LOG.debug("HealthCheck with id {} successfully un-registered", healthCheck.getId());
