CAMEL-19933: camel-jbang - Register bean model when loading XML osgi …

…beans, also when ignore loading error.
apache · Sep 29, 2023 · f2e3577 · f2e3577
1 parent 96381e5
commit f2e3577
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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
@@ -639,6 +639,7 @@ protected void configureRoutesLoader(CamelContext camelContext) {
             } else {
                 routesLoader = new DependencyDownloaderRoutesLoader(camelContext);
             }
+            routesLoader.setIgnoreLoadingError(this.mainConfigurationProperties.isRoutesCollectorIgnoreLoadingError());
 
             // use resolvers that can auto downloaded
             camelContext.getCamelContextExtension()

diff --git a/...elet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java b/...elet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
@@ -37,6 +37,7 @@
 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 @@ private void registerBeanDefinition(CamelContext camelContext, RegistryBeanDefin
                 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);
                 }
             }