[camel] branch main updated: CAMEL-19933: camel-jbang - Register bean model when loading XML osgi beans, also when ignore loading error.

[davsclaus]

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 f2e3577c399 CAMEL-19933: camel-jbang - Register bean model when 
loading XML osgi beans, also when ignore loading error.
f2e3577c399 is described below

commit f2e3577c39952ed202aaa2e862b716a2fdb43ecc
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Sep 29 15:51:35 2023 +0200

    CAMEL-19933: camel-jbang - Register bean model when loading XML osgi beans, 
also when ignore loading error.
---
 .../src/main/java/org/apache/camel/main/KameletMain.java            | 1 +
 .../apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java   | 6 ++++++
 2 files changed, 7 insertions(+)

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 5417b7c4f61..231d7cdd769 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
@@ -639,6 +639,7 @@ public class KameletMain extends MainCommandLineSupport {
             } else {
                 routesLoader = new 
DependencyDownloaderRoutesLoader(camelContext);
             }
+            
routesLoader.setIgnoreLoadingError(this.mainConfigurationProperties.isRoutesCollectorIgnoreLoadingError());
 
             // use resolvers that can auto downloaded
             camelContext.getCamelContextExtension()
diff --git 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
index c018de3addc..f7e298da9a4 100644
--- 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
+++ 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
@@ -37,6 +37,7 @@ import org.apache.camel.model.app.RegistryBeanDefinition;
 import org.apache.camel.spi.Resource;
 import org.apache.camel.spi.ResourceLoader;
 import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.support.PluginHelper;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.KeyValueHolder;
 import org.apache.camel.util.StringHelper;
@@ -258,6 +259,11 @@ public class BlueprintXmlBeansHandler {
                 if (delayIfFailed) {
                     delayedRegistrations.add(def);
                 } else {
+                    boolean ignore = 
PluginHelper.getRoutesLoader(camelContext).isIgnoreLoadingError();
+                    if (ignore) {
+                        // still add bean if we are ignore loading as we want 
to know about all beans if possible
+                        addBeanToCamelModel(camelContext, name, def);
+                    }
                     LOG.warn("Error creating bean: {} due to: {}. This 
exception is ignored.", type, e.getMessage(), e);
                 }
             }