This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 184ec93 Regen
184ec93 is described below
commit 184ec93ac304bcc985232029327d913230461553
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Sep 30 06:13:50 2019 +0200
Regen
---
components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc | 3 ++-
docs/components/modules/ROOT/pages/aws-sqs-component.adoc | 3 ++-
docs/components/modules/ROOT/pages/protobuf-dataformat.adoc | 8 ++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 0c68104..f0ffb94 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -148,7 +148,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 38 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -178,6 +178,7 @@ The component supports 38 options, which are listed below.
| *camel.component.aws-sqs.configuration.message-retention-period* | The
messageRetentionPeriod (in seconds) a message will be retained by SQS for this
queue. | | Integer
| *camel.component.aws-sqs.configuration.operation* | The operation to do in
case the user don't want to send only a message | | SqsOperations
| *camel.component.aws-sqs.configuration.policy* | The policy for this queue |
| String
+| *camel.component.aws-sqs.configuration.protocol* | The underlying protocol
used to communicate with SQS | https | String
| *camel.component.aws-sqs.configuration.proxy-host* | To define a proxy host
when instantiating the SQS client | | String
| *camel.component.aws-sqs.configuration.proxy-port* | To define a proxy port
when instantiating the SQS client | | Integer
| *camel.component.aws-sqs.configuration.queue-name* | Name of queue. The
queue will be created if they don't already exists. | | String
diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
index 6376248..2bb95a1 100644
--- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
@@ -149,7 +149,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 38 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -179,6 +179,7 @@ The component supports 38 options, which are listed below.
| *camel.component.aws-sqs.configuration.message-retention-period* | The
messageRetentionPeriod (in seconds) a message will be retained by SQS for this
queue. | | Integer
| *camel.component.aws-sqs.configuration.operation* | The operation to do in
case the user don't want to send only a message | | SqsOperations
| *camel.component.aws-sqs.configuration.policy* | The policy for this queue |
| String
+| *camel.component.aws-sqs.configuration.protocol* | The underlying protocol
used to communicate with SQS | https | String
| *camel.component.aws-sqs.configuration.proxy-host* | To define a proxy host
when instantiating the SQS client | | String
| *camel.component.aws-sqs.configuration.proxy-port* | To define a proxy port
when instantiating the SQS client | | Integer
| *camel.component.aws-sqs.configuration.queue-name* | Name of queue. The
queue will be created if they don't already exists. | | String
diff --git a/docs/components/modules/ROOT/pages/protobuf-dataformat.adoc
b/docs/components/modules/ROOT/pages/protobuf-dataformat.adoc
index 668bf32..e6412b8 100644
--- a/docs/components/modules/ROOT/pages/protobuf-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/protobuf-dataformat.adoc
@@ -83,6 +83,10 @@ from("direct:marshal")
.to("mock:reverse");
--------------------------------------------------------------------------------------------------
+== Input data type
+This dataformat supports marshaling input data either as protobuf `Message`
type or `Map` data type. In case of input data as `Map` type, first it will try
to retrieve the data as `Map` using built-in type converters, if it fails to
+do so, it will fall back to retrieve it as proto `Message`.
+
== Protobuf overview
This quick overview of how to use Protobuf. For more detail see the
@@ -197,11 +201,11 @@ DataFormat marshal and unmarshal API like this.
-----------------------------------------------------------------------------------
Or use the DSL protobuf() passing the unmarshal default instance or
-default instance class name like this.
+default instance class name like this. However, if you have input data as
`Map` type, you will need to **specify** the ProtobufDataFormat otherwise it
will throw an error.
[source,java]
--------------------------------------------------------------------------------------------------
- // You don't need to specify the default instance for protobuf marshaling
+ // You don't need to specify the default instance for protobuf marshaling,
but you will need in case your input data is a Map type
from("direct:marshal").marshal().protobuf();
from("direct:unmarshalA").unmarshal()
.protobuf("org.apache.camel.dataformat.protobuf.generated.AddressBookProtos$Person")
