(camel) 09/09: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch kamelet-ctr5
in repository https://gitbox.apache.org/repos/asf/camel.git

commit acbb1e6f93647ffa761bcd2bd6f6641bbb358b58
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri May 3 08:03:32 2024 +0200

    CAMEL-20514: camel-model - Add support for bean constructors for beans in 
route templates or kamelets
---
 .../org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java | 4 ++--
 .../java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java  | 4 ++--
 .../org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 494f07eb4e2..a1b64e1394a 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
@@ -25,7 +25,6 @@ import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.camel.model.BeanFactoryDefinition;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -40,6 +39,7 @@ import org.apache.camel.TypeConverterExists;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.main.MainConfigurationProperties;
 import org.apache.camel.main.util.XmlHelper;
+import org.apache.camel.model.BeanFactoryDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.model.errorhandler.RefErrorHandlerDefinition;
 import org.apache.camel.spi.Resource;
@@ -513,7 +513,7 @@ public class BlueprintXmlBeansHandler {
         Model model = 
camelContext.getCamelContextExtension().getContextPlugin(Model.class);
         if (model != null) {
             LOG.debug("Adding OSGi <blueprint> XML bean: {} to DSL model", 
name);
-            model.addRegistryBean(def);
+            model.addCustomBean(def);
         }
     }
 
diff --git 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java
 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java
index a66d77cea26..e73f20b5ae0 100644
--- 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java
+++ 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/spring/SpringXmlBeansHandler.java
@@ -30,11 +30,11 @@ import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.camel.model.BeanFactoryDefinition;
 import org.w3c.dom.Document;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.main.MainConfigurationProperties;
+import org.apache.camel.model.BeanFactoryDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.spi.ResourceLoader;
 import org.apache.camel.support.ObjectHelper;
@@ -235,7 +235,7 @@ public class SpringXmlBeansHandler {
             bean.setType(def.getBeanClassName());
             bean.setName(name);
             LOG.debug("Adding Spring <beans> XML bean: {} to DSL model", name);
-            model.addRegistryBean(bean);
+            model.addCustomBean(bean);
 
             // factory bean/method
             if (def.getFactoryBeanName() != null) {
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
index c6ed2500a50..7c54470cc62 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
@@ -167,7 +167,7 @@ public class BeansDeserializer extends 
YamlDeserializerSupport implements Constr
 
         // register bean in model
         Model model = 
camelContext.getCamelContextExtension().getContextPlugin(Model.class);
-        model.addRegistryBean(def);
+        model.addCustomBean(def);
     }
 
     protected void destroyBean(String name, boolean remove) {