This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a04b477ed63988cef709d785730c9641b2c5a46
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Feb 18 13:42:05 2020 +0000
CAMEL-14532 - Changing method signature
---
.../src/main/docs/yaml-snakeyaml-dataformat.adoc | 8 +++++---
.../org/apache/camel/model/dataformat/YAMLDataFormat.java | 2 +-
.../camel/reifier/dataformat/YAMLDataFormatReifier.java | 2 +-
.../modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc | 8 ++++++--
docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc | 2 +-
.../springboot/SnakeYAMLDataFormatConfiguration.java | 12 ++++++------
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git
a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
index ffa0c29..8843fa8 100644
--- a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
@@ -35,8 +35,8 @@ The YAML SnakeYAML dataformat supports 13 options, which are
listed below.
| prettyFlow | false | Boolean | Force the emitter to produce a pretty YAML
document when using the flow style.
| allowAnyType | false | Boolean | Allow any class to be un-marshaled
| typeFilter | | List | Set the types SnakeYAML is allowed to un-marshall
-| maxAliasesForCollections | 50 | int | Set the maximum amount of aliases
allowed for collections.
-| allowRecursiveKeys | false | boolean | Set whether recursive keys are
allowed.
+| maxAliasesForCollections | 50 | String | Set the maximum amount of aliases
allowed for collections.
+| allowRecursiveKeys | | String | Set whether recursive keys are allowed.
| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML, or application/json for data formats marshalling to JSon etc.
|===
// dataformat options: END
@@ -56,7 +56,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 10 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -64,10 +64,12 @@ The component supports 10 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.yaml-snakeyaml.allow-any-type* | Allow any class to be
un-marshaled | false | Boolean
+| *camel.dataformat.yaml-snakeyaml.allow-recursive-keys* | Set whether
recursive keys are allowed. | | String
| *camel.dataformat.yaml-snakeyaml.constructor* | BaseConstructor to construct
incoming documents. | | String
| *camel.dataformat.yaml-snakeyaml.content-type-header* | Whether the data
format should set the Content-Type header with the type from the data format if
the data format is capable of doing so. For example application/xml for data
formats marshalling to XML, or application/json for data formats marshalling to
JSon etc. | false | Boolean
| *camel.dataformat.yaml-snakeyaml.dumper-options* | DumperOptions to
configure outgoing objects. | | String
| *camel.dataformat.yaml-snakeyaml.enabled* | Whether to enable auto
configuration of the yaml-snakeyaml data format. This is enabled by default. |
| Boolean
+| *camel.dataformat.yaml-snakeyaml.max-aliases-for-collections* | Set the
maximum amount of aliases allowed for collections. | 50 | String
| *camel.dataformat.yaml-snakeyaml.pretty-flow* | Force the emitter to produce
a pretty YAML document when using the flow style. | false | Boolean
| *camel.dataformat.yaml-snakeyaml.representer* | Representer to emit outgoing
objects. | | String
| *camel.dataformat.yaml-snakeyaml.resolver* | Resolver to detect implicit
type | | String
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index 33e86de..3c82c99 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -232,7 +232,7 @@ public class YAMLDataFormat extends DataFormatDefinition {
this.maxAliasesForCollections = maxAliasesForCollections;
}
- public String isAllowRecursiveKeys() {
+ public String getAllowRecursiveKeys() {
return allowRecursiveKeys;
}
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
index 033134a..bbb4cec 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
@@ -67,7 +67,7 @@ public class YAMLDataFormatReifier extends
DataFormatReifier<YAMLDataFormat> {
setProperty(dataFormat, camelContext, "prettyFlow",
definition.isPrettyFlow());
setProperty(dataFormat, camelContext, "allowAnyType",
definition.isAllowAnyType());
setProperty(dataFormat, camelContext, "maxAliasesForCollections",
definition.getMaxAliasesForCollections());
- setProperty(dataFormat, camelContext, "allowRecursiveKeys",
definition.isAllowRecursiveKeys());
+ setProperty(dataFormat, camelContext, "allowRecursiveKeys",
definition.getAllowRecursiveKeys());
if (definition.getTypeFilters() != null &&
!definition.getTypeFilters().isEmpty()) {
List<String> typeFilterDefinitions = new
ArrayList<>(definition.getTypeFilters().size());
diff --git a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
index e566551..a18df01 100644
--- a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
@@ -19,7 +19,7 @@ SnakeYAML library.
== YAML Options
// dataformat options: START
-The YAML SnakeYAML dataformat supports 11 options, which are listed below.
+The YAML SnakeYAML dataformat supports 13 options, which are listed below.
@@ -36,6 +36,8 @@ The YAML SnakeYAML dataformat supports 11 options, which are
listed below.
| prettyFlow | false | Boolean | Force the emitter to produce a pretty YAML
document when using the flow style.
| allowAnyType | false | Boolean | Allow any class to be un-marshaled
| typeFilter | | List | Set the types SnakeYAML is allowed to un-marshall
+| maxAliasesForCollections | 50 | String | Set the maximum amount of aliases
allowed for collections.
+| allowRecursiveKeys | | String | Set whether recursive keys are allowed.
| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML, or application/json for data formats marshalling to JSon etc.
|===
// dataformat options: END
@@ -55,7 +57,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 10 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -63,10 +65,12 @@ The component supports 10 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.yaml-snakeyaml.allow-any-type* | Allow any class to be
un-marshaled | false | Boolean
+| *camel.dataformat.yaml-snakeyaml.allow-recursive-keys* | Set whether
recursive keys are allowed. | | String
| *camel.dataformat.yaml-snakeyaml.constructor* | BaseConstructor to construct
incoming documents. | | String
| *camel.dataformat.yaml-snakeyaml.content-type-header* | Whether the data
format should set the Content-Type header with the type from the data format if
the data format is capable of doing so. For example application/xml for data
formats marshalling to XML, or application/json for data formats marshalling to
JSon etc. | false | Boolean
| *camel.dataformat.yaml-snakeyaml.dumper-options* | DumperOptions to
configure outgoing objects. | | String
| *camel.dataformat.yaml-snakeyaml.enabled* | Whether to enable auto
configuration of the yaml-snakeyaml data format. This is enabled by default. |
| Boolean
+| *camel.dataformat.yaml-snakeyaml.max-aliases-for-collections* | Set the
maximum amount of aliases allowed for collections. | 50 | String
| *camel.dataformat.yaml-snakeyaml.pretty-flow* | Force the emitter to produce
a pretty YAML document when using the flow style. | false | Boolean
| *camel.dataformat.yaml-snakeyaml.representer* | Representer to emit outgoing
objects. | | String
| *camel.dataformat.yaml-snakeyaml.resolver* | Resolver to detect implicit
type | | String
diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index da3d2c0..12fb296 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -279,7 +279,7 @@ setting the property
`Exchange.AGGREGATION_COMPLETE_ALL_GROUPS` to `true`.
== Manually Force the Completion of All Aggregated Exchanges Immediately
You can manually trigger completion of all current aggregated exchanges
-by sending a message containing the header
+by sending an exchange containing the property
`Exchange.AGGREGATION_COMPLETE_ALL_GROUPS` set to `true`. The message is
considered a signal message only, the message headers/contents will not
be processed otherwise.
diff --git
a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
index f5987c9..edc3565 100644
---
a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
@@ -72,11 +72,11 @@ public class SnakeYAMLDataFormatConfiguration
/**
* Set the maximum amount of aliases allowed for collections.
*/
- private Integer maxAliasesForCollections = 50;
+ private String maxAliasesForCollections = "50";
/**
* Set whether recursive keys are allowed.
*/
- private Boolean allowRecursiveKeys = false;
+ private String allowRecursiveKeys;
/**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
@@ -150,19 +150,19 @@ public class SnakeYAMLDataFormatConfiguration
this.allowAnyType = allowAnyType;
}
- public Integer getMaxAliasesForCollections() {
+ public String getMaxAliasesForCollections() {
return maxAliasesForCollections;
}
- public void setMaxAliasesForCollections(Integer maxAliasesForCollections) {
+ public void setMaxAliasesForCollections(String maxAliasesForCollections) {
this.maxAliasesForCollections = maxAliasesForCollections;
}
- public Boolean getAllowRecursiveKeys() {
+ public String getAllowRecursiveKeys() {
return allowRecursiveKeys;
}
- public void setAllowRecursiveKeys(Boolean allowRecursiveKeys) {
+ public void setAllowRecursiveKeys(String allowRecursiveKeys) {
this.allowRecursiveKeys = allowRecursiveKeys;
}
