This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.10.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.10.x by this push:
new 5abddbc3a50 CAMEL-21980: camel-jbang - Transform route dump YAML in
tooling friendly format
5abddbc3a50 is described below
commit 5abddbc3a507975602153904d4ef4d71280c2903
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 16 13:58:21 2025 +0200
CAMEL-21980: camel-jbang - Transform route dump YAML in tooling friendly
format
---
.../org/apache/camel/util/split-choice.yaml | 15 ++++---
.../resources/org/apache/camel/util/transform.yaml | 5 ++-
.../org/apache/camel/util/transform2.yaml | 5 ++-
.../org/apache/camel/util/transform3.yaml | 15 ++++---
.../camel/util/uri-as-parameters-no-ids.yaml | 5 ++-
.../org/apache/camel/util/uri-as-parameters.yaml | 5 ++-
.../java/org/apache/camel/yaml/io/EipNode.java | 4 +-
.../apache/camel/yaml/out/XPathNamespacesTest.java | 49 ++++++++++++----------
core/camel-yaml-io/src/test/resources/route0.yaml | 5 ++-
core/camel-yaml-io/src/test/resources/route0b.yaml | 5 ++-
core/camel-yaml-io/src/test/resources/route10.yaml | 5 ++-
core/camel-yaml-io/src/test/resources/route11.yaml | 10 +++--
core/camel-yaml-io/src/test/resources/route2.yaml | 7 ++--
core/camel-yaml-io/src/test/resources/route4.yaml | 11 ++---
core/camel-yaml-io/src/test/resources/route5.yaml | 5 ++-
core/camel-yaml-io/src/test/resources/route8.yaml | 5 ++-
core/camel-yaml-io/src/test/resources/route8b.yaml | 5 ++-
17 files changed, 93 insertions(+), 68 deletions(-)
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
index 23155fea850..986f5351301 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
@@ -23,8 +23,9 @@
steps:
- split:
id: split
- simple:
- expression: "${body}"
+ expression:
+ simple:
+ expression: "${body}"
steps:
- to:
id: myMock
@@ -33,15 +34,17 @@
id: choice
when:
- id: when
- header:
- expression: foo
+ expression:
+ header:
+ expression: foo
steps:
- to:
id: to
uri: mock:foo
- id: when
- header:
- expression: bar
+ expression:
+ header:
+ expression: bar
steps:
- to:
id: to
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
index 9d598c76065..d543febb1a4 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
@@ -23,8 +23,9 @@
steps:
- transform:
id: transform
- simple:
- expression: "Hello ${body}"
+ expression:
+ simple:
+ expression: "Hello ${body}"
- to:
id: myMock
uri: mock:result?failFast=false&retainFirst=5&browseLimit=123
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/transform2.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/transform2.yaml
index 0d04a017375..95fe18c8731 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/transform2.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/transform2.yaml
@@ -26,8 +26,9 @@
steps:
- transform:
id: transform
- simple:
- expression: "Hello ${body}"
+ expression:
+ simple:
+ expression: "Hello ${body}"
- to:
id: myMock
uri: mock
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/transform3.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/transform3.yaml
index 369b5195be5..1d6a02e6ee8 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/transform3.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/transform3.yaml
@@ -23,21 +23,24 @@
steps:
- setBody:
id: setBody
- simple:
- expression: "Hello Camel from ${routeId}"
+ expression:
+ simple:
+ expression: "Hello Camel from ${routeId}"
- choice:
id: choice
when:
- id: when
- simple:
- expression: "${header.foo} == 'bar'"
+ expression:
+ simple:
+ expression: "${header.foo} == 'bar'"
steps:
- to:
id: to
uri: direct:bar
- id: when
- simple:
- expression: "${header.foo} == 'cake'"
+ expression:
+ simple:
+ expression: "${header.foo} == 'cake'"
steps:
- to:
id: to
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters-no-ids.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters-no-ids.yaml
index f9da0fca7f7..e115f44bc59 100644
---
a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters-no-ids.yaml
+++
b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters-no-ids.yaml
@@ -25,8 +25,9 @@
multipleConsumers: true
steps:
- transform:
- simple:
- expression: "Hello ${body}"
+ expression:
+ simple:
+ expression: "Hello ${body}"
- to:
id: myMock
uri: mock
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
index 1faf02c2302..9d12b8f851d 100644
---
a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
+++
b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
@@ -27,8 +27,9 @@
steps:
- transform:
id: transform
- simple:
- expression: "Hello ${body}"
+ expression:
+ simple:
+ expression: "Hello ${body}"
- to:
id: myMock
uri: mock
diff --git
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/EipNode.java
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/EipNode.java
index d2906717809..2ba31f11367 100644
--- a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/EipNode.java
+++ b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/EipNode.java
@@ -151,7 +151,9 @@ class EipNode {
wrap.put(language, r);
answer.put(key, wrap);
} else {
- answer.put(key, r);
+ JsonObject wrap = new JsonObject();
+ wrap.put(language, r);
+ answer.put("expression", wrap);
}
}
}
diff --git
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java
index a5ad9e372ff..6f71d159b24 100644
---
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java
+++
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java
@@ -88,31 +88,34 @@ class XPathNamespacesTest {
steps:
- setProperty:
name: child-expression-namespace-from-routes
- xpath:
- resultType: java.lang.String
- saxon: "true"
- expression: /routes-ns-def:parent/routes-ns-def:child
- namespace:
- routes-ns-def: http://www.example.com/schema
- route-ns-def: http://www.example.com/schema
+ expression:
+ xpath:
+ resultType: java.lang.String
+ saxon: "true"
+ expression:
/routes-ns-def:parent/routes-ns-def:child
+ namespace:
+ routes-ns-def: http://www.example.com/schema
+ route-ns-def: http://www.example.com/schema
- setProperty:
name: child-expression-namespace-from-route
- xpath:
- resultType: java.lang.String
- saxon: "true"
- expression: /route-ns-def:parent/route-ns-def:child
- namespace:
- routes-ns-def: http://www.example.com/schema
- route-ns-def: http://www.example.com/schema
+ expression:
+ xpath:
+ resultType: java.lang.String
+ saxon: "true"
+ expression: /route-ns-def:parent/route-ns-def:child
+ namespace:
+ routes-ns-def: http://www.example.com/schema
+ route-ns-def: http://www.example.com/schema
- setProperty:
name: child-expression-namespace-from-xpath
- xpath:
- resultType: java.lang.String
- saxon: "true"
- expression:
/expression-ns-def:parent/expression-ns-def:child
- namespace:
- routes-ns-def: http://www.example.com/schema
- route-ns-def: http://www.example.com/schema
- expression-ns-def: http://www.example.com/schema
- """;
+ expression:
+ xpath:
+ resultType: java.lang.String
+ saxon: "true"
+ expression:
/expression-ns-def:parent/expression-ns-def:child
+ namespace:
+ routes-ns-def: http://www.example.com/schema
+ route-ns-def: http://www.example.com/schema
+ expression-ns-def: http://www.example.com/schema
+ """;
}
diff --git a/core/camel-yaml-io/src/test/resources/route0.yaml
b/core/camel-yaml-io/src/test/resources/route0.yaml
index 1c526b23782..eec0250a427 100644
--- a/core/camel-yaml-io/src/test/resources/route0.yaml
+++ b/core/camel-yaml-io/src/test/resources/route0.yaml
@@ -24,7 +24,8 @@
includeMetadata: true
steps:
- setBody:
- constant:
- expression: Hello from yaml
+ expression:
+ constant:
+ expression: Hello from yaml
- log:
message: "${body}"
\ No newline at end of file
diff --git a/core/camel-yaml-io/src/test/resources/route0b.yaml
b/core/camel-yaml-io/src/test/resources/route0b.yaml
index 71c991b7457..d1ccc0bcf82 100644
--- a/core/camel-yaml-io/src/test/resources/route0b.yaml
+++ b/core/camel-yaml-io/src/test/resources/route0b.yaml
@@ -21,7 +21,8 @@
uri: timer:yaml?period=1234&includeMetadata=true
steps:
- setBody:
- constant:
- expression: Hello from yaml
+ expression:
+ constant:
+ expression: Hello from yaml
- log:
message: "${body}"
\ No newline at end of file
diff --git a/core/camel-yaml-io/src/test/resources/route10.yaml
b/core/camel-yaml-io/src/test/resources/route10.yaml
index 93ab1aee290..7876c668b6e 100644
--- a/core/camel-yaml-io/src/test/resources/route10.yaml
+++ b/core/camel-yaml-io/src/test/resources/route10.yaml
@@ -24,5 +24,6 @@
uri: direct:start
steps:
- setBody:
- simple:
- expression: "${body}${body}"
\ No newline at end of file
+ expression:
+ simple:
+ expression: "${body}${body}"
\ No newline at end of file
diff --git a/core/camel-yaml-io/src/test/resources/route11.yaml
b/core/camel-yaml-io/src/test/resources/route11.yaml
index 758fb425065..63f6956ab18 100644
--- a/core/camel-yaml-io/src/test/resources/route11.yaml
+++ b/core/camel-yaml-io/src/test/resources/route11.yaml
@@ -24,11 +24,13 @@
includeMetadata: true
steps:
- setBody:
- constant:
- expression: Hello from yaml
+ expression:
+ constant:
+ expression: Hello from yaml
- log:
message: "${body}"
- setHeader:
name: Exchange.HTTP_RESPONSE_CODE
- constant:
- expression: 404
\ No newline at end of file
+ expression:
+ constant:
+ expression: 404
\ No newline at end of file
diff --git a/core/camel-yaml-io/src/test/resources/route2.yaml
b/core/camel-yaml-io/src/test/resources/route2.yaml
index f8df2f22ba3..31e406955f5 100644
--- a/core/camel-yaml-io/src/test/resources/route2.yaml
+++ b/core/camel-yaml-io/src/test/resources/route2.yaml
@@ -22,9 +22,10 @@
steps:
- split:
streaming: "true"
- simple:
- resultType: int.class
- expression: "${body}"
+ expression:
+ simple:
+ resultType: int.class
+ expression: "${body}"
steps:
- to:
uri: kafka:line
diff --git a/core/camel-yaml-io/src/test/resources/route4.yaml
b/core/camel-yaml-io/src/test/resources/route4.yaml
index bad39879ab5..2b28ccd7f4f 100644
--- a/core/camel-yaml-io/src/test/resources/route4.yaml
+++ b/core/camel-yaml-io/src/test/resources/route4.yaml
@@ -21,10 +21,11 @@
uri: direct:start
steps:
- setBody:
- constant:
- expression: |-
- {
- key: '123'
- }
+ expression:
+ constant:
+ expression: |-
+ {
+ key: '123'
+ }
- to:
uri: mock:result
diff --git a/core/camel-yaml-io/src/test/resources/route5.yaml
b/core/camel-yaml-io/src/test/resources/route5.yaml
index 659907a4e3c..254a7403b14 100644
--- a/core/camel-yaml-io/src/test/resources/route5.yaml
+++ b/core/camel-yaml-io/src/test/resources/route5.yaml
@@ -24,7 +24,8 @@
logName: myLogger
loggingLevel: WARN
- setBody:
- simple:
- expression: "${body}"
+ expression:
+ simple:
+ expression: "${body}"
- to:
uri: mock:result
diff --git a/core/camel-yaml-io/src/test/resources/route8.yaml
b/core/camel-yaml-io/src/test/resources/route8.yaml
index f154f3d226b..bc3ab08462e 100644
--- a/core/camel-yaml-io/src/test/resources/route8.yaml
+++ b/core/camel-yaml-io/src/test/resources/route8.yaml
@@ -23,8 +23,9 @@
period: 1234
steps:
- setBody:
- constant:
- expression: Hello from yaml
+ expression:
+ constant:
+ expression: Hello from yaml
- log:
message: "${body}"
- route:
diff --git a/core/camel-yaml-io/src/test/resources/route8b.yaml
b/core/camel-yaml-io/src/test/resources/route8b.yaml
index 17ea378ea49..3852dfe38f4 100644
--- a/core/camel-yaml-io/src/test/resources/route8b.yaml
+++ b/core/camel-yaml-io/src/test/resources/route8b.yaml
@@ -21,8 +21,9 @@
uri: timer:yaml?period=1234
steps:
- setBody:
- constant:
- expression: Hello from yaml
+ expression:
+ constant:
+ expression: Hello from yaml
- log:
message: "${body}"
- route:
