This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new eb9840bb49b Regen for commit cb4cfd930cfd75e287d803518b4954001424a90e
eb9840bb49b is described below
commit eb9840bb49b1610fc4ac5d506abcd2c133fbf264
Author: orpiske <orpi...@users.noreply.github.com>
AuthorDate: Sat Feb 25 14:57:31 2023 +0000
Regen for commit cb4cfd930cfd75e287d803518b4954001424a90e
Signed-off-by: GitHub <nore...@github.com>
---
.../DynamicRouterBasicSynchronousIT.java | 1 -
.../integration/DynamicRouterUriControlIT.java | 1 -
.../camel/component/knative/KnativeEndpoint.java | 4 +-
.../camel/component/knative/KnativeProducer.java | 4 +-
.../camel/spring/xml/CamelContextFactoryBean.java | 3 +-
.../camel/spring/CamelContextFactoryBeanTest.java | 3 +-
.../main/java/org/apache/camel/CamelContext.java | 4 +-
.../camel/impl/engine/AbstractCamelContext.java | 79 +++++++++++++++-------
.../impl/engine/CamelPostProcessorHelper.java | 1 -
.../engine/DefaultAutowiredLifecycleStrategy.java | 4 +-
.../impl/engine/DefaultCamelContextExtension.java | 6 +-
.../impl/engine/DefaultConfigurerResolver.java | 7 +-
...efaultDependencyInjectionAnnotationFactory.java | 1 -
.../camel/impl/engine/DefaultResourceLoader.java | 4 +-
.../camel/impl/engine/DefaultRouteController.java | 1 -
.../camel/impl/engine/DefaultRoutesLoader.java | 1 -
.../engine/DefaultServiceBootstrapCloseable.java | 3 +-
.../camel/impl/engine/DefaultUnitOfWork.java | 1 -
.../camel/language/csimple/CSimpleLanguage.java | 4 +-
.../camel/processor/RecipientListProcessor.java | 1 -
.../org/apache/camel/processor/RoutingSlip.java | 1 -
.../camel/processor/SendDynamicProcessor.java | 1 -
.../org/apache/camel/processor/SendProcessor.java | 1 -
.../apache/camel/processor/UnitOfWorkProducer.java | 1 -
.../errorhandler/RedeliveryErrorHandler.java | 1 -
.../impl/engine/DefaultConfigurerResolverTest.java | 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 3 +-
.../camel/main/DefaultConfigurationConfigurer.java | 3 +-
.../camel/main/MainAutowiredLifecycleStrategy.java | 4 +-
.../org/apache/camel/support/AbstractExchange.java | 1 -
.../apache/camel/support/CamelContextHelper.java | 1 -
.../org/apache/camel/support/DefaultMessage.java | 1 -
.../camel/support/cache/DefaultProducerCache.java | 3 +-
.../camel/support/cache/EmptyProducerCache.java | 4 +-
34 files changed, 87 insertions(+), 74 deletions(-)
diff --git
a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterBasicSynchronousIT.java
b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterBasicSynchronousIT.java
index ff1bed4dd30..47fd1faf685 100644
---
a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterBasicSynchronousIT.java
+++
b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterBasicSynchronousIT.java
@@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.dynamicrouter.DynamicRouterComponent;
diff --git
a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterUriControlIT.java
b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterUriControlIT.java
index e6c994fdab7..b820abbd21a 100644
---
a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterUriControlIT.java
+++
b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterUriControlIT.java
@@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Predicate;
import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
index 4b9793ec561..37f78addc13 100644
---
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
+++
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
@@ -27,7 +27,6 @@ import java.util.stream.Stream;
import org.apache.camel.CamelContext;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.cloudevents.CloudEvent;
@@ -117,7 +116,8 @@ public class KnativeEndpoint extends DefaultEndpoint {
list.add(replyProcessor);
}
CamelContext ecc = getCamelContext();
- Processor pipeline =
ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc,
"Pipeline", new Object[] { list });
+ Processor pipeline
+ =
ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc,
"Pipeline", new Object[] { list });
Consumer consumer =
getComponent().getConsumerFactory().createConsumer(this,
createTransportConfiguration(service), service, pipeline);
diff --git
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
index 1be0bbbe16c..f94186c3f94 100644
---
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
+++
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
@@ -25,7 +25,6 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.DefaultAsyncProducer;
@@ -42,7 +41,8 @@ public class KnativeProducer extends DefaultAsyncProducer {
Collections.addAll(elements, processors);
CamelContext ecc = getEndpoint().getCamelContext();
- Processor pipeline =
ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc,
"Pipeline", new Object[] { elements });
+ Processor pipeline =
ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc,
"Pipeline",
+ new Object[] { elements });
this.processor = AsyncProcessorConverterHelper.convert(pipeline);
}
diff --git
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
index 1c815cd9b1e..7a359740a51 100644
---
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
+++
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
@@ -348,7 +348,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Spr
}
// register the bean post processor on camel context
if (beanPostProcessor instanceof
org.apache.camel.spi.CamelBeanPostProcessor) {
-
context.getCamelContextExtension().setBeanPostProcessor((org.apache.camel.spi.CamelBeanPostProcessor)
beanPostProcessor);
+ context.getCamelContextExtension()
+
.setBeanPostProcessor((org.apache.camel.spi.CamelBeanPostProcessor)
beanPostProcessor);
}
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index cf62f18c073..7b6e3d1d7fe 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -67,7 +67,8 @@ public class CamelContextFactoryBeanTest {
factory.setApplicationContext(applicationContext);
factory.afterPropertiesSet();
- ModelJAXBContextFactory modelJAXBContextFactory =
factory.getContext().getCamelContextExtension().getModelJAXBContextFactory();
+ ModelJAXBContextFactory modelJAXBContextFactory
+ =
factory.getContext().getCamelContextExtension().getModelJAXBContextFactory();
assertTrue(modelJAXBContextFactory instanceof
CustomModelJAXBContextFactory);
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 3818450f56f..f5757855757 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -83,14 +83,12 @@ import org.apache.camel.vault.VaultConfiguration;
public interface CamelContext extends CamelContextLifecycle,
RuntimeConfiguration {
/**
- * Gets the {@link ExtendedCamelContext} that contains the extension
points for internal
- * context APIs.
+ * Gets the {@link ExtendedCamelContext} that contains the extension
points for internal context APIs.
*
* @return this {@link ExtendedCamelContext}
*/
ExtendedCamelContext getCamelContextExtension();
-
/**
* Gets the extension of the given type.
*
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 cb04ea9ae4c..8e6054f2c8d 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
@@ -633,7 +633,8 @@ public abstract class AbstractCamelContext extends
BaseService
StartupStep step = startupStepRecorder.beginStep(Component.class,
name, "Resolve Component");
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Using ComponentResolver: {} to resolve
component with name: {}", camelContextExtension.getComponentResolver(), name);
+ LOG.debug("Using ComponentResolver: {} to resolve
component with name: {}",
+ camelContextExtension.getComponentResolver(),
name);
}
// Mark the component as being created so we can detect
circular
@@ -2275,7 +2276,8 @@ public abstract class AbstractCamelContext extends
BaseService
// was the initialization vetoed?
if (vetoed != null) {
- LOG.info("CamelContext ({}) vetoed to not initialize due to: {}",
camelContextExtension.getName(), vetoed.getMessage());
+ LOG.info("CamelContext ({}) vetoed to not initialize due to: {}",
camelContextExtension.getName(),
+ vetoed.getMessage());
failOnStartup(vetoed);
return;
}
@@ -2408,7 +2410,8 @@ public abstract class AbstractCamelContext extends
BaseService
startupStepRecorder.endStep(step);
buildTaken = watch.taken();
- LOG.debug("Apache Camel {} ({}) built in {}", getVersion(),
camelContextExtension.getName(), TimeUtils.printDuration(buildTaken, true));
+ LOG.debug("Apache Camel {} ({}) built in {}", getVersion(),
camelContextExtension.getName(),
+ TimeUtils.printDuration(buildTaken, true));
}
protected void resetBuildTime() {
@@ -2512,11 +2515,13 @@ public abstract class AbstractCamelContext extends
BaseService
strategy.onContextInitializing(this);
} catch (VetoCamelContextStartException e) {
// okay we should not start Camel since it was vetoed
- LOG.warn("Lifecycle strategy {} vetoed initializing
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} vetoed initializing
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
} catch (Exception e) {
- LOG.warn("Lifecycle strategy {} failed initializing
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} failed initializing
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
}
@@ -2569,7 +2574,8 @@ public abstract class AbstractCamelContext extends
BaseService
ServiceHelper.initService(components.values());
// create route definitions from route templates if we have any sources
- for (RouteTemplateParameterSource source :
camelContextExtension.getRegistry().findByType(RouteTemplateParameterSource.class))
{
+ for (RouteTemplateParameterSource source :
camelContextExtension.getRegistry()
+ .findByType(RouteTemplateParameterSource.class)) {
for (String routeId : source.routeIds()) {
// do a defensive copy of the parameters
Map<String, Object> map = new
HashMap<>(source.parameters(routeId));
@@ -2596,17 +2602,20 @@ public abstract class AbstractCamelContext extends
BaseService
startupStepRecorder.endStep(subStep);
if (!lifecycleStrategies.isEmpty()) {
- subStep = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "LifecycleStrategy onContextInitialized");
+ subStep = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(),
+ "LifecycleStrategy onContextInitialized");
for (LifecycleStrategy strategy : lifecycleStrategies) {
try {
strategy.onContextInitialized(this);
} catch (VetoCamelContextStartException e) {
// okay we should not start Camel since it was vetoed
- LOG.warn("Lifecycle strategy {} vetoed initializing
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} vetoed initializing
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
} catch (Exception e) {
- LOG.warn("Lifecycle strategy {} failed initializing
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} failed initializing
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
}
@@ -2619,16 +2628,19 @@ public abstract class AbstractCamelContext extends
BaseService
startupStepRecorder.endStep(step);
initTaken = watch.taken();
- LOG.debug("Apache Camel {} ({}) initialized in {}", getVersion(),
camelContextExtension.getName(), TimeUtils.printDuration(initTaken, true));
+ LOG.debug("Apache Camel {} ({}) initialized in {}", getVersion(),
camelContextExtension.getName(),
+ TimeUtils.printDuration(initTaken, true));
}
@Override
protected void doStart() throws Exception {
if (firstStartDone) {
// its not good practice resetting a camel context
- LOG.warn("Starting CamelContext: {} after the context has been
stopped is not recommended", camelContextExtension.getName());
+ LOG.warn("Starting CamelContext: {} after the context has been
stopped is not recommended",
+ camelContextExtension.getName());
}
- StartupStep step = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "Start CamelContext");
+ StartupStep step
+ = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "Start CamelContext");
try {
doStartContext();
@@ -2684,7 +2696,9 @@ public abstract class AbstractCamelContext extends
BaseService
vetoed = veto;
return;
} else {
- LOG.error("Error starting CamelContext (" +
camelContextExtension.getName() + ") due to exception thrown: " +
e.getMessage(), e);
+ LOG.error("Error starting CamelContext (" +
camelContextExtension.getName() + ") due to exception thrown: "
+ + e.getMessage(),
+ e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -2839,7 +2853,8 @@ public abstract class AbstractCamelContext extends
BaseService
camelContextExtension.getName(), total, built,
init, start, jvm);
} else {
- LOG.info("Apache Camel {} ({}) started in {} (build:{} init:{}
start:{})", getVersion(), camelContextExtension.getName(), total,
+ LOG.info("Apache Camel {} ({}) started in {} (build:{} init:{}
start:{})", getVersion(),
+ camelContextExtension.getName(), total,
built,
init,
start);
@@ -2855,7 +2870,8 @@ public abstract class AbstractCamelContext extends
BaseService
LOG.debug(
"Using ClassResolver={}, PackageScanClassResolver={},
ApplicationContextClassLoader={}, RouteController={}",
getClassResolver(),
- camelContextExtension.getPackageScanClassResolver(),
getApplicationContextClassLoader(), getRouteController());
+ camelContextExtension.getPackageScanClassResolver(),
getApplicationContextClassLoader(),
+ getRouteController());
}
if (isStreamCaching()) {
// stream caching is default enabled so lets report if it has been
disabled
@@ -2873,7 +2889,8 @@ public abstract class AbstractCamelContext extends
BaseService
// log if MDC has been enabled
String pattern = getMDCLoggingKeysPattern();
if (pattern != null) {
- LOG.info("MDC logging (keys-pattern: {}) is enabled on
CamelContext: {}", pattern, camelContextExtension.getName());
+ LOG.info("MDC logging (keys-pattern: {}) is enabled on
CamelContext: {}", pattern,
+ camelContextExtension.getName());
} else {
LOG.info("MDC logging is enabled on CamelContext: {}",
camelContextExtension.getName());
}
@@ -2888,18 +2905,21 @@ public abstract class AbstractCamelContext extends
BaseService
// start lifecycle strategies
if (!lifecycleStrategies.isEmpty()) {
StartupStep subStep
- = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "LifecycleStrategy onContextStarting");
+ = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(),
+ "LifecycleStrategy onContextStarting");
startServices(lifecycleStrategies);
for (LifecycleStrategy strategy : lifecycleStrategies) {
try {
strategy.onContextStarting(this);
} catch (VetoCamelContextStartException e) {
// okay we should not start Camel since it was vetoed
- LOG.warn("Lifecycle strategy {} vetoed starting
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} vetoed starting
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
} catch (Exception e) {
- LOG.warn("Lifecycle strategy {} failed starting
CamelContext ({}) due to: {}", strategy, camelContextExtension.getName(),
+ LOG.warn("Lifecycle strategy {} failed starting
CamelContext ({}) due to: {}", strategy,
+ camelContextExtension.getName(),
e.getMessage());
throw e;
}
@@ -2921,7 +2941,8 @@ public abstract class AbstractCamelContext extends
BaseService
if (!startupListeners.isEmpty()) {
StartupStep subStep
- = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "StartupListener onCamelContextStarting");
+ = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(),
+ "StartupListener onCamelContextStarting");
// sort the startup listeners so they are started in the right
order
startupListeners.sort(OrderedComparator.get());
// now call the startup listeners where the routes has been warmed
up
@@ -3004,7 +3025,8 @@ public abstract class AbstractCamelContext extends
BaseService
if (!getRouteController().isSupervising()) {
// invoke this logic to warmup the routes and if possible also
start the routes (using default route controller)
- StartupStep subStep =
startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "Start Routes");
+ StartupStep subStep
+ = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "Start Routes");
EventHelper.notifyCamelContextRoutesStarting(this);
internalRouteStartupManager.doStartOrResumeRoutes(routeServices,
true, !doNotStartRoutesOnFirstStart, false, true);
EventHelper.notifyCamelContextRoutesStarted(this);
@@ -3042,7 +3064,8 @@ public abstract class AbstractCamelContext extends
BaseService
long timeout =
shutdownStrategy.getTimeUnit().toMillis(shutdownStrategy.getTimeout());
// only use precise print duration if timeout is shorter than
10 seconds
String to = TimeUtils.printDuration(timeout, timeout < 10000);
- LOG.info("Apache Camel {} ({}) is shutting down (timeout:{})",
getVersion(), camelContextExtension.getName(), to);
+ LOG.info("Apache Camel {} ({}) is shutting down (timeout:{})",
getVersion(), camelContextExtension.getName(),
+ to);
} else {
LOG.info("Apache Camel {} ({}) is shutting down",
getVersion(), camelContextExtension.getName());
}
@@ -3178,10 +3201,12 @@ public abstract class AbstractCamelContext extends
BaseService
String taken = TimeUtils.printDuration(stopWatch.taken(),
true);
String jvm = logJvmUptime ? getJvmUptime() : null;
if (jvm != null) {
- LOG.info("Apache Camel {} ({}) shutdown in {} (uptime:{}
JVM-uptime:{})", getVersion(), camelContextExtension.getName(), taken,
+ LOG.info("Apache Camel {} ({}) shutdown in {} (uptime:{}
JVM-uptime:{})", getVersion(),
+ camelContextExtension.getName(), taken,
getUptime(), jvm);
} else {
- LOG.info("Apache Camel {} ({}) shutdown in {}
(uptime:{})", getVersion(), camelContextExtension.getName(), taken,
getUptime());
+ LOG.info("Apache Camel {} ({}) shutdown in {}
(uptime:{})", getVersion(), camelContextExtension.getName(),
+ taken, getUptime());
}
}
}
@@ -3452,7 +3477,8 @@ public abstract class AbstractCamelContext extends
BaseService
* Force some lazy initialization to occur upfront before we start any
components and create routes
*/
protected void forceLazyInitialization() {
- StartupStep step = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(), "Start Mandatory Services");
+ StartupStep step = startupStepRecorder.beginStep(CamelContext.class,
camelContextExtension.getName(),
+ "Start Mandatory Services");
initEagerMandatoryServices();
startupStepRecorder.endStep(step);
step = startupStepRecorder.beginStep(CamelContext.class, getName(),
"Start Standard Services");
@@ -3822,7 +3848,8 @@ public abstract class AbstractCamelContext extends
BaseService
DataFormat df = Optional
.ofNullable(ResolverHelper.lookupDataFormatInRegistryWithFallback(getCamelContextReference(),
name))
- .orElseGet(() ->
camelContextExtension.getDataFormatResolver().createDataFormat(name,
getCamelContextReference()));
+ .orElseGet(() ->
camelContextExtension.getDataFormatResolver().createDataFormat(name,
+ getCamelContextReference()));
if (df != null) {
// inject CamelContext if aware
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 7896e2f8b95..23ad0ea6a5c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -33,7 +33,6 @@ import org.apache.camel.Consumer;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.DelegateEndpoint;
import org.apache.camel.Endpoint;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.IsSingleton;
import org.apache.camel.MultipleConsumersSupport;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAutowiredLifecycleStrategy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAutowiredLifecycleStrategy.java
index 1e40c1c44af..05a2f7926d4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAutowiredLifecycleStrategy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAutowiredLifecycleStrategy.java
@@ -20,7 +20,6 @@ import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Ordered;
import org.apache.camel.spi.AutowiredLifecycleStrategy;
import org.apache.camel.spi.DataFormat;
@@ -87,7 +86,8 @@ class DefaultAutowiredLifecycleStrategy extends
LifecycleStrategySupport impleme
}
private void autwire(String name, String kind, Object target) {
- PropertyConfigurer pc =
camelContext.getCamelContextExtension().getConfigurerResolver().resolvePropertyConfigurer(name
+ "-" + kind, camelContext);
+ PropertyConfigurer pc =
camelContext.getCamelContextExtension().getConfigurerResolver()
+ .resolvePropertyConfigurer(name + "-" + kind, camelContext);
if (pc instanceof PropertyConfigurerGetter) {
PropertyConfigurerGetter getter = (PropertyConfigurerGetter) pc;
String[] names = getter.getAutowiredNames();
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 015e8c7fa7a..f7e988cf761 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
class DefaultCamelContextExtension implements ExtendedCamelContext {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultCamelContextExtension.class);
-
+
private final AbstractCamelContext camelContext;
private final ThreadLocal<Boolean> isSetupRoutes = new ThreadLocal<>();
private List<InterceptStrategy> interceptStrategies = new ArrayList<>();
@@ -115,7 +115,6 @@ class DefaultCamelContextExtension implements
ExtendedCamelContext {
private String basePackageScan;
private boolean lightweight;
-
public DefaultCamelContextExtension(AbstractCamelContext camelContext) {
this.camelContext = camelContext;
}
@@ -497,7 +496,8 @@ class DefaultCamelContextExtension implements
ExtendedCamelContext {
if (camelContext.bootstrapFactoryFinder == null) {
synchronized (camelContext.lock) {
if (camelContext.bootstrapFactoryFinder == null) {
- camelContext.bootstrapFactoryFinder =
getFactoryFinderResolver().resolveBootstrapFactoryFinder(camelContext.getClassResolver());
+ camelContext.bootstrapFactoryFinder
+ =
getFactoryFinderResolver().resolveBootstrapFactoryFinder(camelContext.getClassResolver());
}
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
index c5f23a0f741..5e6f13d4a33 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
@@ -50,7 +50,8 @@ public class DefaultConfigurerResolver implements
ConfigurerResolver {
public boolean configure(CamelContext camelContext, Object target,
String name, Object value, boolean ignoreCase) {
if (target instanceof CamelContext contextTarget) {
if (!contextConfigurer.configure(camelContext, contextTarget,
name, value, ignoreCase)) {
- return extensionConfigurer.configure(camelContext,
contextTarget.getCamelContextExtension(), name, value, ignoreCase);
+ return extensionConfigurer.configure(camelContext,
contextTarget.getCamelContextExtension(), name, value,
+ ignoreCase);
}
}
@@ -134,7 +135,8 @@ public class DefaultConfigurerResolver implements
ConfigurerResolver {
}
}
- private PropertyConfigurer createPropertyConfigurerForContext(String name,
CamelContext context, Class<?> type, Class<?> extensionType) {
+ private PropertyConfigurer createPropertyConfigurerForContext(
+ String name, CamelContext context, Class<?> type, Class<?>
extensionType) {
if (getLog().isDebugEnabled()) {
getLog().debug("Found configurer: {} via type: {} via: {}{}",
name, type.getName(), factoryFinder.getResourcePath(),
name);
@@ -143,7 +145,6 @@ public class DefaultConfigurerResolver implements
ConfigurerResolver {
var contextConfigurer = (PropertyConfigurer)
context.getInjector().newInstance(type, false);
var extensionConfigurer = (PropertyConfigurer)
context.getInjector().newInstance(extensionType, false);
-
// create the component
if (PropertyConfigurer.class.isAssignableFrom(type)) {
return new ContextConfigurer(contextConfigurer,
extensionConfigurer);
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDependencyInjectionAnnotationFactory.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDependencyInjectionAnnotationFactory.java
index 61ce0ccec49..267bd2c7133 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDependencyInjectionAnnotationFactory.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDependencyInjectionAnnotationFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.impl.engine;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.CamelDependencyInjectionAnnotationFactory;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
index e0b1c2c66dc..d3e72da8fef 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.StaticService;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Resource;
@@ -165,7 +164,8 @@ public class DefaultResourceLoader extends ServiceSupport
implements ResourceLoa
*/
private ResourceResolver resolveService(String scheme) {
final CamelContext context = getCamelContext();
- final FactoryFinder finder =
context.getCamelContextExtension().getBootstrapFactoryFinder(ResourceResolver.FACTORY_PATH);
+ final FactoryFinder finder
+ =
context.getCamelContextExtension().getBootstrapFactoryFinder(ResourceResolver.FACTORY_PATH);
ResourceResolver rr = ResolverHelper.resolveService(context, finder,
scheme, ResourceResolver.class).orElse(null);
if (rr != null) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
index bc4a8874b4a..54ee46708f4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.NonManagedService;
import org.apache.camel.Route;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 0548129218f..0d766a8a5d2 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RouteConfigurationsBuilder;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.StaticService;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
index 4700f6778c5..11ace4e04d3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
@@ -52,7 +52,8 @@ public class DefaultServiceBootstrapCloseable implements
BootstrapCloseable {
ConfigurerStrategy.clearBootstrapConfigurers();
Set<Service> set
- = camelContextExtension.getServices().stream().filter(s -> s
instanceof BootstrapCloseable).collect(Collectors.toSet());
+ = camelContextExtension.getServices().stream().filter(s -> s
instanceof BootstrapCloseable)
+ .collect(Collectors.toSet());
// its a bootstrap service
for (Service service : set) {
try {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 82cc1552f83..3f1ee3d2bfb 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -28,7 +28,6 @@ import java.util.function.Predicate;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Message;
import org.apache.camel.PooledExchange;
import org.apache.camel.Processor;
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
index 02d8e7c8fd2..04eac6578ca 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.StaticService;
@@ -247,7 +246,8 @@ public class CSimpleLanguage extends TypedLanguageSupport
implements StaticServi
// detect custom compiler (camel-csimple-joor)
CamelContext ecc = getCamelContext();
- Optional<Class<?>> clazz =
ecc.getCamelContextExtension().getBootstrapFactoryFinder().findClass(CSimpleCompiler.FACTORY);
+ Optional<Class<?>> clazz
+ =
ecc.getCamelContextExtension().getBootstrapFactoryFinder().findClass(CSimpleCompiler.FACTORY);
if (clazz.isPresent()) {
compiler = (CSimpleCompiler)
ecc.getInjector().newInstance(clazz.get(), false);
if (compiler != null) {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index 3dbb3512b4e..d3f242f6279 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -33,7 +33,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
index fddd68f455f..1563a813c20 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Message;
import org.apache.camel.NoTypeConversionAvailableException;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
index 517f888681e..7dff61b5990 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.ResolveEndpointFailedException;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java
index 18dad2208b3..63c2c338720 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -26,7 +26,6 @@ import org.apache.camel.EndpointAware;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Traceable;
import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.ProducerCache;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
index eb0f21456e0..b47529114a0 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
@@ -21,7 +21,6 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Producer;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.service.ServiceHelper;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index b6197da58b6..4ed9a2619d5 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -29,7 +29,6 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Message;
import org.apache.camel.Navigate;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultConfigurerResolverTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultConfigurerResolverTest.java
index 966be88e25d..97c7596c1fc 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultConfigurerResolverTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultConfigurerResolverTest.java
@@ -41,7 +41,7 @@ class DefaultConfigurerResolverTest {
@Test
void resolvePropertyConfigurerShouldFallbackToDefaultConfigurer() {
Stream.of(CamelContext.class.getName(),
SimpleCamelContext.class.getName(), "org.apache.camel.model.ModelCamelContext",
- "org.apache.camel.SomeCamelContextStuff")
+ "org.apache.camel.SomeCamelContextStuff")
.forEach(name ->
assertThat(resolver.resolvePropertyConfigurer(name, ctx))
.as(name).isInstanceOf(DefaultConfigurerResolver.ContextConfigurer.class));
@@ -62,7 +62,6 @@ class DefaultConfigurerResolverTest {
.as(name).isNull());
}
-
@DisplayName("Test that the configurer returns null for classes named
similarly, but unrelated to CamelContext")
@Test
void
resolvePropertyConfigurerShouldFallbackToExtendedCamelContextOnlyForCamelComponents3()
{
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 0152ea5e354..65432dcba9c 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
@@ -1068,7 +1068,8 @@ public abstract class BaseMainSupport extends BaseService
{
setPropertiesOnTarget(camelContext, camelContext,
contextProperties, "camel.context.",
mainConfigurationProperties.isAutoConfigurationFailFast(),
true, autoConfiguredProperties);
- setPropertiesOnTarget(camelContext,
camelContext.getCamelContextExtension(), contextProperties,
"camel.context.extension",
+ setPropertiesOnTarget(camelContext,
camelContext.getCamelContextExtension(), contextProperties,
+ "camel.context.extension",
mainConfigurationProperties.isAutoConfigurationFailFast(),
true, autoConfiguredProperties);
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 8c17982ffac..719d373142f 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -500,7 +500,8 @@ public final class DefaultConfigurationConfigurer {
Map<String, LogListener> logListeners =
registry.findByTypeWithName(LogListener.class);
if (logListeners != null && !logListeners.isEmpty()) {
for (LogListener logListener : logListeners.values()) {
- boolean contains =
ecc.getCamelContextExtension().getLogListeners() != null &&
ecc.getCamelContextExtension().getLogListeners().contains(logListener);
+ boolean contains =
ecc.getCamelContextExtension().getLogListeners() != null
+ &&
ecc.getCamelContextExtension().getLogListeners().contains(logListener);
if (!contains) {
ecc.getCamelContextExtension().addLogListener(logListener);
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainAutowiredLifecycleStrategy.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainAutowiredLifecycleStrategy.java
index 0fdad00eb8b..b802b5f5bc3 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainAutowiredLifecycleStrategy.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainAutowiredLifecycleStrategy.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Ordered;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.spi.AutowiredLifecycleStrategy;
@@ -129,7 +128,8 @@ public class MainAutowiredLifecycleStrategy extends
LifecycleStrategySupport imp
}
private void autwire(String name, String kind, Object target) {
- PropertyConfigurer pc =
camelContext.getCamelContextExtension().getConfigurerResolver().resolvePropertyConfigurer(name
+ "-" + kind, camelContext);
+ PropertyConfigurer pc =
camelContext.getCamelContextExtension().getConfigurerResolver()
+ .resolvePropertyConfigurer(name + "-" + kind, camelContext);
if (pc instanceof PropertyConfigurerGetter) {
PropertyConfigurerGetter getter = (PropertyConfigurerGetter) pc;
String[] names = getter.getAutowiredNames();
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 66639a10986..ef8bb4e1d12 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -32,7 +32,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Message;
import org.apache.camel.MessageHistory;
import org.apache.camel.SafeCopyProperty;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
index 00974812318..2bda1351f40 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
@@ -28,7 +28,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.NoSuchEndpointException;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
index 13b264b40d9..1716ba0dc52 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
@@ -24,7 +24,6 @@ import java.util.function.Supplier;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.spi.HeadersMapFactory;
/**
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
index 01bed50862d..38144a9eccb 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
@@ -28,7 +28,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -89,7 +88,7 @@ public class DefaultProducerCache extends ServiceSupport
implements ProducerCach
// internal processor used for sending
sharedInternalProcessor
= this.camelContext.getCamelContextExtension()
-
.getInternalProcessorFactory().createSharedCamelInternalProcessor(camelContext);
+
.getInternalProcessorFactory().createSharedCamelInternalProcessor(camelContext);
}
protected ProducerServicePool createServicePool(CamelContext camelContext,
int cacheSize) {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/EmptyProducerCache.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/EmptyProducerCache.java
index ee6e88f765b..a7c7f652e85 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/EmptyProducerCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/EmptyProducerCache.java
@@ -19,7 +19,6 @@ package org.apache.camel.support.cache;
import org.apache.camel.AsyncProducer;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.support.service.ServiceHelper;
@@ -41,7 +40,8 @@ public class EmptyProducerCache extends DefaultProducerCache {
AsyncProducer answer;
try {
answer = endpoint.createAsyncProducer();
- boolean startingRoutes =
ecc.getCamelContextExtension().isSetupRoutes() ||
ecc.getRouteController().isStartingRoutes();
+ boolean startingRoutes
+ = ecc.getCamelContextExtension().isSetupRoutes() ||
ecc.getRouteController().isStartingRoutes();
if (startingRoutes && answer.isSingleton()) {
// if we are currently starting a route, then add as service
and enlist in JMX
// - but do not enlist non-singletons in JMX
