This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit c19608e54d95ef5224e2e4d0f7f92eb78e08149c Author: Claus Ibsen <[email protected]> AuthorDate: Fri May 14 13:11:04 2021 +0200 camel-core - Use CamelContextAware to inject camel context in one line of code. --- .../camel/impl/engine/AbstractCamelContext.java | 15 +++------------ .../impl/engine/BaseExecutorServiceManager.java | 4 +--- .../impl/engine/DefaultCamelBeanPostProcessor.java | 12 +++--------- .../apache/camel/impl/engine/DefaultChannel.java | 4 +--- .../impl/engine/DefaultManagementStrategy.java | 14 ++++---------- .../org/apache/camel/impl/engine/RouteService.java | 4 +--- .../component/properties/PropertiesComponent.java | 4 +--- .../impl/converter/BaseTypeConverterRegistry.java | 14 ++------------ .../impl/lw/LightweightRuntimeCamelContext.java | 9 ++------- .../camel/processor/ClaimCheckProcessor.java | 4 +--- .../java/org/apache/camel/processor/Enricher.java | 4 +--- .../apache/camel/processor/MulticastProcessor.java | 5 +---- .../org/apache/camel/processor/PollEnricher.java | 4 +--- .../apache/camel/processor/RestBindingAdvice.java | 5 ++--- .../processor/aggregate/AggregateProcessor.java | 4 +--- .../aggregate/AggregationStrategyBeanAdapter.java | 4 +--- .../ShareUnitOfWorkAggregationStrategy.java | 4 +--- .../org/apache/camel/reifier/AggregateReifier.java | 5 +---- .../apache/camel/reifier/ClaimCheckReifier.java | 5 +---- .../org/apache/camel/reifier/EnrichReifier.java | 5 +---- .../org/apache/camel/reifier/MulticastReifier.java | 5 +---- .../apache/camel/reifier/PollEnrichReifier.java | 5 +---- .../apache/camel/reifier/RecipientListReifier.java | 5 +---- .../org/apache/camel/reifier/SplitReifier.java | 5 +---- .../camel/reifier/language/ExpressionReifier.java | 8 ++------ .../impl/health/DefaultHealthCheckRegistry.java | 22 +++++----------------- .../org/apache/camel/support/DefaultEndpoint.java | 4 +--- .../org/apache/camel/support/DefaultRegistry.java | 4 +--- .../support/ExpressionToPredicateAdapter.java | 4 +--- .../org/apache/camel/support/MessageSupport.java | 12 +++--------- .../camel/support/processor/MarshalProcessor.java | 4 +--- .../support/processor/UnmarshalProcessor.java | 4 +--- 32 files changed, 49 insertions(+), 162 deletions(-) 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 285cef6..2a4f33c 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 @@ -1411,10 +1411,7 @@ public abstract class AbstractCamelContext extends BaseService throws Exception { // inject CamelContext - if (object instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware) object; - aware.setCamelContext(getCamelContextReference()); - } + CamelContextAware.trySetCamelContext(object, getCamelContextReference()); if (object instanceof Service) { Service service = (Service) object; @@ -1984,9 +1981,7 @@ public abstract class AbstractCamelContext extends BaseService @Override public void setRegistry(Registry registry) { - if (registry instanceof CamelContextAware) { - ((CamelContextAware) registry).setCamelContext(getCamelContextReference()); - } + CamelContextAware.trySetCamelContext(registry, getCamelContextReference()); this.registry = registry; } @@ -3464,11 +3459,7 @@ public abstract class AbstractCamelContext extends BaseService addStartupListener(listener); } - if (service instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware) service; - aware.setCamelContext(getCamelContextReference()); - } - + CamelContextAware.trySetCamelContext(service, getCamelContextReference()); ServiceHelper.startService(service); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java index 43cdd96..088a170 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java @@ -455,9 +455,7 @@ public class BaseExecutorServiceManager extends ServiceSupport implements Execut ThreadPoolFactory.class) .orElseGet(DefaultThreadPoolFactory::new); } - if (threadPoolFactory instanceof CamelContextAware) { - ((CamelContextAware) threadPoolFactory).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(threadPoolFactory, camelContext); ServiceHelper.initService(threadPoolFactory); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java index 20fac01..4fcc094 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java @@ -468,9 +468,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor { throw RuntimeCamelException.wrapRuntimeException(e); } } - if (bean instanceof CamelContextAware) { - ((CamelContextAware) bean).setCamelContext(getOrLookupCamelContext()); - } + CamelContextAware.trySetCamelContext(bean, getOrLookupCamelContext()); getOrLookupCamelContext().getRegistry().bind(name, bean); } @@ -490,9 +488,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor { throw RuntimeCamelException.wrapRuntimeException(e); } } - if (value instanceof CamelContextAware) { - ((CamelContextAware) value).setCamelContext(getOrLookupCamelContext()); - } + CamelContextAware.trySetCamelContext(value, getOrLookupCamelContext()); getOrLookupCamelContext().getRegistry().bind(name, value); } } @@ -526,9 +522,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor { throw RuntimeCamelException.wrapRuntimeException(e); } } - if (value instanceof CamelContextAware) { - ((CamelContextAware) value).setCamelContext(getOrLookupCamelContext()); - } + CamelContextAware.trySetCamelContext(value, getOrLookupCamelContext()); getOrLookupCamelContext().getRegistry().bind(name, value); } } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java index 17b4969..04af79b 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java @@ -155,9 +155,7 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { this.nextProcessor = nextProcessor; // init CamelContextAware as early as possible on nextProcessor - if (nextProcessor instanceof CamelContextAware) { - ((CamelContextAware) nextProcessor).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(nextProcessor, camelContext); // the definition to wrap should be the fine grained, // so if a child is set then use it, if not then its the original output used diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java index ddf5103..84c4d44 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java @@ -185,26 +185,20 @@ public class DefaultManagementStrategy extends ServiceSupport implements Managem } for (EventNotifier notifier : eventNotifiers) { // inject CamelContext if the service is aware - if (notifier instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware) notifier; - aware.setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(notifier, camelContext); } ServiceHelper.initService(eventNotifiers, managementAgent); if (managementObjectStrategy == null) { managementObjectStrategy = createManagementObjectStrategy(); } - if (managementObjectStrategy instanceof CamelContextAware) { - ((CamelContextAware) managementObjectStrategy).setCamelContext(getCamelContext()); - } + CamelContextAware.trySetCamelContext(managementObjectStrategy, getCamelContext()); if (managementObjectNameStrategy == null) { managementObjectNameStrategy = createManagementObjectNameStrategy(); } - if (managementObjectNameStrategy instanceof CamelContextAware) { - ((CamelContextAware) managementObjectNameStrategy).setCamelContext(getCamelContext()); - } + CamelContextAware.trySetCamelContext(managementObjectNameStrategy, getCamelContext()); + ServiceHelper.initService(managementObjectStrategy, managementObjectNameStrategy); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java index 787fa14..ec11675 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java @@ -164,9 +164,7 @@ public class RouteService extends ChildServiceSupport { ((RouteIdAware) service).setRouteId(route.getId()); } // inject camel context - if (service instanceof CamelContextAware) { - ((CamelContextAware) service).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(service, camelContext); if (service instanceof Consumer) { this.input = (Consumer) service; diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java index e711f61..8e2191a 100644 --- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java @@ -540,9 +540,7 @@ public class PropertiesComponent extends ServiceSupport @Override public void addPropertiesSource(PropertiesSource propertiesSource) { - if (propertiesSource instanceof CamelContextAware) { - ((CamelContextAware) propertiesSource).setCamelContext(getCamelContext()); - } + CamelContextAware.trySetCamelContext(propertiesSource, getCamelContext()); synchronized (lock) { sources.add(propertiesSource); if (!isNew()) { diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java index c56d231..84481eb 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java @@ -101,12 +101,7 @@ public abstract class BaseTypeConverterRegistry extends CoreTypeConverterRegistr @Override public void addFallbackTypeConverter(TypeConverter typeConverter, boolean canPromote) { super.addFallbackTypeConverter(typeConverter, canPromote); - if (typeConverter instanceof CamelContextAware) { - CamelContextAware camelContextAware = (CamelContextAware) typeConverter; - if (camelContext != null) { - camelContextAware.setCamelContext(camelContext); - } - } + CamelContextAware.trySetCamelContext(typeConverter, camelContext); } private void addCoreFallbackTypeConverterToList( @@ -118,12 +113,7 @@ public abstract class BaseTypeConverterRegistry extends CoreTypeConverterRegistr // the last one which is add to the FallbackTypeConverter will be called at the first place converters.add(0, new FallbackTypeConverter(typeConverter, canPromote)); - if (typeConverter instanceof CamelContextAware) { - CamelContextAware camelContextAware = (CamelContextAware) typeConverter; - if (camelContext != null) { - camelContextAware.setCamelContext(camelContext); - } - } + CamelContextAware.trySetCamelContext(typeConverter, camelContext); } @Override 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 409c494..211527b 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 @@ -901,9 +901,7 @@ public class LightweightRuntimeCamelContext implements ExtendedCamelContext, Cat answer = getLanguageResolver().resolveLanguage(language, reference); // inject CamelContext if aware if (answer != null) { - if (answer instanceof CamelContextAware) { - ((CamelContextAware) answer).setCamelContext(reference); - } + CamelContextAware.trySetCamelContext(answer, reference); if (answer instanceof Service) { try { startService((Service) answer); @@ -2081,10 +2079,7 @@ public class LightweightRuntimeCamelContext implements ExtendedCamelContext, Cat StartupListener listener = (StartupListener) service; addStartupListener(listener); } - if (service instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware) service; - aware.setCamelContext(reference); - } + CamelContextAware.trySetCamelContext(service, reference); service.start(); } } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java index ba664ee..3af4cd0 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java @@ -189,9 +189,7 @@ public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAwar if (aggregationStrategy == null) { aggregationStrategy = createAggregationStrategy(); } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(aggregationStrategy, camelContext); if (LanguageSupport.hasSimpleFunction(key)) { keyExpression = camelContext.resolveLanguage("simple").createExpression(key); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java index 4c82b19..63901a2 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java @@ -248,9 +248,7 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA if (aggregationStrategy == null) { aggregationStrategy = defaultAggregationStrategy(); } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(aggregationStrategy, camelContext); ServiceHelper.buildService(processorExchangeFactory, sendDynamicProcessor); } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java index ba582c7..7edaff7 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -1115,10 +1115,7 @@ public class MulticastProcessor extends AsyncProcessorSupport aggregateExecutorService = createAggregateExecutorService(name); shutdownAggregateExecutorService = true; } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(aggregationStrategy, camelContext); ServiceHelper.startService(aggregationStrategy, processors, processorExchangeFactory); } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java index a4c528c..dcf8db5 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java @@ -434,9 +434,7 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout consumerCache = new DefaultConsumerCache(this, camelContext, cacheSize); LOG.debug("PollEnrich {} using ConsumerCache with cacheSize={}", this, cacheSize); } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(aggregationStrategy, camelContext); ServiceHelper.buildService(consumerCache, aggregationStrategy); } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java index db113be..e47976d 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java @@ -23,7 +23,6 @@ import java.util.Set; import org.apache.camel.AsyncProcessor; import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; import org.apache.camel.CamelExchangeException; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -114,10 +113,10 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin if (jsonUnmarshal != null) { camelContext.addService(jsonUnmarshal, true); } - if (xmlMarshal instanceof CamelContextAware) { + if (xmlMarshal != null) { camelContext.addService(xmlMarshal, true); } - if (xmlUnmarshal instanceof CamelContextAware) { + if (xmlUnmarshal != null) { camelContext.addService(xmlUnmarshal, true); } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index 4b67c4c..df146c3 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -1457,9 +1457,7 @@ public class AggregateProcessor extends AsyncProcessorSupport @Override @SuppressWarnings("unchecked") protected void doStart() throws Exception { - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(aggregationStrategy, camelContext); if (aggregationStrategy.canPreComplete()) { preCompletion = true; LOG.info("PreCompletionAwareAggregationStrategy detected. Aggregator {} is in pre-completion mode.", getId()); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java index 845326c..b0fd36f 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java @@ -231,9 +231,7 @@ public final class AggregationStrategyBeanAdapter extends ServiceSupport impleme mi = bi.createMethodInfo(); // in case the POJO is CamelContextAware - if (pojo instanceof CamelContextAware) { - ((CamelContextAware) pojo).setCamelContext(getCamelContext()); - } + CamelContextAware.trySetCamelContext(pojo, getCamelContext()); // in case the pojo is a service ServiceHelper.startService(pojo); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java index 1a1ee06..9cd2930 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java @@ -45,9 +45,7 @@ public final class ShareUnitOfWorkAggregationStrategy extends ServiceSupport imp @Override public void setCamelContext(CamelContext camelContext) { this.camelContext = camelContext; - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(strategy, camelContext); } @Override diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java index 97c29cc..1facba6 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java @@ -251,10 +251,7 @@ public class AggregateReifier extends ProcessorReifier<AggregateDefinition> { if (strategy == null) { throw new IllegalArgumentException("AggregationStrategy or AggregationStrategyRef must be set on " + this); } - - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(strategy, camelContext); return strategy; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java index b6a4ce8..8fb2982 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java @@ -122,10 +122,7 @@ public class ClaimCheckReifier extends ProcessorReifier<ClaimCheckDefinition> { } } - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(strategy, camelContext); return strategy; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java index f67d4b4..5e9e90e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java @@ -79,10 +79,7 @@ public class EnrichReifier extends ExpressionReifier<EnrichDefinition> { } } - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(strategy, camelContext); return strategy; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java index 2e376f3..4f99734 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java @@ -106,10 +106,7 @@ public class MulticastReifier extends ProcessorReifier<MulticastDefinition> { // default to use latest aggregation strategy strategy = new UseLatestAggregationStrategy(); } - - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(strategy, camelContext); if (parseBoolean(definition.getShareUnitOfWork(), false)) { // wrap strategy in share unit of work diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java index 06b18af..75c5e51 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java @@ -92,10 +92,7 @@ public class PollEnrichReifier extends ProcessorReifier<PollEnrichDefinition> { } } - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(strategy, camelContext); return strategy; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java index 7d8c1a7..6a6238a 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java @@ -136,10 +136,7 @@ public class RecipientListReifier extends ProcessorReifier<RecipientListDefiniti // default to use latest aggregation strategy strategy = new UseLatestAggregationStrategy(); } - - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(strategy, camelContext); if (parseBoolean(definition.getShareUnitOfWork(), false)) { // wrap strategy in share unit of work diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java index b290c3d..71866b9 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java @@ -97,10 +97,7 @@ public class SplitReifier extends ExpressionReifier<SplitDefinition> { } } - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(strategy, camelContext); if (strategy != null && parseBoolean(definition.getShareUnitOfWork(), false)) { // wrap strategy in share unit of work strategy = new ShareUnitOfWorkAggregationStrategy(strategy); diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java index 44aca6b..1c24761 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java @@ -198,9 +198,7 @@ public class ExpressionReifier<T extends ExpressionDefinition> extends AbstractR } } // inject CamelContext if its aware - if (expression instanceof CamelContextAware) { - ((CamelContextAware) expression).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(expression, camelContext); expression.init(camelContext); return expression; } @@ -236,9 +234,7 @@ public class ExpressionReifier<T extends ExpressionDefinition> extends AbstractR } } // inject CamelContext if its aware - if (predicate instanceof CamelContextAware) { - ((CamelContextAware) predicate).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(predicate, camelContext); // if the predicate is created via a delegate then it would need to know if its a predicate or expression // when being initialized predicate.initPredicate(camelContext); 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 5e8740a..8236120 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 @@ -86,15 +86,11 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health super.doInit(); for (HealthCheck check : checks) { - if (check instanceof CamelContextAware) { - ((CamelContextAware) check).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(check, camelContext); } for (HealthCheckRepository repository : repositories) { - if (repository instanceof CamelContextAware) { - ((CamelContextAware) repository).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(repository, camelContext); } } @@ -118,9 +114,7 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health if (answer == null) { answer = resolveHealthCheckRepositoryById(id); } - if (answer instanceof CamelContextAware) { - ((CamelContextAware) answer).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(answer, camelContext); return answer; } @@ -178,10 +172,7 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health } result = checks.add(healthCheck); if (result) { - if (obj instanceof CamelContextAware) { - ((CamelContextAware) obj).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(obj, camelContext); LOG.debug("HealthCheck with id {} successfully registered", healthCheck.getId()); } } else { @@ -192,10 +183,7 @@ public class DefaultHealthCheckRegistry extends ServiceSupport implements Health } result = this.repositories.add(repository); if (result) { - if (repository instanceof CamelContextAware) { - ((CamelContextAware) repository).setCamelContext(camelContext); - } - + CamelContextAware.trySetCamelContext(repository, camelContext); LOG.debug("HealthCheckRepository with id {} successfully registered", repository.getId()); } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java index 7f81f63..9c4319c 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java @@ -457,9 +457,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint protected void configureConsumer(Consumer consumer) throws Exception { // inject CamelContext - if (consumer instanceof CamelContextAware) { - ((CamelContextAware) consumer).setCamelContext(getCamelContext()); - } + CamelContextAware.trySetCamelContext(consumer, camelContext); if (bridgeErrorHandler) { if (consumer instanceof DefaultConsumer) { diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java index a714b8b..d5fba1f 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java @@ -167,9 +167,7 @@ public class DefaultRegistry extends ServiceSupport implements Registry, LocalBe public void bind(String id, Class<?> type, Object bean) throws RuntimeCamelException { if (bean != null) { // automatic inject camel context in bean if its aware - if (camelContext != null && bean instanceof CamelContextAware) { - ((CamelContextAware) bean).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(bean, camelContext); fallbackRegistry.bind(id, type, bean); } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExpressionToPredicateAdapter.java b/core/camel-support/src/main/java/org/apache/camel/support/ExpressionToPredicateAdapter.java index e2ecf1f..b81b612 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ExpressionToPredicateAdapter.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ExpressionToPredicateAdapter.java @@ -67,9 +67,7 @@ public final class ExpressionToPredicateAdapter implements Predicate, CamelConte @Override public void setCamelContext(CamelContext camelContext) { - if (expression instanceof CamelContextAware) { - ((CamelContextAware) expression).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(expression, camelContext); } @Override diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageSupport.java index f8f3e8b..d07a3f7 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/MessageSupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageSupport.java @@ -173,9 +173,7 @@ public abstract class MessageSupport implements Message, CamelContextAware, Data public Message copy() { Message answer = newInstance(); // must copy over CamelContext - if (answer instanceof CamelContextAware) { - ((CamelContextAware) answer).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(answer, camelContext); answer.copyFrom(this); return answer; } @@ -188,9 +186,7 @@ public abstract class MessageSupport implements Message, CamelContextAware, Data } // must copy over CamelContext - if (that instanceof CamelContextAware) { - setCamelContext(((CamelContextAware) that).getCamelContext()); - } + CamelContextAware.trySetCamelContext(that, camelContext); if (that instanceof DataTypeAware && ((DataTypeAware) that).hasDataType()) { setDataType(((DataTypeAware) that).getDataType()); } @@ -210,9 +206,7 @@ public abstract class MessageSupport implements Message, CamelContextAware, Data } // must copy over CamelContext - if (that instanceof CamelContextAware) { - setCamelContext(((CamelContextAware) that).getCamelContext()); - } + CamelContextAware.trySetCamelContext(that, camelContext); // cover over exchange if none has been assigned if (getExchange() == null) { setExchange(that.getExchange()); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java index 4c5b67f..251ea27 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/MarshalProcessor.java @@ -116,9 +116,7 @@ public class MarshalProcessor extends AsyncProcessorSupport implements Traceable @Override protected void doStart() throws Exception { // inject CamelContext on data format - if (dataFormat instanceof CamelContextAware) { - ((CamelContextAware) dataFormat).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(dataFormat, camelContext); // add dataFormat as service which will also start the service // (false => we handle the lifecycle of the dataFormat) getCamelContext().addService(dataFormat, false, true); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java index a57222d..d05fccb 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java @@ -132,9 +132,7 @@ public class UnmarshalProcessor extends AsyncProcessorSupport implements Traceab @Override protected void doStart() throws Exception { // inject CamelContext on data format - if (dataFormat instanceof CamelContextAware) { - ((CamelContextAware) dataFormat).setCamelContext(camelContext); - } + CamelContextAware.trySetCamelContext(dataFormat, camelContext); // add dataFormat as service which will also start the service // (false => we handle the lifecycle of the dataFormat) getCamelContext().addService(dataFormat, false, true);
