This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.25.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b6d9d8b9727456c7639909fcb5ce75ff59642e5
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Feb 18 13:42:05 2020 +0000
CAMEL-14532 - Changing method signature
---
.../org/apache/camel/model/dataformat/YAMLDataFormat.java | 2 +-
.../src/main/docs/yaml-snakeyaml-dataformat.adoc | 8 +++++---
.../modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc | 8 ++++++--
.../springboot/SnakeYAMLDataFormatConfiguration.java | 12 ++++++------
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index 325e82e..5b2e265 100644
---
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -228,7 +228,7 @@ public class YAMLDataFormat extends DataFormatDefinition {
this.maxAliasesForCollections = maxAliasesForCollections;
}
- public String isAllowRecursiveKeys() {
+ public String getAllowRecursiveKeys() {
return allowRecursiveKeys;
}
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 6d5bc43..2609972 100644
--- a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
@@ -36,8 +36,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
@@ -65,11 +65,13 @@ The component supports 12 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* | Enable yaml-snakeyaml dataformat
| true | Boolean
| *camel.dataformat.yaml-snakeyaml.library* | Which yaml library to use. By
default it is SnakeYAML | | YAMLLibrary
+| *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
@@ -186,4 +188,4 @@ substituting the version number for the latest & greatest
release
-
\ No newline at end of file
+
diff --git a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
index 27956fa..37b38e0 100644
--- a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc
@@ -20,7 +20,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.
@@ -37,6 +37,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
@@ -64,11 +66,13 @@ The component supports 12 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* | Enable yaml-snakeyaml dataformat
| true | Boolean
| *camel.dataformat.yaml-snakeyaml.library* | Which yaml library to use. By
default it is SnakeYAML | | YAMLLibrary
+| *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
@@ -185,4 +189,4 @@ substituting the version number for the latest & greatest
release
-
\ No newline at end of file
+
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 01e248a..e651432 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
@@ -84,11 +84,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
@@ -178,19 +178,19 @@ public class SnakeYAMLDataFormatConfiguration
this.typeFilter = typeFilter;
}
- 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;
}
