This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch secret in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94cddfcbe4509ee8536fe4b800692e22d37ebf9f Author: Claus Ibsen <[email protected]> AuthorDate: Wed Sep 7 12:59:09 2022 +0200 CAMEL-18454: Allow to enable secret refresh from vault. (AWS) --- .../aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java | 5 ++--- .../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 1 - .../org/apache/camel/impl/engine/DefaultPeriodTaskResolver.java | 4 ++-- .../org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java | 4 ++-- .../org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java | 2 +- .../java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java | 6 +++--- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 4 ---- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java index ccd8332196f..9c093f7f2cd 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java @@ -43,8 +43,7 @@ import software.amazon.awssdk.services.cloudtrail.model.LookupEventsResponse; import software.amazon.awssdk.services.cloudtrail.model.Resource; /** - * Period task which checks if AWS secrets has been updated and - * can trigger Camel to be reloaded. + * Period task which checks if AWS secrets has been updated and can trigger Camel to be reloaded. */ @PeriodicTask("aws-secret-refresh") public class CloudTrailReloadTriggerTask extends ServiceSupport implements CamelContextAware, Runnable { @@ -163,7 +162,7 @@ public class CloudTrailReloadTriggerTask extends ServiceSupport implements Camel protected boolean matchSecret(String name, String patterns) { String[] parts = patterns.split(","); for (String part : parts) { - if (name.contains(part) || PatternHelper.matchPattern(name, part)) { + if (name.contains(part) || PatternHelper.matchPattern(name, part)) { return true; } } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index cb25e10102c..d89ae2be645 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -183,7 +183,6 @@ import org.apache.camel.support.NormalizedUri; import org.apache.camel.support.OrderedComparator; import org.apache.camel.support.ProcessorEndpoint; import org.apache.camel.support.ResolverHelper; -import org.apache.camel.support.TimerListenerManager; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.service.BaseService; import org.apache.camel.support.service.ServiceHelper; diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskResolver.java index 3c7cce5f90e..487170ea02c 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskResolver.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskResolver.java @@ -16,11 +16,11 @@ */ package org.apache.camel.impl.engine; +import java.util.Optional; + import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.PeriodTaskResolver; -import java.util.Optional; - public class DefaultPeriodTaskResolver implements PeriodTaskResolver { private final FactoryFinder finder; diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java index 6903766332c..e6d63bd7864 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java @@ -22,8 +22,8 @@ import org.apache.camel.support.TimerListenerManager; import org.apache.camel.util.StopWatch; /** - * A {@link PeriodTaskScheduler} that schedules generic tasks from - * custom components that are defined with the {@link org.apache.camel.spi.annotations.PeriodicTask} annotation. + * A {@link PeriodTaskScheduler} that schedules generic tasks from custom components that are defined with the + * {@link org.apache.camel.spi.annotations.PeriodicTask} annotation. */ public final class DefaultPeriodTaskScheduler extends TimerListenerManager implements PeriodTaskScheduler { diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java index 7f81221c925..e4f996d30ed 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java @@ -259,7 +259,7 @@ public class LightweightRuntimeCamelContext implements ExtendedCamelContext, Cat routeController = context.getRouteController(); inflightRepository = context.getInflightRepository(); periodTaskResolver = context.adapt(ExtendedCamelContext.class).getPeriodTaskResolver(); - periodTaskScheduler = context.adapt(ExtendedCamelContext.class).getPeriodTaskScheduler(); + periodTaskScheduler = context.adapt(ExtendedCamelContext.class).getPeriodTaskScheduler(); globalOptions = context.getGlobalOptions(); injector = context.getInjector(); classResolver = context.getClassResolver(); diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java index cc21c47dfc1..861fb2cd94d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.impl.engine; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import org.apache.camel.ContextTestSupport; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.spi.PeriodTaskScheduler; @@ -23,9 +26,6 @@ import org.apache.camel.support.TimerListenerManager; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - public class PeriodTaskSchedulerTest extends ContextTestSupport { private final AtomicInteger counter = new AtomicInteger(); diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 7f8b9bbf61f..0fd5253a315 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -49,20 +49,17 @@ import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.event.CamelContextRoutesStartedEvent; -import org.apache.camel.model.cloud.ServiceCallDefinitionConstants; import org.apache.camel.saga.CamelSagaService; import org.apache.camel.spi.AutowiredLifecycleStrategy; import org.apache.camel.spi.CamelBeanPostProcessor; import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.Language; import org.apache.camel.spi.PackageScanClassResolver; import org.apache.camel.spi.PeriodTaskScheduler; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.RouteTemplateParameterSource; import org.apache.camel.spi.StartupStepRecorder; -import org.apache.camel.spi.annotations.PeriodicTask; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.EventNotifierSupport; import org.apache.camel.support.LifecycleStrategySupport; @@ -70,7 +67,6 @@ import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.ResourceHelper; import org.apache.camel.support.service.BaseService; import org.apache.camel.support.startup.LoggingStartupStepRecorder; -import org.apache.camel.support.task.BackgroundTask; import org.apache.camel.util.FileUtil; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.OrderedLocationProperties;
