You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ig...@apache.org on 2023/05/26 10:05:17 UTC
[camel] branch camel-3.x updated: CAMEL-19392: Correct template bean definition schema (#10214)
This is an automated email from the ASF dual-hosted git repository.
igarashitm pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 3e4f1307616 CAMEL-19392: Correct template bean definition schema (#10214)
3e4f1307616 is described below
commit 3e4f1307616c153b7452a2fc412e18bc0007745a
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Fri May 26 06:05:09 2023 -0400
CAMEL-19392: Correct template bean definition schema (#10214)
---
.../deserializers/RouteTemplateDefinitionDeserializer.java | 2 +-
.../TemplatedRouteDefinitionDeserializer.java | 2 +-
.../src/generated/resources/schema/camel-yaml-dsl.json | 4 ++--
.../src/generated/resources/schema/camelYamlDsl.json | 4 ++--
.../org/apache/camel/dsl/yaml/KameletLoaderTest.groovy | 14 ++++++++++++--
5 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java
index f68aaae710c..dc56ef08c35 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java
@@ -45,7 +45,7 @@ import org.snakeyaml.engine.v2.nodes.Node;
@YamlProperty(name = "parameters",
type = "array:org.apache.camel.model.RouteTemplateParameterDefinition"),
@YamlProperty(name = "beans",
- type = "array:org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition")
+ type = "array:org.apache.camel.model.RouteTemplateBeanDefinition")
})
public class RouteTemplateDefinitionDeserializer extends YamlDeserializerBase<RouteTemplateDefinition> {
public RouteTemplateDefinitionDeserializer() {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
index fd9f8747ffe..6eadc6ae75b 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
@@ -43,7 +43,7 @@ import org.snakeyaml.engine.v2.nodes.Node;
@YamlProperty(name = "parameters",
type = "array:org.apache.camel.model.TemplatedRouteParameterDefinition"),
@YamlProperty(name = "beans",
- type = "array:org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition")
+ type = "array:org.apache.camel.model.TemplatedRouteBeanDefinition")
})
public class TemplatedRouteDefinitionDeserializer extends YamlDeserializerBase<TemplatedRouteDefinition> {
public TemplatedRouteDefinitionDeserializer() {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index cabedcb090a..aae0998745d 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -2624,7 +2624,7 @@
"beans" : {
"type" : "array",
"items" : {
- "$ref" : "#/items/definitions/org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition"
+ "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateBeanDefinition"
}
},
"from" : {
@@ -3093,7 +3093,7 @@
"beans" : {
"type" : "array",
"items" : {
- "$ref" : "#/items/definitions/org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition"
+ "$ref" : "#/items/definitions/org.apache.camel.model.TemplatedRouteBeanDefinition"
}
},
"parameters" : {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index b5a7e9f1368..c60ab670796 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -2528,7 +2528,7 @@
"beans" : {
"type" : "array",
"items" : {
- "$ref" : "#/items/definitions/org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition"
+ "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateBeanDefinition"
}
},
"from" : {
@@ -2997,7 +2997,7 @@
"beans" : {
"type" : "array",
"items" : {
- "$ref" : "#/items/definitions/org.apache.camel.dsl.yaml.deserializers.NamedBeanDefinition"
+ "$ref" : "#/items/definitions/org.apache.camel.model.TemplatedRouteBeanDefinition"
}
},
"parameters" : {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
index bc905504c49..66b1daf02e5 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
@@ -63,6 +63,16 @@ class KameletLoaderTest extends YamlTestSupport {
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
template:
+ beans:
+ - name: kameletBean
+ type: org.apache.camel.dsl.yaml.KameletBean
+ property:
+ - key: kbProp
+ value: kbValue
+ - name: kameletBean2
+ type: org.apache.camel.dsl.yaml.KameletBean
+ properties:
+ kbProp2: kbValue2
from:
uri: "kamelet:source"
steps:
@@ -93,11 +103,11 @@ class KameletLoaderTest extends YamlTestSupport {
with(route) {
input.endpointUri == 'kamelet:source'
- input.lineNumber == 35
+ input.lineNumber == 45
outputs.size() == 1
with (outputs[0], ToDefinition) {
endpointUri ==~ /aws2-s3:.*/
- lineNumber == 38
+ lineNumber == 48
}
}
}