This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new c441098 CAMEL-15081: Polished c441098 is described below commit c4410982ad53ff9b00b83107cb6d0365988fe714 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue May 26 13:25:48 2020 +0200 CAMEL-15081: Polished --- .../java/org/apache/camel/health/HealthCheck.java | 10 ++++++++-- .../org/apache/camel/health/HealthCheckFilter.java | 1 + .../apache/camel/health/HealthCheckRepository.java | 1 + .../camel/health/HealthCheckResultBuilder.java | 2 +- .../org/apache/camel/health/HealthCheckService.java | 3 ++- .../impl/health/DefaultHealthCheckService.java | 21 +++------------------ .../impl/health/RoutesHealthCheckRepository.java | 4 +--- .../impl/health/DefaultHealthCheckServiceTest.java | 3 +-- 8 files changed, 18 insertions(+), 27 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java index 6e037cb..d98dc01 100644 --- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java +++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java @@ -24,7 +24,11 @@ import org.apache.camel.Ordered; import org.apache.camel.spi.HasGroup; import org.apache.camel.spi.HasId; +/** + * Health check + */ public interface HealthCheck extends HasGroup, HasId, Ordered { + enum State { UP, DOWN, @@ -51,14 +55,16 @@ public interface HealthCheck extends HasGroup, HasId, Ordered { /** * Invoke the check. * - * @see {@link #call(Map)} + * @see #call(Map) */ default Result call() { return call(Collections.emptyMap()); } /** - * Invoke the check. The implementation is responsible to eventually perform + * Invoke the check. + * + * The implementation is responsible to eventually perform * the check according to the limitation of the third party system i.e. * it should not be performed too often to avoid rate limiting. The options * argument can be used to pass information specific to the check like diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java index 88857d1..e9d5367 100644 --- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java +++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java @@ -21,6 +21,7 @@ package org.apache.camel.health; */ @FunctionalInterface public interface HealthCheckFilter { + /** * Determine if the given {@link HealthCheck} has to be filtered out. * diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java index 680b7ed..39fdf75 100644 --- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java +++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java @@ -22,6 +22,7 @@ import java.util.stream.Stream; * A repository for health checks. */ public interface HealthCheckRepository { + /** * Returns a sequential {@code Stream} with the known {@link HealthCheck} * as its source. diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java index 39e8c7d..6349fde 100644 --- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java +++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java @@ -25,7 +25,7 @@ import org.apache.camel.Builder; import org.apache.camel.util.ObjectHelper; /** - * A builder helper to create a result. + * A builder helper to create a {@link HealthCheck} result. */ public final class HealthCheckResultBuilder implements Builder<HealthCheck.Result> { private HealthCheck check; diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java index 3e1e3f9..b3e12a6 100644 --- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java +++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java @@ -30,6 +30,7 @@ import org.apache.camel.Service; * according to a schedule. */ public interface HealthCheckService extends Service, CamelContextAware { + /** * Add a listener to invoke when the state of a check change. * @@ -54,7 +55,7 @@ public interface HealthCheckService extends Service, CamelContextAware { void setHealthCheckOptions(String id, Map<String, Object> options); /** - * @see {@link #call(String, Map)} + * Invokes the check identified by the given <code>id</code>. * * @param id the health check id. * @return the result of the check or {@link Optional#empty()} if the id is unknown. diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java index b365538..046ca4c 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java @@ -55,7 +55,6 @@ public final class DefaultHealthCheckService extends ServiceSupport implements H private CamelContext camelContext; private ScheduledExecutorService executorService; private long checkInterval; - private TimeUnit checkIntervalUnit; private volatile HealthCheckRegistry registry; private volatile ScheduledFuture<?> future; @@ -70,8 +69,7 @@ public final class DefaultHealthCheckService extends ServiceSupport implements H this.lock = new StampedLock(); this.camelContext = camelContext; - this.checkInterval = 30; - this.checkIntervalUnit = TimeUnit.SECONDS; + this.checkInterval = 30000; } // ************************************ @@ -104,19 +102,6 @@ public final class DefaultHealthCheckService extends ServiceSupport implements H this.checkInterval = checkInterval; } - public void setCheckInterval(long interval, TimeUnit intervalUnit) { - setCheckInterval(interval); - setCheckIntervalUnit(intervalUnit); - } - - public TimeUnit getCheckIntervalUnit() { - return checkIntervalUnit; - } - - public void setCheckIntervalUnit(TimeUnit checkIntervalUnit) { - this.checkIntervalUnit = checkIntervalUnit; - } - @Override public void addStateChangeListener(BiConsumer<HealthCheck.State, HealthCheck> consumer) { LockHelper.doWithWriteLock( @@ -182,7 +167,7 @@ public final class DefaultHealthCheckService extends ServiceSupport implements H if (ObjectHelper.isNotEmpty(registry) && ObjectHelper.isEmpty(future)) { // Start the health check task only if the health check registry // has been registered. - LOGGER.debug("Schedule health-checks to be executed every {} ({})", checkInterval, checkIntervalUnit.name()); + LOGGER.debug("Schedule health-checks to be executed every {} millis", checkInterval); future = executorService.scheduleAtFixedRate( () -> { if (!isRunAllowed()) { @@ -203,7 +188,7 @@ public final class DefaultHealthCheckService extends ServiceSupport implements H }, checkInterval, checkInterval, - checkIntervalUnit); + TimeUnit.MILLISECONDS); } } diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java index 5c38fef..d190200 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java @@ -136,9 +136,7 @@ public class RoutesHealthCheckRepository implements CamelContextAware, HealthChe // ***************************** private boolean isNotBlacklisted(Route route) { - return this.blacklist != null - ? !this.blacklist.contains(route.getId()) - : true; + return this.blacklist == null || !this.blacklist.contains(route.getId()); } private HealthCheck toRouteHealthCheck(Route route) { diff --git a/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckServiceTest.java b/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckServiceTest.java index 3584fa3..49a6535 100644 --- a/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckServiceTest.java +++ b/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckServiceTest.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; @@ -50,7 +49,7 @@ public class DefaultHealthCheckServiceTest { options.put("test", "test"); service.setHealthCheckOptions("test", options); - service.setCheckInterval(500, TimeUnit.MILLISECONDS); + service.setCheckInterval(500); service.addStateChangeListener((s, c) -> { results.add(s); check.flip();