This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 588bd043168 CAMEL-18657: camel-jbang - Loading dynamic JARs should
load EndpointUriFactory
588bd043168 is described below
commit 588bd04316804df4c7bed860827d11d42e17fd42
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Oct 27 11:19:53 2022 +0200
CAMEL-18657: camel-jbang - Loading dynamic JARs should load
EndpointUriFactory
---
.../DependencyDownloaderUriFactoryResolver.java | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderUriFactoryResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderUriFactoryResolver.java
index 8549e12ca63..5ddbe0b3768 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderUriFactoryResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderUriFactoryResolver.java
@@ -17,26 +17,33 @@
package org.apache.camel.main.download;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.impl.engine.DefaultUriFactoryResolver;
import org.apache.camel.spi.EndpointUriFactory;
+import org.apache.camel.tooling.model.ComponentModel;
/**
* Auto downloaded needed JARs when resolving uri factory.
*/
public class DependencyDownloaderUriFactoryResolver extends
DefaultUriFactoryResolver {
- public DependencyDownloaderUriFactoryResolver(CamelContext context) {
- setCamelContext(context);
+ private final CamelCatalog catalog = new DefaultCamelCatalog();
+ private final CamelContext camelContext;
+ private final DependencyDownloader downloader;
+
+ public DependencyDownloaderUriFactoryResolver(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ this.downloader = camelContext.hasService(DependencyDownloader.class);
}
@Override
public EndpointUriFactory resolveFactory(String name, CamelContext
context) {
- // need to trigger component resolver that is capable of downloading
if needed
- try {
-
context.adapt(ExtendedCamelContext.class).getComponentResolver().resolveComponent(name,
context);
- } catch (Exception e) {
- // ignore
+ ComponentModel model = catalog.componentModel(name);
+ if (model != null &&
!downloader.alreadyOnClasspath(model.getGroupId(), model.getArtifactId(),
+ model.getVersion())) {
+ downloader.downloadDependency(model.getGroupId(),
model.getArtifactId(),
+ model.getVersion());
}
return super.resolveFactory(name, context);