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 0568196034ce57a23c5716b7202c12b8ab3975f9
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Sun Feb 19 11:12:53 2023 +0100
CAMEL-15105: Fix calls to former CamelContext methods that now should be
done on the Extension
---
.../camel/component/jms/JmsInOnlyPooledExchangeTest.java | 2 +-
.../netty/http/NettyHttpSimplePooledExchangeTest.java | 2 +-
.../apache/camel/component/netty/NettyRedeliveryTest.java | 2 +-
.../component/rest/openapi/RestOpenApiDelegateHttpsTest.java | 3 +--
.../rest/openapi/RestOpenApiDelegateHttpsV3Test.java | 3 +--
.../component/sjms/consumer/InOnlyPooledExchangeTest.java | 2 +-
.../org/apache/camel/spring/xml/CamelContextFactoryBean.java | 8 ++++----
.../org/apache/camel/spring/CamelContextFactoryBeanTest.java | 2 +-
.../java/org/apache/camel/spring/SpringCamelContext.java | 2 +-
.../camel/core/xml/AbstractCamelContextFactoryBeanTest.java | 2 +-
.../impl/engine/DefaultPackageScanResourceResolverTest.java | 2 +-
.../camel/processor/BatchConsumerPooledExchangeTest.java | 2 +-
.../java/org/apache/camel/processor/PooledExchangeTest.java | 2 +-
.../src/main/java/org/apache/camel/main/KameletMain.java | 10 +++++-----
.../groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy | 12 ++++++------
15 files changed, 27 insertions(+), 29 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
index f4b1b03b388..76afbdbf15c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
@@ -93,7 +93,7 @@ public class JmsInOnlyPooledExchangeTest extends
AbstractJMSTest {
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) ecc;
+ return camelContext;
}
@Override
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimplePooledExchangeTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimplePooledExchangeTest.java
index b7a3b4dc427..f3cde873539 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimplePooledExchangeTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimplePooledExchangeTest.java
@@ -47,7 +47,7 @@ public class NettyHttpSimplePooledExchangeTest extends
BaseNettyTest {
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) ecc;
+ return camelContext;
}
@Order(1)
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
index d8903c23c04..2538861e06c 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
@@ -138,7 +138,7 @@ public class NettyRedeliveryTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
// Override the error handler executor service such that we can track
the tasks created
CamelContext context = new DefaultCamelContext(createCamelRegistry()) {
- @Override
+
public ScheduledExecutorService getErrorHandlerExecutorService() {
return getScheduledExecutorService();
}
diff --git
a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsTest.java
b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsTest.java
index 16f4304db44..0528e94766d 100644
---
a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsTest.java
+++
b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.rest.openapi;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.PropertyBindingSupport;
public class RestOpenApiDelegateHttpsTest extends HttpsTest {
@@ -28,7 +27,7 @@ public class RestOpenApiDelegateHttpsTest extends HttpsTest {
final CamelContext camelContext = super.createCamelContext();
// since camel context is not started, then we need to manually
initialize the delegate
- final Component delegate = ((DefaultCamelContext)
camelContext).getComponentResolver()
+ final Component delegate =
camelContext.getCamelContextExtension().getComponentResolver()
.resolveComponent(componentName, camelContext);
delegate.setCamelContext(camelContext);
delegate.init();
diff --git
a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsV3Test.java
b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsV3Test.java
index c16ebedf98b..a0d8b689924 100644
---
a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsV3Test.java
+++
b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsV3Test.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.rest.openapi;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.PropertyBindingSupport;
public class RestOpenApiDelegateHttpsV3Test extends HttpsV3Test {
@@ -28,7 +27,7 @@ public class RestOpenApiDelegateHttpsV3Test extends
HttpsV3Test {
final CamelContext camelContext = super.createCamelContext();
// since camel context is not started, then we need to manually
initialize the delegate
- final Component delegate = ((DefaultCamelContext)
camelContext).getComponentResolver()
+ final Component delegate =
camelContext.getCamelContextExtension().getComponentResolver()
.resolveComponent(componentName, camelContext);
delegate.setCamelContext(camelContext);
delegate.init();
diff --git
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
index aee5be9ef98..89b2bc8c235 100644
---
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
+++
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
@@ -46,7 +46,7 @@ public class InOnlyPooledExchangeTest extends JmsTestSupport {
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) ecc;
+ return camelContext;
}
@Test
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 9c6e7d33bb2..1c815cd9b1e 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
@@ -318,15 +318,15 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Spr
protected void findRouteBuildersByPackageScan(String[] packages,
PackageScanFilter filter, List<RoutesBuilder> builders)
throws Exception {
// add filter to class resolver which then will filter
- getContext().getPackageScanClassResolver().addFilter(filter);
+
getContext().getCamelContextExtension().getPackageScanClassResolver().addFilter(filter);
PackageScanRouteBuilderFinder finder = new
PackageScanRouteBuilderFinder(
getContext(), packages, getContextClassLoaderOnStart(),
- getBeanPostProcessor(),
getContext().getPackageScanClassResolver());
+ getBeanPostProcessor(),
getContext().getCamelContextExtension().getPackageScanClassResolver());
finder.appendBuilders(builders);
// and remove the filter
- getContext().getPackageScanClassResolver().removeFilter(filter);
+
getContext().getCamelContextExtension().getPackageScanClassResolver().removeFilter(filter);
}
@Override
@@ -348,7 +348,7 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Spr
}
// register the bean post processor on camel context
if (beanPostProcessor instanceof
org.apache.camel.spi.CamelBeanPostProcessor) {
-
context.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 8ad805aa1da..cf62f18c073 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,7 @@ public class CamelContextFactoryBeanTest {
factory.setApplicationContext(applicationContext);
factory.afterPropertiesSet();
- ModelJAXBContextFactory modelJAXBContextFactory =
factory.getContext().getModelJAXBContextFactory();
+ ModelJAXBContextFactory modelJAXBContextFactory =
factory.getContext().getCamelContextExtension().getModelJAXBContextFactory();
assertTrue(modelJAXBContextFactory instanceof
CustomModelJAXBContextFactory);
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 1e5df621051..137dd313662 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -257,7 +257,7 @@ public class SpringCamelContext extends DefaultCamelContext
protected ModelJAXBContextFactory createModelJAXBContextFactory() {
Optional<ModelJAXBContextFactory> result =
ResolverHelper.resolveService(
getCamelContextReference(),
- getBootstrapFactoryFinder(),
+ getCamelContextExtension().getBootstrapFactoryFinder(),
ModelJAXBContextFactory.FACTORY + "-spring",
ModelJAXBContextFactory.class);
diff --git
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
index d62da8d0593..4d64a7fb048 100644
---
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
+++
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
@@ -136,7 +136,7 @@ public class AbstractCamelContextFactoryBeanTest {
when(context.getManagementNameStrategy()).thenReturn(mock(ManagementNameStrategy.class));
when(context.getExecutorServiceManager()).thenReturn(mock(ExecutorServiceManager.class));
when(context.getInflightRepository()).thenReturn(mock(InflightRepository.class));
-
when(context.getBeanPostProcessor()).thenReturn(mock(CamelBeanPostProcessor.class));
+
when(context.getCamelContextExtension().getBeanPostProcessor()).thenReturn(mock(CamelBeanPostProcessor.class));
@SuppressWarnings("unchecked")
final AbstractCamelContextFactoryBean<ModelCamelContext> factory =
mock(AbstractCamelContextFactoryBean.class);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
index 5c8efcbde0f..298b67f4df5 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
@@ -26,7 +26,7 @@ public class DefaultPackageScanResourceResolverTest {
@Test
public void testFileResourcesScan() throws Exception {
final DefaultCamelContext ctx = new DefaultCamelContext();
- final PackageScanResourceResolver resolver =
ctx.getPackageScanResourceResolver();
+ final PackageScanResourceResolver resolver =
ctx.getCamelContextExtension().getPackageScanResourceResolver();
assertThat(resolver.findResources("file:src/test/resources/org/apache/camel/impl/engine/**/*.xml"))
.hasSize(4)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/BatchConsumerPooledExchangeTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/BatchConsumerPooledExchangeTest.java
index 073891fb285..efaa951f2bb 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/BatchConsumerPooledExchangeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/BatchConsumerPooledExchangeTest.java
@@ -52,7 +52,7 @@ public class BatchConsumerPooledExchangeTest extends
ContextTestSupport {
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) ecc;
+ return camelContext;
}
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/PooledExchangeTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/PooledExchangeTest.java
index d035114412e..8ab45bbbdd7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/PooledExchangeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/PooledExchangeTest.java
@@ -50,7 +50,7 @@ class PooledExchangeTest extends ContextTestSupport {
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) ecc;
+ return camelContext;
}
@Test
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 7878d78fe31..b75a36471f8 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -301,8 +301,8 @@ public class KameletMain extends MainCommandLineSupport {
if (download) {
ClassLoader dynamicCL = createApplicationContextClassLoader();
answer.setApplicationContextClassLoader(dynamicCL);
- answer.getPackageScanClassResolver().addClassLoader(dynamicCL);
- answer.getPackageScanResourceResolver().addClassLoader(dynamicCL);
+
answer.getCamelContextExtension().getPackageScanClassResolver().addClassLoader(dynamicCL);
+
answer.getCamelContextExtension().getPackageScanResourceResolver().addClassLoader(dynamicCL);
MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
downloader.setClassLoader(dynamicCL);
@@ -433,10 +433,10 @@ public class KameletMain extends MainCommandLineSupport {
answer.getCamelContextExtension().getRegistry().bind(DependencyDownloaderStrategy.class.getSimpleName(),
new DependencyDownloaderStrategy(answer));
answer.setClassResolver(new
DependencyDownloaderClassResolver(answer, known));
- answer.setComponentResolver(new
DependencyDownloaderComponentResolver(answer, stub));
- answer.setUriFactoryResolver(new
DependencyDownloaderUriFactoryResolver(answer));
+ answer.getCamelContextExtension().setComponentResolver(new
DependencyDownloaderComponentResolver(answer, stub));
+ answer.getCamelContextExtension().setUriFactoryResolver(new
DependencyDownloaderUriFactoryResolver(answer));
answer.setDataFormatResolver(new
DependencyDownloaderDataFormatResolver(answer));
- answer.setLanguageResolver(new
DependencyDownloaderLanguageResolver(answer));
+ answer.getCamelContextExtension().setLanguageResolver(new
DependencyDownloaderLanguageResolver(answer));
answer.setResourceLoader(new
DependencyDownloaderResourceLoader(answer));
answer.setInjector(new KameletMainInjector(answer.getInjector(),
stub));
answer.addService(new DependencyDownloaderKamelet(answer));
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
index b66d919020d..3b134f6ffe3 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ErrorHandlerTest.groovy
@@ -58,7 +58,7 @@ class ErrorHandlerTest extends YamlTestSupport {
to('direct:start').withBody('hello').send()
}
then:
- context.getErrorHandlerFactory() instanceof
RefErrorHandlerDefinition
+ context.getCamelContextExtension().getErrorHandlerFactory()
instanceof RefErrorHandlerDefinition
MockEndpoint.assertIsSatisfied(context)
}
@@ -72,7 +72,7 @@ class ErrorHandlerTest extends YamlTestSupport {
when:
context.start()
then:
- with(context.getErrorHandlerFactory(), RefErrorHandlerDefinition) {
+ with(context.getCamelContextExtension().getErrorHandlerFactory(),
RefErrorHandlerDefinition) {
ref == 'myErrorHandler'
}
}
@@ -86,7 +86,7 @@ class ErrorHandlerTest extends YamlTestSupport {
when:
context.start()
then:
- with(context.getErrorHandlerFactory(), RefErrorHandlerDefinition) {
+ with(context.getCamelContextExtension().getErrorHandlerFactory(),
RefErrorHandlerDefinition) {
ref == 'myErrorHandler'
}
}
@@ -103,7 +103,7 @@ class ErrorHandlerTest extends YamlTestSupport {
when:
context.start()
then:
- with(context.getErrorHandlerFactory(),
DeadLetterChannelDefinition) {
+ with(context.getCamelContextExtension().getErrorHandlerFactory(),
DeadLetterChannelDefinition) {
deadLetterUri == 'mock:on-error'
redeliveryPolicy.maximumRedeliveries == "3"
}
@@ -121,7 +121,7 @@ class ErrorHandlerTest extends YamlTestSupport {
when:
context.start()
then:
- with(context.getErrorHandlerFactory(), DefaultErrorHandlerDefinition) {
+ with(context.getCamelContextExtension().getErrorHandlerFactory(),
DefaultErrorHandlerDefinition) {
useOriginalMessage == "true"
redeliveryPolicy.maximumRedeliveries == "2"
}
@@ -136,7 +136,7 @@ class ErrorHandlerTest extends YamlTestSupport {
when:
context.start()
then:
- context.getErrorHandlerFactory() instanceof
NoErrorHandlerDefinition
+ context.getCamelContextExtension().getErrorHandlerFactory()
instanceof NoErrorHandlerDefinition
}
}
