You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/01 11:23:00 UTC
[camel] branch master updated (c6b6e1a -> 995062a)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c6b6e1a CAMEL-16274 - Camel-google-storage: serviceAccountKey should be supported as file, classpath, remote etc.
new 4d9daa5 Upgrade Jooq to version 3.14.8
new 23fe913 Sync deps
new 995062a Added YAML DSL to catalog
The 3 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:
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/03: Upgrade Jooq to version 3.14.8
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4d9daa5e2b05b5f5cf5ac99bc2d5e08e5b5ada1b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 1 12:18:00 2021 +0100
Upgrade Jooq to version 3.14.8
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index da87e07..bc8cc35 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -329,7 +329,7 @@
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jool-version>0.9.12</jool-version>
- <jooq-version>3.14.7</jooq-version>
+ <jooq-version>3.14.8</jooq-version>
<joor-version>0.9.13</joor-version>
<johnzon-version>1.2.10</johnzon-version>
<jose4j-version>0.6.4</jose4j-version>
[camel] 03/03: Added YAML DSL to catalog
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 995062aaa46b1408703fcbe1161501cabf1d47d2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 1 12:22:03 2021 +0100
Added YAML DSL to catalog
---
.../org/apache/camel/catalog/docs/yaml-dsl.adoc | 216 +++++++++++++++++++++
1 file changed, 216 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc
new file mode 100644
index 0000000..080603d
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc
@@ -0,0 +1,216 @@
+[[yaml-dsl-other]]
+= Yaml Dsl Component
+:docTitle: Yaml Dsl
+:artifactId: camel-yaml-dsl
+:description: Camel DSL with YAML
+:since: 3.9
+:supportLevel: Preview
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/yaml-dsl.adoc[opts=optional]
+//Manually maintained attributes
+:group: DSL
+
+*Since Camel {since}*
+
+== Defining a route
+
+A route is collection of elements defined as follows:
+
+[source,yaml]
+----
+- from: #<1>
+ uri: "direct:start"
+ steps: #<2>
+ - filter:
+ expression:
+ simple: "${in.header.continue} == true"
+ steps: #<2>
+ - to:
+ uri: "log:filtered"
+ - to:
+ uri: "log:original"
+----
+<1> route entry point, by default `from` and `rest` are supported
+<2> processing steps
+
+[NOTE]
+====
+Each step is represented by a YAML map that has a single entry where the field name is the EIP name
+====
+
+As general rule each step provide all the parameters the related definition declares but there are some minor differences/enhancements:
+
+- *Output Aware Steps*
++
+Some steps such as `filter` and `split` have their own pipeline when an exchange matches the filter expression or for the items generated by the split expression, such pipeline can be defined by the `steps` field:
++
+[source,yaml]
+----
+filter:
+ expression:
+ simple: "${in.header.continue} == true"
+ steps:
+ - to:
+ uri: "log:filtered"
+----
++
+
+- *Expression Aware Steps*
++
+Some EIP such as `filter` and `split` supports the definition of an expression through the `expression` field:
++
+[source,yaml]
+.Explicit Expression field
+----
+filter:
+ expression:
+ simple: "${in.header.continue} == true"
+----
++
+To make the DSL less verbose, the `expression` field can be omitted:
++
+[source,yaml]
+.Implicit Expression field
+----
+filter:
+ simple: "${in.header.continue} == true"
+----
++
+In general expression can be defined inline like in the examples above but in case you need provide more information, you can 'unroll' the expression definition and configure any single parameter the expression defines.
++
+[source,yaml]
+.Full Expression definition
+----
+filter:
+ tokenize:
+ token: "<"
+ end-token: ">"
+----
+
+- *Data Format Aware Steps*
++
+Some EIP such as `set-body` and `marshal` supports the definition of data formats through the `data-format` field:
++
+[source,yaml]
+.Explicit Data Format field
+----
+set-body:
+ data-format:
+ json:
+ library: Gson
+----
++
+To make the DSL less verbose, the `data-format` field can be omitted:
++
+[source,yaml]
+.Implicit Data Format field
+----
+set-body:
+ json:
+ library: Gson
+----
++
+[NOTE]
+====
+In case you want to use the data-format's default settings, you need to place an empty block as data format parameters, like `json: {}`
+====
+
+== Defining endpoints
+
+To define an endpoint with the YAML dsl you have three options:
+
+. Using a classic Camel URI:
++
+[source,yaml]
+----
+- from:
+ uri: "timer:tick?period=1s"
+ steps:
+ - to:
+ uri: "telegram:bots?authorizationToken=XXX"
+----
+. Using URI and parameters:
++
+[source,yaml]
+----
+- from:
+ uri: "timer://tick"
+ parameters:
+ period: "1s"
+ steps:
+ - to:
+ uri: "telegram:bots"
+ parameters:
+ authorizationToken: "XXX"
+----
+. Using the YAML implementation of the xref:latest@manual::Endpoint-dsl.adoc[Endpoint DSL]:
++
+[source,yaml]
+----
+- from:
+ timer:
+ name: "tick"
+ period: "1s"
+ steps:
+ - telegram:
+ type: "bots"
+ authorizationToken: "XXX"
+----
+
+[WARNING]
+====
+Support for the Endpoint DSL with YAML is experimental and subject to changes.
+====
+[NOTE]
+====
+Support for Endpoint DSL auto completion https://github.com/apache/camel-k-runtime/issues/485[is not yet available].
+====
+
+== Defining beans
+
+In addition to the general support for creating beans provided by xref:latest@components:others:main.adoc#_specifying_custom_beans[Camel Main], the YAML DSL provide a convenient syntax to define and configure them:
+
+[source,yaml]
+----
+- beans:
+ - name: beanFromMap # <1>
+ type: com.acme.MyBean # <2>
+ properties: # <3>
+ foo: bar
+----
+<1> the name of the bean which will be used to bound the instance to the Camel Registry
+<2> the full qualified class name of the bean
+<3> the properties of the bean to be set
+
+The properties of the bean can be defined using either a map or properties style as shown in the example below:
+
+[source,yaml]
+----
+- beans:
+ # map style
+ - name: beanFromMap
+ type: com.acme.MyBean
+ properties:
+ field1: 'f1'
+ field2: 'f2'
+ nested:
+ field1: 'nf1'
+ field2: 'nf2'
+ # properties style
+ - name: beanFromProps
+ type: com.acme.MyBean
+ properties:
+ field1: 'f1_p'
+ field2: 'f2_p'
+ nested.field1: 'nf1_p'
+ nested.field2: 'nf2_p'
+----
+
+[NOTE]
+====
+The `beans` elements can only be used as root element
+====
+
+== Examples
+
+You can find a set of examples using `camel-yaml-dsl` in https://github.com/apache/camel-examples[Camel Examples]
+which demonstrate creating Camel Routes with YAML.
[camel] 02/03: Sync deps
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 23fe913727dbd65c9b08752b22a72aaac3b8be56
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 1 12:19:29 2021 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/catalog/docs/yaml-dsl.adoc | 216 ---------------------
2 files changed, 1 insertion(+), 217 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b2e9b6f..1703262 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -345,7 +345,7 @@
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jool-version>0.9.12</jool-version>
- <jooq-version>3.14.7</jooq-version>
+ <jooq-version>3.14.8</jooq-version>
<joor-version>0.9.13</joor-version>
<jose4j-version>0.6.4</jose4j-version>
<jota-version>1.0.0-beta7</jota-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc
deleted file mode 100644
index 080603d..0000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/yaml-dsl.adoc
+++ /dev/null
@@ -1,216 +0,0 @@
-[[yaml-dsl-other]]
-= Yaml Dsl Component
-:docTitle: Yaml Dsl
-:artifactId: camel-yaml-dsl
-:description: Camel DSL with YAML
-:since: 3.9
-:supportLevel: Preview
-include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/yaml-dsl.adoc[opts=optional]
-//Manually maintained attributes
-:group: DSL
-
-*Since Camel {since}*
-
-== Defining a route
-
-A route is collection of elements defined as follows:
-
-[source,yaml]
-----
-- from: #<1>
- uri: "direct:start"
- steps: #<2>
- - filter:
- expression:
- simple: "${in.header.continue} == true"
- steps: #<2>
- - to:
- uri: "log:filtered"
- - to:
- uri: "log:original"
-----
-<1> route entry point, by default `from` and `rest` are supported
-<2> processing steps
-
-[NOTE]
-====
-Each step is represented by a YAML map that has a single entry where the field name is the EIP name
-====
-
-As general rule each step provide all the parameters the related definition declares but there are some minor differences/enhancements:
-
-- *Output Aware Steps*
-+
-Some steps such as `filter` and `split` have their own pipeline when an exchange matches the filter expression or for the items generated by the split expression, such pipeline can be defined by the `steps` field:
-+
-[source,yaml]
-----
-filter:
- expression:
- simple: "${in.header.continue} == true"
- steps:
- - to:
- uri: "log:filtered"
-----
-+
-
-- *Expression Aware Steps*
-+
-Some EIP such as `filter` and `split` supports the definition of an expression through the `expression` field:
-+
-[source,yaml]
-.Explicit Expression field
-----
-filter:
- expression:
- simple: "${in.header.continue} == true"
-----
-+
-To make the DSL less verbose, the `expression` field can be omitted:
-+
-[source,yaml]
-.Implicit Expression field
-----
-filter:
- simple: "${in.header.continue} == true"
-----
-+
-In general expression can be defined inline like in the examples above but in case you need provide more information, you can 'unroll' the expression definition and configure any single parameter the expression defines.
-+
-[source,yaml]
-.Full Expression definition
-----
-filter:
- tokenize:
- token: "<"
- end-token: ">"
-----
-
-- *Data Format Aware Steps*
-+
-Some EIP such as `set-body` and `marshal` supports the definition of data formats through the `data-format` field:
-+
-[source,yaml]
-.Explicit Data Format field
-----
-set-body:
- data-format:
- json:
- library: Gson
-----
-+
-To make the DSL less verbose, the `data-format` field can be omitted:
-+
-[source,yaml]
-.Implicit Data Format field
-----
-set-body:
- json:
- library: Gson
-----
-+
-[NOTE]
-====
-In case you want to use the data-format's default settings, you need to place an empty block as data format parameters, like `json: {}`
-====
-
-== Defining endpoints
-
-To define an endpoint with the YAML dsl you have three options:
-
-. Using a classic Camel URI:
-+
-[source,yaml]
-----
-- from:
- uri: "timer:tick?period=1s"
- steps:
- - to:
- uri: "telegram:bots?authorizationToken=XXX"
-----
-. Using URI and parameters:
-+
-[source,yaml]
-----
-- from:
- uri: "timer://tick"
- parameters:
- period: "1s"
- steps:
- - to:
- uri: "telegram:bots"
- parameters:
- authorizationToken: "XXX"
-----
-. Using the YAML implementation of the xref:latest@manual::Endpoint-dsl.adoc[Endpoint DSL]:
-+
-[source,yaml]
-----
-- from:
- timer:
- name: "tick"
- period: "1s"
- steps:
- - telegram:
- type: "bots"
- authorizationToken: "XXX"
-----
-
-[WARNING]
-====
-Support for the Endpoint DSL with YAML is experimental and subject to changes.
-====
-[NOTE]
-====
-Support for Endpoint DSL auto completion https://github.com/apache/camel-k-runtime/issues/485[is not yet available].
-====
-
-== Defining beans
-
-In addition to the general support for creating beans provided by xref:latest@components:others:main.adoc#_specifying_custom_beans[Camel Main], the YAML DSL provide a convenient syntax to define and configure them:
-
-[source,yaml]
-----
-- beans:
- - name: beanFromMap # <1>
- type: com.acme.MyBean # <2>
- properties: # <3>
- foo: bar
-----
-<1> the name of the bean which will be used to bound the instance to the Camel Registry
-<2> the full qualified class name of the bean
-<3> the properties of the bean to be set
-
-The properties of the bean can be defined using either a map or properties style as shown in the example below:
-
-[source,yaml]
-----
-- beans:
- # map style
- - name: beanFromMap
- type: com.acme.MyBean
- properties:
- field1: 'f1'
- field2: 'f2'
- nested:
- field1: 'nf1'
- field2: 'nf2'
- # properties style
- - name: beanFromProps
- type: com.acme.MyBean
- properties:
- field1: 'f1_p'
- field2: 'f2_p'
- nested.field1: 'nf1_p'
- nested.field2: 'nf2_p'
-----
-
-[NOTE]
-====
-The `beans` elements can only be used as root element
-====
-
-== Examples
-
-You can find a set of examples using `camel-yaml-dsl` in https://github.com/apache/camel-examples[Camel Examples]
-which demonstrate creating Camel Routes with YAML.