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 2022/01/24 08:20:53 UTC
[camel] branch main updated: CAMEL-17541: camel-yaml-dsl - Use toD as the correct EIP name
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 471a382 CAMEL-17541: camel-yaml-dsl - Use toD as the correct EIP name
471a382 is described below
commit 471a3825fa8545682d01e06369e13fe10c4a460b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 24 09:20:08 2022 +0100
CAMEL-17541: camel-yaml-dsl - Use toD as the correct EIP name
---
.../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 2 ++
.../dsl/yaml/deserializers/ModelDeserializers.java | 3 +--
.../deserializers/ModelDeserializersResolver.java | 1 -
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 9 ---------
.../src/generated/resources/camel-yaml-dsl.json | 3 ---
.../src/generated/resources/camelYamlDsl.json | 3 ---
.../org/apache/camel/dsl/yaml/ToDynamicTest.groovy | 20 ++++++++++----------
7 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index 7d38e60..2e46685 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -156,6 +156,8 @@ This should correctly be done with `steps` as child of `from`:
- log: "message"
----
+The `tod` EIP name has been removed, the correct names to use is `toD`.
+
=== camel-jbang
The JBang app that was previously named `CamelJBang` is now named `camel`. It is still possible to use the older name by installing it using `CamelJBang@apache/camel` but this approach is deprecated and should not be used in the future.
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 0983794..54e9d52 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
@@ -16010,8 +16010,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
"to-d",
- "toD",
- "tod"
+ "toD"
},
properties = {
@YamlProperty(name = "allow-optimised-components", type = "boolean"),
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index f9b8341..a119dc4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -472,7 +472,6 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.ToDefinition": return new ModelDeserializers.ToDefinitionDeserializer();
case "to-d": return new ModelDeserializers.ToDynamicDefinitionDeserializer();
case "toD": return new ModelDeserializers.ToDynamicDefinitionDeserializer();
- case "tod": return new ModelDeserializers.ToDynamicDefinitionDeserializer();
case "org.apache.camel.model.ToDynamicDefinition": return new ModelDeserializers.ToDynamicDefinitionDeserializer();
case "tokenize": return new ModelDeserializers.TokenizerExpressionDeserializer();
case "org.apache.camel.model.language.TokenizerExpression": return new ModelDeserializers.TokenizerExpressionDeserializer();
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index 7793eaf..e86f147 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -673,15 +673,6 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
TypeSpecHolder.put(attributes, "node", value);
});
- //
- // Workaround for:
- // https://issues.apache.org/jira/browse/CAMEL-16490
- //
- if (info.name().equals(TO_DYNAMIC_DEFINITION_CLASS)) {
- yamlTypeAnnotation.addMember("nodes", "$S", "tod");
- TypeSpecHolder.put(attributes, "node", "tod");
- }
-
properties.stream().sorted(Comparator.comparing(a -> a.members.get("name").toString())).forEach(spec -> {
yamlTypeAnnotation.addMember("properties", "$L", spec);
});
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 952aa4e..b140423 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
@@ -254,9 +254,6 @@
"toD" : {
"$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition"
},
- "tod" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition"
- },
"transacted" : {
"$ref" : "#/items/definitions/org.apache.camel.model.TransactedDefinition"
},
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index ee97153..0e0be74 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -173,9 +173,6 @@
"toD" : {
"$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition"
},
- "tod" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition"
- },
"transacted" : {
"$ref" : "#/items/definitions/org.apache.camel.model.TransactedDefinition"
},
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ToDynamicTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ToDynamicTest.groovy
index 253b1c1..0fd7b92 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ToDynamicTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ToDynamicTest.groovy
@@ -35,20 +35,20 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - to-d: "direct:start"
+ - toD: "direct:start"
'''),
asResource('uri', '''
- from:
uri: "direct:start"
steps:
- - to-d:
+ - toD:
uri: "direct:start"
'''),
asResource('properties', '''
- from:
uri: "direct:start"
steps:
- - to-d:
+ - toD:
uri: "direct"
parameters:
name: "start"
@@ -57,7 +57,7 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - to-d:
+ - toD:
direct:
name: "start"
'''),
@@ -65,7 +65,7 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - to-d:
+ - toD:
parameters:
name: "start"
uri: "direct"
@@ -86,20 +86,20 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - tod: "direct:start"
+ - toD: "direct:start"
'''),
asResource('uri', '''
- from:
uri: "direct:start"
steps:
- - tod:
+ - toD:
uri: "direct:start"
'''),
asResource('properties', '''
- from:
uri: "direct:start"
steps:
- - tod:
+ - toD:
uri: "direct"
parameters:
name: "start"
@@ -108,7 +108,7 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - tod:
+ - toD:
direct:
name: "start"
'''),
@@ -116,7 +116,7 @@ class ToDynamicTest extends YamlTestSupport {
- from:
uri: "direct:start"
steps:
- - tod:
+ - toD:
parameters:
name: "start"
uri: "direct"