You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/04/13 06:52:53 UTC
[camel-quarkus] 14/25: Fixed compilation failures because of CAMEL-15105
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 465908457ec07075e2771b52170c1a2f8368d1d1
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Mon Apr 3 09:51:26 2023 +0200
Fixed compilation failures because of CAMEL-15105
---
.../quarkus/core/deployment/CamelPackageScanClassResolverTest.java | 6 +++---
.../java/org/apache/camel/quarkus/core/CamelContextRecorder.java | 6 +++---
.../src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 3 ++-
.../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 2 +-
.../src/main/java/org/apache/camel/quarkus/main/CamelMain.java | 1 +
.../camel/quarkus/support/language/deployment/dm/DryModeMain.java | 4 ++--
.../java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java | 3 ++-
.../quarkus/component/kamelet/deployment/KameletProcessor.java | 5 +++--
.../component/name/resolver/ComponentNameResolverResource.java | 5 +++--
.../quarkus/component/dsl/modeline/it/DslModelineResource.java | 3 ++-
.../java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java | 5 +++--
.../org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java | 3 ++-
.../main/java/org/apache/camel/quarkus/main/CoreMainResource.java | 7 ++++---
.../messaging/it/util/scheme/MessagingComponentSchemeProducer.java | 3 ++-
14 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java
index 2366898802..312f33277b 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java
@@ -65,7 +65,7 @@ public class CamelPackageScanClassResolverTest {
@Test
public void findImplementations() {
ExtendedCamelContext ecc = context.getCamelContextExtension();
- PackageScanClassResolver resolver = ecc.getPackageScanClassResolver();
+ PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class);
Set<Class<?>> classes = resolver.findImplementations(Animal.class, Animal.class.getPackageName());
assertNotNull(classes);
assertEquals(2, classes.size());
@@ -76,7 +76,7 @@ public class CamelPackageScanClassResolverTest {
@Test
public void findByFilter() {
ExtendedCamelContext ecc = context.getCamelContextExtension();
- PackageScanClassResolver resolver = ecc.getPackageScanClassResolver();
+ PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class);
Set<Class<?>> classes = resolver.findByFilter(Fungi.class::isAssignableFrom, Fungi.class.getPackageName());
assertNotNull(classes);
assertEquals(1, classes.size());
@@ -86,7 +86,7 @@ public class CamelPackageScanClassResolverTest {
@Test
public void findAnnotated() {
ExtendedCamelContext ecc = context.getCamelContextExtension();
- PackageScanClassResolver resolver = ecc.getPackageScanClassResolver();
+ PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class);
Set<Class<?>> classes = resolver.findAnnotated(Singleton.class, Animal.class.getPackageName());
assertNotNull(classes);
assertEquals(1, classes.size());
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index ebcaa4428e..a024637fc3 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -69,10 +69,10 @@ public class CamelContextRecorder {
extendedCamelContext.setRegistry(registry.getValue());
context.setTypeConverterRegistry(typeConverterRegistry.getValue());
context.setLoadTypeConverters(false);
- extendedCamelContext.setModelJAXBContextFactory(contextFactory.getValue());
- extendedCamelContext.setPackageScanClassResolver(packageScanClassResolver.getValue());
+ extendedCamelContext.addContextPlugin(ModelJAXBContextFactory.class, contextFactory.getValue());
+ extendedCamelContext.addContextPlugin(PackageScanClassResolver.class, packageScanClassResolver.getValue());
context.build();
- extendedCamelContext.setComponentNameResolver(componentNameResolver.getValue());
+ extendedCamelContext.addContextPlugin(ComponentNameResolver.class, componentNameResolver.getValue());
// register to the container
beanContainer.instance(CamelProducers.class).setContext(context);
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index e7e5f463f8..e83294aa40 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -44,6 +44,7 @@ import org.apache.camel.spi.Registry;
import org.apache.camel.spi.StartupStepRecorder;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.startup.DefaultStartupStepRecorder;
@Recorder
@@ -188,7 +189,7 @@ public class CamelRecorder {
public Supplier<?> produceProxy(Class<?> clazz, String uri) {
return () -> {
final CamelContext camelContext = Arc.container().instance(CamelContext.class).get();
- final BeanProxyFactory factory = camelContext.getCamelContextExtension().getBeanProxyFactory();
+ final BeanProxyFactory factory = PluginHelper.getBeanProxyFactory(camelContext);
final Endpoint endpoint = camelContext.getEndpoint(uri);
try {
return factory.createProxy(endpoint, true, clazz);
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index fbce219604..3eede2bc99 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -60,7 +60,7 @@ public class FastCamelContext extends DefaultCamelContext implements CatalogCame
this.modelDumper = modelDumper;
ExtendedCamelContext extendedCamelContext = getCamelContextExtension();
- extendedCamelContext.setFactoryFinderResolver(factoryFinderResolver);
+ extendedCamelContext.addContextPlugin(FactoryFinderResolver.class, factoryFinderResolver);
setTracing(Boolean.FALSE);
setDebugging(Boolean.FALSE);
setMessageHistory(Boolean.FALSE);
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
index 9a1ddeadb4..a237c3cc0e 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
@@ -35,6 +35,7 @@ import org.apache.camel.main.RoutesConfigurer;
import org.apache.camel.main.SimpleMainShutdownStrategy;
import org.apache.camel.quarkus.core.CamelConfig.FailureRemedy;
import org.apache.camel.spi.HasCamelContext;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java
index 18bb69f854..d01121acc4 100644
--- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java
+++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java
@@ -53,8 +53,8 @@ public class DryModeMain extends MainSupport {
ctx.setInjector(new DryModeInjector(ctx.getInjector()));
ExtendedCamelContext extendedCamelContext = ctx.getCamelContextExtension();
- extendedCamelContext.setLanguageResolver(languageResolver);
- extendedCamelContext.setComponentResolver(new DryModeComponentResolver());
+ extendedCamelContext.addContextPlugin(DryModeLanguageResolver.class, languageResolver);
+ extendedCamelContext.addContextPlugin(DryModeComponentResolver.class, new DryModeComponentResolver());
return ctx;
}
diff --git a/extensions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java b/extensions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java
index d26f26b4ee..ed7b38d858 100644
--- a/extensions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java
+++ b/extensions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java
@@ -26,7 +26,8 @@ public class JaxbRecorder {
public RuntimeValue<CamelContextCustomizer> newRestBindingJaxbDataFormatFactoryContextCustomizer() {
JaxbRestBindingJaxbDataFormatFactory factory = new JaxbRestBindingJaxbDataFormatFactory();
return new RuntimeValue<>(
- context -> context.getCamelContextExtension().setRestBindingJaxbDataFormatFactory(factory));
+ context -> context.getCamelContextExtension().addContextPlugin(JaxbRestBindingJaxbDataFormatFactory.class,
+ factory));
}
}
diff --git a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
index e43b2a0ee4..1ca4c9e581 100644
--- a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
+++ b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
@@ -39,6 +39,7 @@ import org.apache.camel.quarkus.component.kamelet.KameletConfiguration;
import org.apache.camel.quarkus.component.kamelet.KameletRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
import org.apache.camel.spi.Resource;
+import org.apache.camel.support.PluginHelper;
class KameletProcessor {
private static final String FEATURE = "camel-kamelet";
@@ -55,7 +56,7 @@ class KameletProcessor {
public Optional<Resource> resolve(String id, CamelContext context) throws Exception {
ExtendedCamelContext ecc = context.getCamelContextExtension();
return Optional.ofNullable(
- ecc.getResourceLoader().resolveResource("/kamelets/" + id + ".kamelet.yaml"));
+ PluginHelper.getResourceLoader(ecc).resolveResource("/kamelets/" + id + ".kamelet.yaml"));
}
});
}
@@ -83,7 +84,7 @@ class KameletProcessor {
continue;
}
- Collection<RoutesBuilder> rbs = ecc.getRoutesLoader().findRoutesBuilders(resource.get());
+ Collection<RoutesBuilder> rbs = PluginHelper.getRoutesLoader(ecc).findRoutesBuilders(resource.get());
for (RoutesBuilder rb : rbs) {
RouteBuilder routeBuilder = (RouteBuilder) rb;
routeBuilder.configure();
diff --git a/integration-test-groups/foundation/component-name-resolver/src/main/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverResource.java b/integration-test-groups/foundation/component-name-resolver/src/main/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverResource.java
index 9b8cc52090..d1b06b5a64 100644
--- a/integration-test-groups/foundation/component-name-resolver/src/main/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverResource.java
+++ b/integration-test-groups/foundation/component-name-resolver/src/main/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverResource.java
@@ -25,6 +25,7 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.ComponentNameResolver;
+import org.apache.camel.support.PluginHelper;
@Path("/component-name-resolver")
public class ComponentNameResolverResource {
@@ -36,7 +37,7 @@ public class ComponentNameResolverResource {
@GET
@Produces(MediaType.TEXT_PLAIN)
public String configuredComponentNameResolverClass() {
- ComponentNameResolver resolver = context.getCamelContextExtension().getComponentNameResolver();
+ ComponentNameResolver resolver = PluginHelper.getComponentNameResolver(context);
return resolver.getClass().getName();
}
@@ -44,7 +45,7 @@ public class ComponentNameResolverResource {
@GET
@Produces(MediaType.TEXT_PLAIN)
public String fastResolveComponentNames() {
- ComponentNameResolver resolver = context.getCamelContextExtension().getComponentNameResolver();
+ ComponentNameResolver resolver = PluginHelper.getComponentNameResolver(context);
return resolver.resolveNames(context)
.stream()
.collect(Collectors.joining(","));
diff --git a/integration-tests-jvm/dsl-modeline/src/main/java/org/apache/camel/quarkus/component/dsl/modeline/it/DslModelineResource.java b/integration-tests-jvm/dsl-modeline/src/main/java/org/apache/camel/quarkus/component/dsl/modeline/it/DslModelineResource.java
index 67dfb373b9..0f8f351bae 100644
--- a/integration-tests-jvm/dsl-modeline/src/main/java/org/apache/camel/quarkus/component/dsl/modeline/it/DslModelineResource.java
+++ b/integration-tests-jvm/dsl-modeline/src/main/java/org/apache/camel/quarkus/component/dsl/modeline/it/DslModelineResource.java
@@ -33,6 +33,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.event.CamelContextStartedEvent;
import org.apache.camel.spi.DependencyStrategy;
import org.apache.camel.spi.ModelineFactory;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.ResourceHelper;
@Path("/dsl-modeline")
@@ -48,7 +49,7 @@ public class DslModelineResource {
context = event.getContext();
deps = new ArrayList<>();
context.getRegistry().bind("myDep", (DependencyStrategy) dependency -> deps.add(dependency));
- factory = context.getCamelContextExtension().getModelineFactory();
+ factory = PluginHelper.getModelineFactory(context);
}
@POST
diff --git a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
index 78987286c0..d7843282f7 100644
--- a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
+++ b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
@@ -39,6 +39,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.dsl.xml.io.XmlRoutesBuilderLoader;
import org.apache.camel.spi.RoutesBuilderLoader;
+import org.apache.camel.support.PluginHelper;
@Path("/xml-io")
@ApplicationScoped
@@ -65,12 +66,12 @@ public class CoreMainXmlIoResource {
main.getCamelContext().getRoutes().forEach(route -> routes.add(route.getId()));
return Json.createObjectBuilder()
- .add("xml-routes-definitions-loader", camelContext.getRoutesLoader().getClass().getName())
+ .add("xml-routes-definitions-loader", PluginHelper.getRoutesLoader(camelContext).getClass().getName())
.add("xml-routes-builder-loader",
camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH)
.findClass(XmlRoutesBuilderLoader.EXTENSION).get().getName())
.add("xml-model-dumper", camelContext.getModelToXMLDumper().getClass().getName())
- .add("xml-model-factory", camelContext.getModelJAXBContextFactory().getClass().getName())
+ .add("xml-model-factory", PluginHelper.getModelJAXBContextFactory(camelContext).getClass().getName())
.add("routeBuilders", routeBuilders)
.add("routes", routes)
.build();
diff --git a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
index 91dd9a4baf..c63ba0a9e3 100644
--- a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
+++ b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
@@ -29,6 +29,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.TemplatedRouteBuilder;
import org.apache.camel.dsl.xml.io.XmlRoutesBuilderLoader;
import org.apache.camel.spi.RoutesBuilderLoader;
+import org.apache.camel.support.PluginHelper;
@Path("/test")
@ApplicationScoped
@@ -62,7 +63,7 @@ public class CoreMainXmlJaxbResource {
camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH)
.findClass(XmlRoutesBuilderLoader.EXTENSION).get().getName())
.add("xml-model-dumper", camelContext.getModelToXMLDumper().getClass().getName())
- .add("xml-model-factory", camelContext.getModelJAXBContextFactory().getClass().getName())
+ .add("xml-model-factory", PluginHelper.getModelJAXBContextFactory(camelContext).getClass().getName())
.add("routeBuilders", routeBuilders)
.add("routes", routes)
.build();
diff --git a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
index f8ada3bac0..af4f12fea0 100644
--- a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
+++ b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
@@ -48,6 +48,7 @@ import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.ThreadPoolFactory;
import org.apache.camel.support.DefaultRegistry;
import org.apache.camel.support.LRUCacheFactory;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
@Path("/test")
@@ -127,7 +128,7 @@ public class CoreMainResource {
.forEach((name, value) -> componentsInRegistry.add(name, value.getClass().getName()));
JsonObjectBuilder factoryClassMap = Json.createObjectBuilder();
- FactoryFinderResolver factoryFinderResolver = camelContext.getCamelContextExtension().getFactoryFinderResolver();
+ FactoryFinderResolver factoryFinderResolver = PluginHelper.getFactoryFinderResolver(camelContext);
if (factoryFinderResolver instanceof FastFactoryFinderResolver) {
((FastFactoryFinderResolver) factoryFinderResolver).getClassMap().forEach((k, v) -> {
factoryClassMap.add(k, v.getName());
@@ -156,7 +157,7 @@ public class CoreMainResource {
.add("factory-finder", Json.createObjectBuilder()
.add("class-map", factoryClassMap))
.add("bean-introspection-invocations",
- camelContext.getCamelContextExtension().getBeanIntrospection().getInvokedCounter())
+ PluginHelper.getBeanIntrospection(camelContext).getInvokedCounter())
.build();
}
@@ -231,7 +232,7 @@ public class CoreMainResource {
}
if (component != null) {
- main.getCamelContext().getCamelContextExtension().getBeanIntrospection().getProperties(component, properties,
+ PluginHelper.getBeanIntrospection(main.getCamelContext()).getProperties(component, properties,
null);
properties.forEach((k, v) -> {
if (v != null) {
diff --git a/integration-tests/messaging/common/src/main/java/org/apache/camel/quarkus/component/messaging/it/util/scheme/MessagingComponentSchemeProducer.java b/integration-tests/messaging/common/src/main/java/org/apache/camel/quarkus/component/messaging/it/util/scheme/MessagingComponentSchemeProducer.java
index f1e1ed086e..9e391b0d8a 100644
--- a/integration-tests/messaging/common/src/main/java/org/apache/camel/quarkus/component/messaging/it/util/scheme/MessagingComponentSchemeProducer.java
+++ b/integration-tests/messaging/common/src/main/java/org/apache/camel/quarkus/component/messaging/it/util/scheme/MessagingComponentSchemeProducer.java
@@ -29,6 +29,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.spi.ComponentNameResolver;
+import org.apache.camel.support.PluginHelper;
public class MessagingComponentSchemeProducer {
@@ -37,7 +38,7 @@ public class MessagingComponentSchemeProducer {
public ComponentScheme getMessagingComponentScheme(CamelContext camelContext) {
ExtendedCamelContext context = camelContext.getCamelContextExtension();
RuntimeCamelCatalog catalog = context.getRuntimeCamelCatalog();
- ComponentNameResolver resolver = context.getComponentNameResolver();
+ ComponentNameResolver resolver = PluginHelper.getComponentNameResolver(context);
List<JsonObject> schemas = new ArrayList<>();
for (String name : resolver.resolveNames(camelContext)) {