You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/05/13 11:08:25 UTC
[camel] branch main updated (1a48a38 -> 609339f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1a48a38 CAMEL-16607: route template / kamelets. Allow to use #type and #class for local beans
new 2acd6c4 CAMEL-16607: route template / kamelets. Allow to use #type and #class for local beans
new 609339f CAMEL-16607: route template / kamelets. Allow to use #type and #class for local beans
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java | 2 +-
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 4 ++--
.../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-16607: route template / kamelets. Allow to use
#type and #class for local beans
Posted by da...@apache.org.
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
commit 2acd6c4a0705613b054a7b8e684d8df19ba3b65e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 13 13:06:09 2021 +0200
CAMEL-16607: route template / kamelets. Allow to use #type and #class for local beans
---
.../main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
index 79876d3..10b76b3 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
@@ -45,7 +45,7 @@ public class RouteTemplateBeanDefinition {
private String type;
@XmlElement(name = "property")
private List<PropertyDefinition> properties;
- @XmlElement
+ @XmlElement(name = "script")
private RouteTemplateScriptDefinition script;
// special for java-dsl to allow using lambda style
@XmlTransient
[camel] 02/02: CAMEL-16607: route template / kamelets. Allow to use
#type and #class for local beans
Posted by da...@apache.org.
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
commit 609339faa35c43a1838c311b9f95fe729c0c3a63
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 13 13:07:42 2021 +0200
CAMEL-16607: route template / kamelets. Allow to use #type and #class for local beans
---
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 4 ++--
.../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index c1968d0..8a1400f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -11742,7 +11742,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
properties = {
@YamlProperty(name = "name", type = "string", required = true),
@YamlProperty(name = "property", type = "array:org.apache.camel.model.PropertyDefinition"),
- @YamlProperty(name = "template-script", type = "object:org.apache.camel.model.RouteTemplateScriptDefinition"),
+ @YamlProperty(name = "script", type = "object:org.apache.camel.model.RouteTemplateScriptDefinition"),
@YamlProperty(name = "type", type = "string", required = true)
}
)
@@ -11775,7 +11775,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setProperties(val);
break;
}
- case "template-script": {
+ case "script": {
org.apache.camel.model.RouteTemplateScriptDefinition val = asType(node, org.apache.camel.model.RouteTemplateScriptDefinition.class);
target.setScript(val);
break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index d68e8d6..017ae96 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -2074,7 +2074,7 @@
"$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
}
},
- "template-script" : {
+ "script" : {
"$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition"
},
"type" : {