You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/02/22 20:45:03 UTC
(camel) branch main updated (e59a03a4a48 -> 3b4cd72e727)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from e59a03a4a48 CAMEL-20410: documentation fixes for camel-azure-datalake
new 53fa5fdbbad CAMEL-20014: stop using the deprecated setName method
new a8b64edf5d3 CAMEL-20014: stop using the deprecated getBootstrapFactoryFinder method
new 3b4cd72e727 CAMEL-20014: stop using the deprecated getStartupStepRecorder method
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../consul/cluster/ConsulClusterViewIT.java | 2 +-
.../ConsulClusteredRoutePolicyFactoryIT.java | 2 +-
.../cluster/ConsulClusteredRoutePolicyIT.java | 2 +-
.../component/consul/cluster/ConsulMasterIT.java | 2 +-
.../InfinispanEmbeddedClusteredMasterTest.java | 2 +-
...panEmbeddedClusteredRoutePolicyFactoryTest.java | 2 +-
...InfinispanEmbeddedClusteredRoutePolicyTest.java | 2 +-
.../AbstractInfinispanRemoteClusteredIT.java | 2 +-
.../JGroupsRaftClusteredRoutePolicyTest.java | 2 +-
.../raft/cluster/JGroupsRaftMasterTest.java | 2 +-
.../component/jgroups/JGroupsClusterTest.java | 4 +-
.../jgroups/cluster/JGroupsLockMasterTest.java | 2 +-
.../component/master/MasterComponentTest.java | 2 +-
.../mllp/MllpMaxConcurrentConsumersTest.java | 2 +-
.../MllpProducerConsumerLoopbackInOnlyTest.java | 2 +-
.../mllp/MllpProducerConsumerLoopbackTest.java | 2 +-
.../MllpTcpClientProducerConnectionErrorTest.java | 2 +-
...TcpClientProducerIdleConnectionTimeoutTest.java | 2 +-
.../component/mllp/MllpTcpServerCharsetTest.java | 2 +-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +-
.../MllpTcpServerConsumerMessageHeadersTest.java | 2 +-
...MllpTcpServerConsumerMulitpleTcpPacketTest.java | 2 +-
.../mllp/MllpTcpServerConsumerTransactionTest.java | 2 +-
...tProducerEndOfDataAndValidationTestSupport.java | 2 +-
...cpServerConsumerAcknowledgementTestSupport.java | 2 +-
.../QuartzTwoCamelContextSameNameClashTest.java | 4 +-
.../camel/spring/xml/CamelContextFactoryBean.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectOneTest.java | 2 +-
.../sql/SqlProducerOutputTypeSelectOneTest.java | 2 +-
.../ZooKeeperClusteredRoutePolicyFactoryIT.java | 2 +-
.../ZooKeeperClusteredRoutePolicyIT.java | 2 +-
.../cluster/integration/ZooKeeperMasterIT.java | 2 +-
.../impl/engine/InternalRouteStartupManager.java | 12 ++---
.../camel/impl/engine/SimpleCamelContext.java | 52 +++++++++++-----------
.../FileLockClusteredRoutePolicyFactoryTest.java | 2 +-
.../cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
.../camel/impl/engine/DefaultCamelContextTest.java | 2 +-
.../ManagedStreamCachingStrategyTest.java | 2 +-
.../TwoManagedCamelContextClashTest.java | 2 +-
.../management/TwoManagedCamelContextTest.java | 2 +-
.../management/TwoManagedNamePatternTest.java | 2 +-
41 files changed, 73 insertions(+), 73 deletions(-)
(camel) 02/03: CAMEL-20014: stop using the deprecated getBootstrapFactoryFinder method
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a8b64edf5d3908952fd94fc1de7c7aa202c7a4c6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Feb 22 17:46:46 2024 +0100
CAMEL-20014: stop using the deprecated getBootstrapFactoryFinder method
Adjust the code to use the getBootstrapFactoryFinder from the extension.
---
.../camel/impl/engine/SimpleCamelContext.java | 52 +++++++++++-----------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index 4b013e81e81..425b3004ba1 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -144,7 +144,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected HealthCheckRegistry createHealthCheckRegistry() {
Optional<HealthCheckRegistry> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
HealthCheckRegistry.FACTORY,
HealthCheckRegistry.class);
@@ -155,7 +155,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected DevConsoleRegistry createDevConsoleRegistry() {
Optional<DevConsoleRegistry> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
DevConsoleRegistry.FACTORY,
DevConsoleRegistry.class);
@@ -184,7 +184,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
@Override
protected Injector createInjector() {
- FactoryFinder finder = getBootstrapFactoryFinder();
+ FactoryFinder finder = getCamelContextExtension().getBootstrapFactoryFinder();
Optional<Injector> result = finder.newInstance("Injector", Injector.class);
return result.orElseGet(() -> new DefaultInjector(getCamelContextReference()));
}
@@ -193,7 +193,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected PropertiesComponent createPropertiesComponent() {
Optional<PropertiesComponent> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
PropertiesComponent.FACTORY,
PropertiesComponent.class);
@@ -234,7 +234,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ModelJAXBContextFactory createModelJAXBContextFactory() {
Optional<ModelJAXBContextFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ModelJAXBContextFactory.FACTORY,
ModelJAXBContextFactory.class);
@@ -255,7 +255,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ModelineFactory createModelineFactory() {
Optional<ModelineFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ModelineFactory.FACTORY,
ModelineFactory.class);
@@ -294,7 +294,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ProcessorFactory createProcessorFactory() {
Optional<ProcessorFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ProcessorFactory.FACTORY,
ProcessorFactory.class);
@@ -310,7 +310,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected InternalProcessorFactory createInternalProcessorFactory() {
Optional<InternalProcessorFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
InternalProcessorFactory.FACTORY,
InternalProcessorFactory.class);
@@ -400,7 +400,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected RuntimeCamelCatalog createRuntimeCamelCatalog() {
Optional<RuntimeCamelCatalog> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
RuntimeCamelCatalog.FACTORY,
RuntimeCamelCatalog.class);
@@ -422,7 +422,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
// is there any custom which we prioritize over default
Optional<DumpRoutesStrategy> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
DumpRoutesStrategy.FACTORY,
DumpRoutesStrategy.class);
@@ -430,7 +430,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
// lookup default factory
result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
"default-" + DumpRoutesStrategy.FACTORY,
DumpRoutesStrategy.class);
}
@@ -457,7 +457,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected HeadersMapFactory createHeadersMapFactory() {
Optional<HeadersMapFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
HeadersMapFactory.FACTORY,
HeadersMapFactory.class);
@@ -473,7 +473,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
// then classpath scanning
Optional<CliConnectorFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
CliConnectorFactory.FACTORY,
CliConnectorFactory.class);
// cli-connector is optional
@@ -484,7 +484,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected BeanProxyFactory createBeanProxyFactory() {
Optional<BeanProxyFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
BeanProxyFactory.FACTORY,
BeanProxyFactory.class);
@@ -499,7 +499,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected AnnotationBasedProcessorFactory createAnnotationBasedProcessorFactory() {
Optional<AnnotationBasedProcessorFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
AnnotationBasedProcessorFactory.FACTORY,
AnnotationBasedProcessorFactory.class);
@@ -515,7 +515,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected DeferServiceFactory createDeferServiceFactory() {
Optional<DeferServiceFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
DeferServiceFactory.FACTORY,
DeferServiceFactory.class);
@@ -531,7 +531,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected BeanProcessorFactory createBeanProcessorFactory() {
Optional<BeanProcessorFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
BeanProcessorFactory.FACTORY,
BeanProcessorFactory.class);
@@ -551,7 +551,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected RoutesLoader createRoutesLoader() {
Optional<RoutesLoader> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
RoutesLoader.FACTORY,
RoutesLoader.class);
@@ -562,7 +562,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ResourceLoader createResourceLoader() {
Optional<ResourceLoader> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ResourceLoader.FACTORY,
ResourceLoader.class);
@@ -573,7 +573,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ModelToXMLDumper createModelToXMLDumper() {
Optional<ModelToXMLDumper> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ModelToXMLDumper.FACTORY,
ModelToXMLDumper.class);
@@ -588,7 +588,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ModelToYAMLDumper createModelToYAMLDumper() {
Optional<ModelToYAMLDumper> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ModelToYAMLDumper.FACTORY,
ModelToYAMLDumper.class);
@@ -603,7 +603,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected RestBindingJaxbDataFormatFactory createRestBindingJaxbDataFormatFactory() {
Optional<RestBindingJaxbDataFormatFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
RestBindingJaxbDataFormatFactory.FACTORY,
RestBindingJaxbDataFormatFactory.class);
@@ -657,7 +657,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected RestRegistryFactory createRestRegistryFactory() {
Optional<RestRegistryFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
RestRegistryFactory.FACTORY,
RestRegistryFactory.class);
@@ -682,7 +682,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ExchangeFactory createExchangeFactory() {
Optional<ExchangeFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ExchangeFactory.FACTORY,
ExchangeFactory.class);
@@ -698,7 +698,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ProcessorExchangeFactory createProcessorExchangeFactory() {
Optional<ProcessorExchangeFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ProcessorExchangeFactory.FACTORY,
ProcessorExchangeFactory.class);
@@ -709,7 +709,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
protected ReactiveExecutor createReactiveExecutor() {
Optional<ReactiveExecutor> result = ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ReactiveExecutor.FACTORY,
ReactiveExecutor.class);
(camel) 01/03: CAMEL-20014: stop using the deprecated setName method
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 53fa5fdbbad21d34c70963172b37d9908f976157
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Feb 22 17:38:47 2024 +0100
CAMEL-20014: stop using the deprecated setName method
Adjust the code to use the setName from the extension.
---
.../apache/camel/component/consul/cluster/ConsulClusterViewIT.java | 2 +-
.../component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java | 2 +-
.../camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java | 2 +-
.../org/apache/camel/component/consul/cluster/ConsulMasterIT.java | 2 +-
.../embedded/cluster/InfinispanEmbeddedClusteredMasterTest.java | 2 +-
.../cluster/InfinispanEmbeddedClusteredRoutePolicyFactoryTest.java | 2 +-
.../embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyTest.java | 2 +-
.../remote/cluster/AbstractInfinispanRemoteClusteredIT.java | 2 +-
.../jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 2 +-
.../camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java | 2 +-
.../java/org/apache/camel/component/jgroups/JGroupsClusterTest.java | 4 ++--
.../apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java | 2 +-
.../java/org/apache/camel/component/master/MasterComponentTest.java | 2 +-
.../apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java | 2 +-
.../camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java | 2 +-
.../apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java | 2 +-
.../component/mllp/MllpTcpClientProducerConnectionErrorTest.java | 2 +-
.../mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java | 2 +-
.../org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java | 2 +-
.../camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +-
.../camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java | 2 +-
.../component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java | 2 +-
.../camel/component/mllp/MllpTcpServerConsumerTransactionTest.java | 2 +-
.../mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java | 2 +-
.../component/mllp/TcpServerConsumerAcknowledgementTestSupport.java | 2 +-
.../component/quartz/QuartzTwoCamelContextSameNameClashTest.java | 4 ++--
.../java/org/apache/camel/spring/xml/CamelContextFactoryBean.java | 2 +-
.../camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java | 2 +-
.../camel/component/sql/SqlProducerOutputTypeSelectOneTest.java | 2 +-
.../cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java | 2 +-
.../cluster/integration/ZooKeeperClusteredRoutePolicyIT.java | 2 +-
.../component/zookeeper/cluster/integration/ZooKeeperMasterIT.java | 2 +-
.../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
.../java/org/apache/camel/impl/engine/DefaultCamelContextTest.java | 2 +-
.../org/apache/camel/management/ManagedStreamCachingStrategyTest.java | 2 +-
.../org/apache/camel/management/TwoManagedCamelContextClashTest.java | 2 +-
.../java/org/apache/camel/management/TwoManagedCamelContextTest.java | 2 +-
.../java/org/apache/camel/management/TwoManagedNamePatternTest.java | 2 +-
39 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusterViewIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusterViewIT.java
index 84f468e4d82..8889ba8e9cd 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusterViewIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusterViewIT.java
@@ -42,7 +42,7 @@ public class ConsulClusterViewIT {
//Set up context with single locked route.
DefaultCamelContext context = new DefaultCamelContext();
- context.setName("context");
+ context.getCamelContextExtension().setName("context");
context.addService(consulClusterService);
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
index 839fc73a1a8..d66288a3da9 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
@@ -81,7 +81,7 @@ public class ConsulClusteredRoutePolicyFactoryIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(consulClusterService);
context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace("my-ns"));
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
index 2b5a32581e6..6f17644696d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
@@ -81,7 +81,7 @@ public class ConsulClusteredRoutePolicyIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(consulClusterService);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
index f28c99a67de..d9789149594 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
@@ -80,7 +80,7 @@ public class ConsulMasterIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(consulClusterService);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredMasterTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredMasterTest.java
index 394f50e0f27..2e0cd146345 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredMasterTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredMasterTest.java
@@ -36,7 +36,7 @@ public class InfinispanEmbeddedClusteredMasterTest extends AbstractInfinispanEmb
try (DefaultCamelContext context = new DefaultCamelContext()) {
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(clusterService);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyFactoryTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyFactoryTest.java
index e9bcfee5d98..51cc1960153 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyFactoryTest.java
@@ -37,7 +37,7 @@ public class InfinispanEmbeddedClusteredRoutePolicyFactoryTest extends AbstractI
try (DefaultCamelContext context = new DefaultCamelContext()) {
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(clusterService);
context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace(namespace));
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyTest.java
index 010c0cec94a..c59a65b8d16 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/cluster/InfinispanEmbeddedClusteredRoutePolicyTest.java
@@ -37,7 +37,7 @@ public class InfinispanEmbeddedClusteredRoutePolicyTest extends AbstractInfinisp
try (DefaultCamelContext context = new DefaultCamelContext()) {
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(clusterService);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java
index 0f3d7c30c7d..22e9bca1819 100644
--- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java
@@ -120,7 +120,7 @@ public class AbstractInfinispanRemoteClusteredIT {
try (DefaultCamelContext context = new DefaultCamelContext()) {
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(clusterService);
RunnerEnv contextEnv = new RunnerEnv();
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
index b0895cd3f3a..135143eb35e 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
@@ -87,7 +87,7 @@ public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbstr
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
index 46d305bc127..984476313b6 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
@@ -91,7 +91,7 @@ public class JGroupsRaftMasterTest extends JGroupsRaftClusterAbstractTest {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
index 21704122586..5fc01314429 100644
--- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
+++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
@@ -64,11 +64,11 @@ public class JGroupsClusterTest {
@BeforeEach
public void setUp() throws Exception {
firstCamelContext = new DefaultCamelContext();
- firstCamelContext.setName("firstNode");
+ firstCamelContext.getCamelContextExtension().setName("firstNode");
firstCamelContext.addRoutes(new Builder());
secondCamelContext = new DefaultCamelContext();
- secondCamelContext.setName("secondNode");
+ secondCamelContext.getCamelContextExtension().setName("secondNode");
secondCamelContext.addRoutes(new Builder());
}
diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
index 2753a5a06cb..005f9f3d95b 100644
--- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
+++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
@@ -72,7 +72,7 @@ public class JGroupsLockMasterTest {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
index 4d1294261ff..4bb0db10b61 100644
--- a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
+++ b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
@@ -73,7 +73,7 @@ public class MasterComponentTest {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
index 6d37ce30f84..616ff3bed5b 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
@@ -68,7 +68,7 @@ public class MllpMaxConcurrentConsumersTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
index b51e39a4139..5fc5e5ccfa7 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
@@ -45,7 +45,7 @@ public class MllpProducerConsumerLoopbackInOnlyTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(false);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
index 7f7b66fa102..98d3a9ccb1c 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
@@ -61,7 +61,7 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
index 1b2ffd305d7..9e5f85d15e3 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
@@ -67,7 +67,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
index 2832aaaf58f..970e17acccc 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
@@ -69,7 +69,7 @@ public class MllpTcpClientProducerIdleConnectionTimeoutTest extends CamelTestSup
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
index 15bf1f93364..62b6b6b4169 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
@@ -63,7 +63,7 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
index 300188b7f8a..7a5519d629c 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
@@ -51,7 +51,7 @@ public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
index fc3ceff57b7..498bcca312f 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
@@ -63,7 +63,7 @@ public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
index 06ad6670907..4fe49a1a9dd 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
@@ -47,7 +47,7 @@ public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
index f63a06c9bb5..cd1ad3db021 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
@@ -60,7 +60,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
index dad71f8f079..b46088fc3c2 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
@@ -112,7 +112,7 @@ public abstract class TcpClientProducerEndOfDataAndValidationTestSupport extends
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
index 887d9c0c335..6a606c03585 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
@@ -75,7 +75,7 @@ public abstract class TcpServerConsumerAcknowledgementTestSupport extends CamelT
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
context.setUseMDCLogging(true);
- context.setName(this.getClass().getSimpleName());
+ context.getCamelContextExtension().setName(this.getClass().getSimpleName());
return context;
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
index a184f4f4380..1e7b5fe5aae 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
@@ -33,7 +33,7 @@ public class QuartzTwoCamelContextSameNameClashTest {
@BeforeEach
public void setUp() throws Exception {
camel1 = new DefaultCamelContext();
- camel1.setName("myCamel");
+ camel1.getCamelContextExtension().setName("myCamel");
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() {
@@ -45,7 +45,7 @@ public class QuartzTwoCamelContextSameNameClashTest {
camel1.start();
camel2 = new DefaultCamelContext();
- camel2.setName("myCamel");
+ camel2.getCamelContextExtension().setName("myCamel");
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() {
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 44048337c3e..bdd50cc21cb 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
@@ -517,7 +517,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
protected SpringCamelContext createContext() {
SpringCamelContext ctx = newCamelContext();
ctx.setApplicationContext(getApplicationContext());
- ctx.setName(getId());
+ ctx.getCamelContextExtension().setName(getId());
return ctx;
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index baa11d6ce6d..9cb542f5857 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -49,7 +49,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
.addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
- camel1.setName("camel-1");
+ camel1.getCamelContextExtension().setName("camel-1");
camel1.getComponent("sql", SqlComponent.class).setDataSource(db);
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
index eae0a8f81fc..580313c5838 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
@@ -47,7 +47,7 @@ public class SqlProducerOutputTypeSelectOneTest {
.addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
- camel1.setName("camel-1");
+ camel1.getCamelContextExtension().setName("camel-1");
camel1.getComponent("sql", SqlComponent.class).setDataSource(db);
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java
index 76846bcf9cf..58fd469419d 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java
@@ -83,7 +83,7 @@ public final class ZooKeeperClusteredRoutePolicyFactoryIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace("my-ns"));
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java
index e5f4dc725ce..5103fd24c48 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java
@@ -83,7 +83,7 @@ public final class ZooKeeperClusteredRoutePolicyIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java
index e8fdb284b0b..1f69a99f501 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java
@@ -82,7 +82,7 @@ public final class ZooKeeperMasterIT {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
index 4e1ea3124ce..160574303d5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
@@ -82,7 +82,7 @@ public final class FileLockClusteredRoutePolicyFactoryTest {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace("my-ns"));
context.addRoutes(new RouteBuilder() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
index aa912b77734..0088bb64c1e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
@@ -82,7 +82,7 @@ public final class FileLockClusteredRoutePolicyTest {
DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
- context.setName("context-" + id);
+ context.getCamelContextExtension().setName("context-" + id);
context.addService(service);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java
index 39dd0f0e2b3..61f1b97cecd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java
@@ -226,7 +226,7 @@ public class DefaultCamelContextTest extends TestSupport {
ctx.disableJMX();
ctx.init();
assertNotNull(ctx.getName(), "Should have a default name");
- ctx.setName("foo");
+ ctx.getCamelContextExtension().setName("foo");
assertEquals("foo", ctx.getName());
assertNotNull(ctx.toString());
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
index ead80a6b9b6..bae62dc9189 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
@@ -96,7 +96,7 @@ public class ManagedStreamCachingStrategyTest extends ManagementTestSupport {
@Override
public void configure() throws Exception {
DefaultCamelContext dcc = (DefaultCamelContext) context;
- dcc.setName("myCamel");
+ dcc.getCamelContextExtension().setName("myCamel");
context.setStreamCaching(true);
context.getStreamCachingStrategy().setSpoolEnabled(true);
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
index 53a52f11ee7..58f47b4b928 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
@@ -39,7 +39,7 @@ public class TwoManagedCamelContextClashTest extends TestSupport {
protected CamelContext createCamelContext(String name, String managementPattern) throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- context.setName(name);
+ context.getCamelContextExtension().setName(name);
if (managementPattern != null) {
context.getManagementNameStrategy().setNamePattern(managementPattern);
}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
index 678650364f8..9d029b61cff 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
@@ -39,7 +39,7 @@ public class TwoManagedCamelContextTest extends TestSupport {
protected CamelContext createCamelContext(String name) throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- context.setName(name);
+ context.getCamelContextExtension().setName(name);
return context;
}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
index 52bb421d369..a8d2e7bff2d 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
@@ -38,7 +38,7 @@ public class TwoManagedNamePatternTest extends TestSupport {
protected CamelContext createCamelContext(String name, String pattern) throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- context.setName(name);
+ context.getCamelContextExtension().setName(name);
context.getManagementNameStrategy().setNamePattern(pattern);
return context;
}
(camel) 03/03: CAMEL-20014: stop using the deprecated getStartupStepRecorder method
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3b4cd72e727639eee0fed3ecd2222891b31fe80c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Feb 22 17:49:05 2024 +0100
CAMEL-20014: stop using the deprecated getStartupStepRecorder method
Adjust the code to use the getStartupStepRecorder from the extension.
---
.../camel/impl/engine/InternalRouteStartupManager.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
index 2a8e9839f3d..d6da72b40a4 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
@@ -77,7 +77,7 @@ final class InternalRouteStartupManager {
camelContext.setStartingRoutes(true);
try {
for (RouteService routeService : routeServices.values()) {
- StartupStep step = camelContext.getStartupStepRecorder().beginStep(Route.class, routeService.getId(),
+ StartupStep step = camelContext.getCamelContextExtension().getStartupStepRecorder().beginStep(Route.class, routeService.getId(),
"Init Route");
try {
LOG.debug("Initializing route id: {}", routeService.getId());
@@ -88,7 +88,7 @@ final class InternalRouteStartupManager {
routeService.setUp();
} finally {
setupRoute.remove();
- camelContext.getStartupStepRecorder().endStep(step);
+ camelContext.getCamelContextExtension().getStartupStepRecorder().endStep(step);
}
}
} finally {
@@ -298,7 +298,7 @@ final class InternalRouteStartupManager {
// will then be prepared in time before we start inputs which will
// consume messages to be routed
RouteService routeService = entry.getValue().getRouteService();
- StartupStep step = camelContext.getStartupStepRecorder().beginStep(Route.class, routeService.getId(),
+ StartupStep step = camelContext.getCamelContextExtension().getStartupStepRecorder().beginStep(Route.class, routeService.getId(),
"Warump Route");
try {
LOG.debug("Warming up route id: {} having autoStartup={}", routeService.getId(), autoStartup);
@@ -308,7 +308,7 @@ final class InternalRouteStartupManager {
routeService.warmUp();
} finally {
setupRoute.remove();
- camelContext.getStartupStepRecorder().endStep(step);
+ camelContext.getCamelContextExtension().getStartupStepRecorder().endStep(step);
}
}
}
@@ -350,7 +350,7 @@ final class InternalRouteStartupManager {
continue;
}
- StartupStep step = camelContext.getStartupStepRecorder().beginStep(Route.class, route.getRouteId(),
+ StartupStep step = camelContext.getCamelContextExtension().getStartupStepRecorder().beginStep(Route.class, route.getRouteId(),
"Start Route");
// do some preparation before starting the consumer on the route
@@ -451,7 +451,7 @@ final class InternalRouteStartupManager {
}
}
- camelContext.getStartupStepRecorder().endStep(step);
+ camelContext.getCamelContextExtension().getStartupStepRecorder().endStep(step);
}
}