This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-23610-normalize-yaml-dsl-eips in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06c976a9b3134d8bb29ffb5d14b7dd1121a6abb5 Author: Claus Ibsen <[email protected]> AuthorDate: Mon May 25 21:30:11 2026 +0200 CAMEL-23610: docs - Normalize YAML DSL in EIP documentation to canonical form Migrate all YAML DSL snippets in EIP documentation from classic shorthand to canonical (explicit) form for consistency with the canonical JSON schema introduced in CAMEL-22987. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .../src/main/docs/modules/eips/pages/bean-eip.adoc | 59 ++++----- .../main/docs/modules/eips/pages/choice-eip.adoc | 71 ++++++----- .../docs/modules/eips/pages/claimCheck-eip.adoc | 133 +++++++++++---------- .../modules/eips/pages/competing-consumers.adoc | 45 ++++--- .../docs/modules/eips/pages/content-enricher.adoc | 32 ++--- .../modules/eips/pages/content-filter-eip.adoc | 34 +++--- .../docs/modules/eips/pages/convertBodyTo-eip.adoc | 15 +-- .../modules/eips/pages/convertHeaderTo-eip.adoc | 53 ++++---- .../modules/eips/pages/convertVariableTo-eip.adoc | 53 ++++---- .../modules/eips/pages/correlation-identifier.adoc | 17 +-- .../main/docs/modules/eips/pages/delay-eip.adoc | 54 +++++---- .../modules/eips/pages/durable-subscriber.adoc | 10 +- .../docs/modules/eips/pages/dynamicRouter-eip.adoc | 17 +-- .../main/docs/modules/eips/pages/enrich-eip.adoc | 69 ++++++----- .../docs/modules/eips/pages/event-message.adoc | 4 +- .../eips/pages/eventDrivenConsumer-eip.adoc | 11 +- .../src/main/docs/modules/eips/pages/from-eip.adoc | 11 +- .../main/docs/modules/eips/pages/intercept.adoc | 48 +++++--- .../main/docs/modules/eips/pages/kamelet-eip.adoc | 4 +- .../main/docs/modules/eips/pages/marshal-eip.adoc | 23 ++-- .../modules/eips/pages/message-expiration.adoc | 4 +- .../main/docs/modules/eips/pages/normalizer.adoc | 8 +- .../src/main/docs/modules/eips/pages/poll-eip.adoc | 14 ++- .../docs/modules/eips/pages/pollEnrich-eip.adoc | 4 +- .../docs/modules/eips/pages/removeHeader-eip.adoc | 15 +-- .../docs/modules/eips/pages/removeHeaders-eip.adoc | 28 +++-- .../modules/eips/pages/removeProperties-eip.adoc | 30 ++--- .../docs/modules/eips/pages/requestReply-eip.adoc | 4 +- .../docs/modules/eips/pages/return-address.adoc | 4 +- .../docs/modules/eips/pages/setHeaders-eip.adoc | 80 +++++++------ .../docs/modules/eips/pages/setVariables-eip.adoc | 80 +++++++------ .../src/main/docs/modules/eips/pages/toD-eip.adoc | 8 +- .../main/docs/modules/eips/pages/validate-eip.adoc | 4 +- 33 files changed, 589 insertions(+), 457 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/bean-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/bean-eip.adoc index 23094404c706..2d4985097695 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/bean-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/bean-eip.adoc @@ -90,17 +90,19 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - bean: - ref: myBean - method: myMethod -- from: - uri: direct:start - steps: - - bean: - ref: myBean +- route: + from: + uri: direct:start + steps: + - bean: + ref: myBean + method: myMethod +- route: + from: + uri: direct:start + steps: + - bean: + ref: myBean - beans: - name: myBean type: com.foo.ExampleBean @@ -150,22 +152,25 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:foo - steps: - - bean: - beanType: com.foo.ExampleBean - method: myMethod -- from: - uri: direct:bar - steps: - - bean: - beanType: com.foo.ExampleBean -- from: - uri: direct:cheese - steps: - - bean: - beanType: com.foo.ExampleBean +- route: + from: + uri: direct:foo + steps: + - bean: + beanType: com.foo.ExampleBean + method: myMethod +- route: + from: + uri: direct:bar + steps: + - bean: + beanType: com.foo.ExampleBean +- route: + from: + uri: direct:cheese + steps: + - bean: + beanType: com.foo.ExampleBean ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc index 5b0cf4af3d63..da6549fd459b 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc @@ -73,23 +73,28 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - choice: - when: - - simple: "${header.foo} == 'bar'" +- route: + from: + uri: direct:a + steps: + - choice: + when: + - expression: + simple: + expression: "${header.foo} == 'bar'" + steps: + - to: + uri: direct:b + - expression: + simple: + expression: "${header.foo} == 'cheese'" + steps: + - to: + uri: direct:c + otherwise: steps: - to: - uri: direct:b - - simple: "${header.foo} == 'cheese'" - steps: - - to: - uri: direct:c - otherwise: - steps: - - to: - uri: direct:d + uri: direct:d ---- ==== @@ -248,21 +253,29 @@ YAML:: + [source,yaml] ---- -- from: - uri: "direct:a" - steps: - - choice: - precondition: true - when: - - simple: "{{?foo}}" +- route: + from: + uri: direct:a + steps: + - choice: + precondition: true + when: + - expression: + simple: + expression: "{{?foo}}" + steps: + - to: + uri: direct:foo + - expression: + simple: + expression: "{{?bar}}" + steps: + - to: + uri: direct:bar + otherwise: steps: - - to: "direct:foo" - - simple: "{{?bar}}" - steps: - - to: "direct:bar" - otherwise: - steps: - - to: "direct:other" + - to: + uri: direct:other ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc index eb7615a81bef..aed98a16d639 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc @@ -274,21 +274,22 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - to: mock:a - - claimCheck: - operation: Push - - transform: - expression: - constant: Bye World - - to: - uri: mock:b - - claimCheck: - operation: Pop - - to: - uri: mock:c +- route: + from: + uri: direct:start + steps: + - to: mock:a + - claimCheck: + operation: Push + - transform: + expression: + constant: Bye World + - to: + uri: mock:b + - claimCheck: + operation: Pop + - to: + uri: mock:c ---- ==== @@ -344,33 +345,34 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - to: mock:a - - claimCheck: - operation: Set - key: foo - - transform: - expression: - constant: Bye World - - to: - uri: mock:b - - claimCheck: - operation: Get - key: foo - - to: - uri: mock:c - - transform: - expression: - constant: Hi World - - to: - uri: mock:d - - claimCheck: - operation: Get - key: foo - - to: - uri: mock:e +- route: + from: + uri: direct:start + steps: + - to: mock:a + - claimCheck: + operation: Set + key: foo + - transform: + expression: + constant: Bye World + - to: + uri: mock:b + - claimCheck: + operation: Get + key: foo + - to: + uri: mock:c + - transform: + expression: + constant: Hi World + - to: + uri: mock:d + - claimCheck: + operation: Get + key: foo + - to: + uri: mock:e ---- ==== @@ -423,28 +425,29 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - to: - uri: mock:a - - claimCheck: - operation: Push - - transform: - expression: - constant: ByeWorld - - setHeader: - name: foo - expression: - constant: 456 - - removeHeader: - name: bar - - to: - uri: mock:b - - claimCheck: - operation: Pop - filter: "header:(foo|bar)" - - to: - uri: mock:c +- route: + from: + uri: direct:start + steps: + - to: + uri: mock:a + - claimCheck: + operation: Push + - transform: + expression: + constant: ByeWorld + - setHeader: + name: foo + expression: + constant: 456 + - removeHeader: + name: bar + - to: + uri: mock:b + - claimCheck: + operation: Pop + filter: "header:(foo|bar)" + - to: + uri: mock:c ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/competing-consumers.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/competing-consumers.adoc index 14dcab6c178a..6f36a32cc2a6 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/competing-consumers.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/competing-consumers.adoc @@ -47,13 +47,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: jms:MyQueue - parameters: - concurrentConsumers: 5 - steps: - - to: - uri: bean:someBean +- route: + from: + uri: jms:MyQueue + parameters: + concurrentConsumers: 5 + steps: + - to: + uri: bean:someBean ---- ==== @@ -91,11 +92,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: "file://inbox?move=../backup-${date:now:yyyyMMdd}" - steps: - - to: - uri: bean:calculateBean +- route: + from: + uri: file://inbox + parameters: + move: "../backup-${date:now:yyyyMMdd}" + steps: + - to: + uri: bean:calculateBean ---- ==== @@ -147,13 +151,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: "file://inbox?move=../backup-${date:now:yyyyMMdd}" - steps: - - threads: - poolSize: 10 - - to: - uri: bean:calculateBean +- route: + from: + uri: file://inbox + parameters: + move: "../backup-${date:now:yyyyMMdd}" + steps: + - threads: + poolSize: 10 + - to: + uri: bean:calculateBean ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc index 7876c7c92fc0..d477352b5a04 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc @@ -51,13 +51,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: activemq:My.Queue - steps: - - to: - uri: velocity:com/acme/MyResponse.vm - - to: - uri: activemq:Another.Queue +- route: + from: + uri: activemq:My.Queue + steps: + - to: + uri: velocity:com/acme/MyResponse.vm + - to: + uri: activemq:Another.Queue ---- ==== @@ -229,14 +230,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: activemq:Input - steps: - - bean: - ref: myBeanName - method: doTransform - - to: - uri: activemq:Output +- route: + from: + uri: activemq:Input + steps: + - bean: + ref: myBeanName + method: doTransform + - to: + uri: activemq:Output ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc index e96421c99c87..1729c52e9d5a 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc @@ -127,14 +127,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: activemq:Input - steps: - - bean: - ref: myBeanName - method: doFilter - - to: - uri: activemq:Output +- route: + from: + uri: activemq:Input + steps: + - bean: + ref: myBeanName + method: doFilter + - to: + uri: activemq:Output ---- ==== @@ -173,13 +174,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: activemq:Input - steps: - - setBody: - expression: - xpath: //foo:bar - - to: - uri: activemq:Output +- route: + from: + uri: activemq:Input + steps: + - setBody: + expression: + xpath: //foo:bar + - to: + uri: activemq:Output ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertBodyTo-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertBodyTo-eip.adoc index 13f0ae43b357..f3aa01d8eae4 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertBodyTo-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertBodyTo-eip.adoc @@ -52,12 +52,13 @@ YAML:: + [source,yaml] ---- -- from: - uri: file:inbox - steps: - - convertBodyTo: - type: String - - log: - message: "The file content: ${body}" +- route: + from: + uri: file:inbox + steps: + - convertBodyTo: + type: String + - log: + message: "The file content: ${body}" ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertHeaderTo-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertHeaderTo-eip.adoc index 5bb2b1859053..095cd20223a2 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertHeaderTo-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertHeaderTo-eip.adoc @@ -52,14 +52,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertHeaderTo: - name: foo - type: String - - log: - message: "The header content: ${header.foo}" +- route: + from: + uri: seda:foo + steps: + - convertHeaderTo: + name: foo + type: String + - log: + message: "The header content: ${header.foo}" ---- ==== @@ -94,15 +95,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertHeaderTo: - name: foo - toName: bar - type: String - - log: - message: "The header content: ${header.bar}" +- route: + from: + uri: seda:foo + steps: + - convertHeaderTo: + name: foo + toName: bar + type: String + - log: + message: "The header content: ${header.bar}" ---- ==== @@ -147,13 +149,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertHeaderTo: - name: ${header.region} - type: String - - log: - message: "Order from EMEA: ${header.emea}" +- route: + from: + uri: seda:foo + steps: + - convertHeaderTo: + name: ${header.region} + type: String + - log: + message: "Order from EMEA: ${header.emea}" ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertVariableTo-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertVariableTo-eip.adoc index ee276f4e54ef..0ebe0c897af0 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/convertVariableTo-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/convertVariableTo-eip.adoc @@ -52,14 +52,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertVariableTo: - name: foo - type: String - - log: - message: "The variable content: ${variable.foo}" +- route: + from: + uri: seda:foo + steps: + - convertVariableTo: + name: foo + type: String + - log: + message: "The variable content: ${variable.foo}" ---- ==== @@ -94,15 +95,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertVariableTo: - name: foo - toName: bar - type: String - - log: - message: "The variable content: ${variable.bar}" +- route: + from: + uri: seda:foo + steps: + - convertVariableTo: + name: foo + toName: bar + type: String + - log: + message: "The variable content: ${variable.bar}" ---- ==== @@ -147,13 +149,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:foo - steps: - - convertVariableTo: - name: ${variable.region} - type: String - - log: - message: "Order from EMEA: ${variable.emea}" +- route: + from: + uri: seda:foo + steps: + - convertVariableTo: + name: ${variable.region} + type: String + - log: + message: "Order from EMEA: ${variable.emea}" ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/correlation-identifier.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/correlation-identifier.adoc index 9357f2017378..e04f6699891c 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/correlation-identifier.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/correlation-identifier.adoc @@ -73,13 +73,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - to: - uri: jms:queue:foo - pattern: InOut - - to: - uri: mock:result +- route: + from: + uri: direct:start + steps: + - to: + uri: jms:queue:foo + pattern: InOut + - to: + uri: mock:result ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/delay-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/delay-eip.adoc index 48da16a6131b..37d0c0d146f9 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/delay-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/delay-eip.adoc @@ -52,14 +52,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - delay: - expression: - constant: 1000 - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - delay: + expression: + constant: "1000" + - to: + uri: mock:result ---- ==== @@ -111,14 +112,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - delay: - expression: - simple: "${random(1000,5000)}" - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - delay: + expression: + simple: + expression: "${random(1000,5000)}" + - to: + uri: mock:result ---- ==== @@ -221,14 +224,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: activemq:queue:foo - steps: - - delay: - expression: - constant: 1000 - asyncDelayed: true - - to: - uri: activemq:aDelayedQueue +- route: + from: + uri: activemq:queue:foo + steps: + - delay: + expression: + constant: "1000" + asyncDelayed: true + - to: + uri: activemq:aDelayedQueue ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc index e5b0a3cc9466..dce49942fb58 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc @@ -65,13 +65,19 @@ YAML:: uri: activemq:topic:foo - route: from: - uri: activemq:topic:foo?clientId=1&durableSubscriptionName=bar1 + uri: activemq:topic:foo + parameters: + clientId: 1 + durableSubscriptionName: bar1 steps: - to: uri: mock:result1 - route: from: - uri: activemq:topic:foo?clientId=2&durableSubscriptionName=bar2 + uri: activemq:topic:foo + parameters: + clientId: 2 + durableSubscriptionName: bar2 steps: - to: uri: mock:result2 diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/dynamicRouter-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/dynamicRouter-eip.adoc index 3061dabaeecc..20b676b163e0 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/dynamicRouter-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/dynamicRouter-eip.adoc @@ -67,14 +67,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - dynamicRouter: - expression: - method: - beanType: com.foo.MySlipBean - method: slip +- route: + from: + uri: direct:start + steps: + - dynamicRouter: + expression: + method: + beanType: com.foo.MySlipBean + method: slip ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/enrich-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/enrich-eip.adoc index 750a9253b391..f58cc8a19bd4 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/enrich-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/enrich-eip.adoc @@ -109,15 +109,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - enrich: - expression: - constant: "http:remoteserver/foo" - aggregationStrategy: "#myStrategy" - - to: - uri: mock:result +- route: + from: + uri: direct:start + steps: + - enrich: + expression: + constant: http:remoteserver/foo + aggregationStrategy: "#myStrategy" + - to: + uri: mock:result - beans: - name: myStrategy type: com.foo.ExampleAggregationStrategy @@ -159,14 +160,15 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - enrich: - expression: - constant: "http:remoteserver/foo" - - to: - uri: mock:result +- route: + from: + uri: direct:start + steps: + - enrich: + expression: + constant: http:remoteserver/foo + - to: + uri: mock:result ---- ==== @@ -198,13 +200,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - to: - uri: http:remoteserver/foo - - to: - uri: mock:result +- route: + from: + uri: direct:start + steps: + - to: + uri: http:remoteserver/foo + - to: + uri: mock:result ---- ==== @@ -240,14 +243,16 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:start - steps: - - enrich: - expression: - simple: "http:myserver/${header.orderId}/order" - - to: - uri: mock:result +- route: + from: + uri: direct:start + steps: + - enrich: + expression: + simple: + expression: "http:myserver/${header.orderId}/order" + - to: + uri: mock:result ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/event-message.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/event-message.adoc index ea56a582006b..b5a1acba8296 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/event-message.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/event-message.adoc @@ -68,7 +68,9 @@ YAML:: ---- - route: from: - uri: mq:someQueue?exchangePattern=InOnly + uri: mq:someQueue + parameters: + exchangePattern: InOnly steps: - to: uri: activemq:queue:one-way diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc index c96532461706..03db700c8e45 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc @@ -48,10 +48,11 @@ YAML:: + [source,yaml] ---- -- from: - uri: jms:queue:foo - steps: - - bean: - beanType: com.foo.MyBean +- route: + from: + uri: jms:queue:foo + steps: + - bean: + beanType: com.foo.MyBean ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/from-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/from-eip.adoc index 08919b53387d..81fabd723102 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/from-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/from-eip.adoc @@ -54,10 +54,11 @@ YAML:: + [source,yaml] ---- -- from: - uri: file:inbox - steps: - - to: - uri: log:inbox +- route: + from: + uri: file:inbox + steps: + - to: + uri: log:inbox ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc index 1a091e47c349..9f824cb496f7 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc @@ -93,7 +93,8 @@ YAML:: ---- - intercept: steps: - - to: "log:hello" + - to: + uri: log:hello - route: from: uri: jms:queue:order @@ -159,9 +160,12 @@ YAML:: ---- - intercept: onWhen: - simple: "${body} contains 'Hello'" + expression: + simple: + expression: "${body} contains 'Hello'" steps: - - to: "log:hello" + - to: + uri: log:hello - route: from: uri: jms:queue:order @@ -273,9 +277,12 @@ YAML:: ---- - intercept: onWhen: - simple: "${body} contains 'Hello'" + expression: + simple: + expression: "${body} contains 'Hello'" steps: - - to: "log:test" + - to: + uri: log:test - stop: {} - route: from: @@ -339,7 +346,8 @@ YAML:: ---- - interceptFrom: steps: - - to: "log:incoming" + - to: + uri: log:incoming - route: from: uri: jms:queue:order @@ -398,7 +406,8 @@ YAML:: - interceptFrom: uri: "jms*" steps: - - to: "log:incoming" + - to: + uri: log:incoming - route: from: uri: jms:queue:order @@ -481,7 +490,8 @@ YAML:: - interceptSendToEndpoint: uri: "kafka*" steps: - - to: "bean:beforeKafka" + - to: + uri: bean:beforeKafka - route: from: uri: jms:queue:order @@ -539,7 +549,8 @@ YAML:: uri: "kafka*" afterUri: "bean:afterKafka" steps: - - to: "bean:beforeKafka" + - to: + uri: bean:beforeKafka - route: from: uri: jms:queue:order @@ -600,7 +611,8 @@ YAML:: uri: "kafka*" skipSendToOriginalEndpoint: true steps: - - to: "mock:kafka" + - to: + uri: mock:kafka - route: from: uri: jms:queue:order @@ -662,7 +674,9 @@ YAML:: uri: "kafka*" skipSendToOriginalEndpoint: true onWhen: - simple: "${header.biztype} == 'TEST'" + expression: + simple: + expression: "${header.biztype} == 'TEST'" steps: - log: message: "TEST message detected - is NOT send to kafka" @@ -721,7 +735,8 @@ YAML:: - interceptSendToEndpoint: uri: "jms:queue:cheese" steps: - - to: "log:smelly" + - to: + uri: log:smelly ---- ==== @@ -758,7 +773,8 @@ YAML:: - interceptFrom: uri: "file:*" steps: - - to: "log:from-file" + - to: + uri: log:from-file ---- ==== @@ -795,7 +811,8 @@ YAML:: - interceptFrom: uri: "file:order/inbox/*" steps: - - to: "log:new-file-orders" + - to: + uri: log:new-file-orders ---- ==== @@ -832,6 +849,7 @@ YAML:: - interceptFrom: uri: "jms:queue:(gold|silver)" steps: - - to: "seda:handleFast" + - to: + uri: seda:handleFast ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/kamelet-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/kamelet-eip.adoc index 73c4c327b9ba..c0d64e2b864f 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/kamelet-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/kamelet-eip.adoc @@ -78,7 +78,9 @@ YAML:: uri: direct:start steps: - to: - uri: kamelet:my-aggregate?count=5 + uri: kamelet:my-aggregate + parameters: + count: 5 - to: uri: log:info - to: diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc index 80b42151bcff..13ffaaf9b8a2 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc @@ -62,16 +62,17 @@ YAML:: + [source,yaml] ---- -- from: - uri: file:inbox/xml - steps: - - unmarshal: - jaxb: {} - - to: - uri: bean:validateOrder - - marshal: - jaxb: {} - - to: - uri: jms:queue:order +- route: + from: + uri: file:inbox/xml + steps: + - unmarshal: + jaxb: {} + - to: + uri: bean:validateOrder + - marshal: + jaxb: {} + - to: + uri: jms:queue:order ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-expiration.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-expiration.adoc index cafdb444f6c0..dc8fc75274bd 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-expiration.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-expiration.adoc @@ -49,6 +49,8 @@ YAML:: uri: direct:cheese steps: - to: - uri: jms:queue:cheese?timeToLive=5000 + uri: jms:queue:cheese + parameters: + timeToLive: 5000 ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/normalizer.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/normalizer.adoc index b88777161262..37e0749e185e 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/normalizer.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/normalizer.adoc @@ -74,13 +74,17 @@ YAML:: expression: /employee steps: - to: - uri: bean:normalizer?method=employeeToPerson + uri: bean:normalizer + parameters: + method: employeeToPerson - expression: xpath: expression: /customer steps: - to: - uri: bean:normalizer?method=customerToPerson + uri: bean:normalizer + parameters: + method: customerToPerson - to: uri: mock:result ---- diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc index 82da39128a1f..afab104570ba 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc @@ -95,7 +95,9 @@ YAML:: uri: direct:payload steps: - poll: - uri: ftp:myserver.com/myfolder?fileName=report-file.pdf + uri: ftp:myserver.com/myfolder + parameters: + fileName: report-file.pdf ---- ==== @@ -130,7 +132,9 @@ YAML:: uri: direct:payload steps: - poll: - uri: "ftp:myserver.com/myfolder?fileName=report-${header.id}.pdf" + uri: ftp:myserver.com/myfolder + parameters: + fileName: "report-${header.id}.pdf" ---- ==== @@ -184,7 +188,11 @@ YAML:: uri: direct:payload steps: - poll: - uri: aws-s3:xavier-dev?amazonS3Client=#s3client&deleteAfterRead=false&fileName=report-file.pdf + uri: aws-s3:xavier-dev + parameters: + amazonS3Client: "#s3client" + deleteAfterRead: false + fileName: report-file.pdf ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc index 0af5a7c44d44..1fe163a0e690 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc @@ -210,7 +210,9 @@ YAML:: uri: direct:report steps: - pollEnrich: - uri: aws-s3:xavier-dev?amazonS3Client=#s3client&deleteAfterRead=false&fileName=report-file.pdf + expression: + constant: + expression: "aws-s3:xavier-dev?amazonS3Client=#s3client&deleteAfterRead=false&fileName=report-file.pdf" ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc index 87349e26a119..075573695044 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc @@ -50,13 +50,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - removeHeader: - name: myHeader - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - removeHeader: + name: myHeader + - to: + uri: mock:result ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc index 2bdd4abac88a..7c9c70444fac 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc @@ -60,13 +60,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - removeHeaders: - pattern: "*" - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - removeHeaders: + pattern: "*" + - to: + uri: mock:result ---- ==== @@ -100,12 +101,13 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - removeHeaders: "Camel*" - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - removeHeaders: "Camel*" + - to: + uri: mock:result ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc index c2b71b2dd741..a863798209f1 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc @@ -60,13 +60,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - removeProperties: - pattern: "*" - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - removeProperties: + pattern: "*" + - to: + uri: mock:result ---- ==== @@ -104,13 +105,14 @@ YAML:: + [source,yaml] ---- -- from: - uri: seda:b - steps: - - removeProperties: - pattern: "Foo*" - - to: - uri: mock:result +- route: + from: + uri: seda:b + steps: + - removeProperties: + pattern: "Foo*" + - to: + uri: mock:result ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/requestReply-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/requestReply-eip.adoc index 72a5f16eb405..f5563546a58b 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/requestReply-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/requestReply-eip.adoc @@ -71,7 +71,9 @@ YAML:: ---- - route: from: - uri: jms:someQueue?exchangePattern=InOut + uri: jms:someQueue + parameters: + exchangePattern: InOut steps: - to: uri: bean:processMessage diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc index 0382791bd199..162906203f73 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc @@ -87,7 +87,9 @@ YAML:: uri: direct:foo steps: - to: - uri: jms:queue:cheese?replyTo=myReplyQueue + uri: jms:queue:cheese + parameters: + replyTo: myReplyQueue ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/setHeaders-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/setHeaders-eip.adoc index a5a0d50737b6..8602df70c368 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/setHeaders-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/setHeaders-eip.adoc @@ -58,17 +58,18 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setHeaders: - headers: - - name: myHeader - constant: test - - name: otherHeader - constant: other - - to: - uri:direct:b +- route: + from: + uri: direct:a + steps: + - setHeaders: + headers: + - name: myHeader + constant: test + - name: otherHeader + constant: other + - to: + uri: direct:b ---- ==== @@ -109,17 +110,22 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setHeaders: - headers: - - name: randomNumber - simple: "${random(1,100)}" - - name: body - simple: "${body}" - - to: - uri:direct:b +- route: + from: + uri: direct:a + steps: + - setHeaders: + headers: + - name: randomNumber + expression: + simple: + expression: "${random(1,100)}" + - name: body + expression: + simple: + expression: "${body}" + - to: + uri: direct:b ---- ==== @@ -161,19 +167,23 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setHeaders: - headers: - - name: foo - simple: "${body}" - - name: bar - simple: - expression: "${header.foo} > 10" - resultType: "boolean" - - to: - uri:direct:b +- route: + from: + uri: direct:a + steps: + - setHeaders: + headers: + - name: foo + expression: + simple: + expression: "${body}" + - name: bar + expression: + simple: + expression: "${header.foo} > 10" + resultType: boolean + - to: + uri: direct:b ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/setVariables-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/setVariables-eip.adoc index 432b6825935d..440c631caab0 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/setVariables-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/setVariables-eip.adoc @@ -58,17 +58,18 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setVariables: - variables: - - name: myVar - constant: test - - name: otherVar - constant: other - - to: - uri: direct:b +- route: + from: + uri: direct:a + steps: + - setVariables: + variables: + - name: myVar + constant: test + - name: otherVar + constant: other + - to: + uri: direct:b ---- ==== @@ -109,17 +110,22 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setVariables: - variables: - - name: randomNumber - simple: "${random(1,100)}" - - name: body - simple: "${body}" - - to: - uri:direct:b +- route: + from: + uri: direct:a + steps: + - setVariables: + variables: + - name: randomNumber + expression: + simple: + expression: "${random(1,100)}" + - name: body + expression: + simple: + expression: "${body}" + - to: + uri: direct:b ---- ==== @@ -161,19 +167,23 @@ YAML:: + [source,yaml] ---- -- from: - uri: direct:a - steps: - - setVariables: - variables: - - name: foo - simple: "${body}" - - name: bar - simple: - expression: "${variable.foo} > 10" - resultType: "boolean" - - to: - uri:direct:b +- route: + from: + uri: direct:a + steps: + - setVariables: + variables: + - name: foo + expression: + simple: + expression: "${body}" + - name: bar + expression: + simple: + expression: "${variable.foo} > 10" + resultType: "boolean" + - to: + uri: direct:b ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc index 27800bf01008..5844b9ae235c 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc @@ -210,7 +210,9 @@ YAML:: uri: direct:login steps: - toD: - uri: "http:myloginserver:8080/login?userid=${header.userName}" + uri: http:myloginserver:8080/login + parameters: + userid: "${header.userName}" cacheSize: 10 ---- ==== @@ -349,7 +351,9 @@ YAML:: uri: direct:login steps: - toD: - uri: "http:myloginserver:8080/login?userid=${header.userName}" + uri: http:myloginserver:8080/login + parameters: + userid: "${header.userName}" ---- ==== diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc index 893cc6d3525b..835bd7ed5aee 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc @@ -68,7 +68,9 @@ YAML:: simple: expression: "${body} regex '^\\w{10}\\,\\d{2}\\,\\w{24}$'" - to: - uri: bean:myServiceBean?method=processLine + uri: bean:myServiceBean + parameters: + method: processLine ---- ====
