Repository: camel Updated Branches: refs/heads/json-simple 8b7c86a54 -> 3f0bc8e40
CAMEL-10696: Ensure json value is escaped and avoid new line problems in description and in docs. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e325a95 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e325a95 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e325a95 Branch: refs/heads/json-simple Commit: 5e325a95a257e7e29c3b46f445990ed96d0a5b42 Parents: 8b7c86a Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 24 17:05:54 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 24 17:05:54 2017 +0200 ---------------------------------------------------------------------- .../model/dataformat/BeanioDataFormat.java | 4 +-- .../camel/model/dataformat/CsvDataFormat.java | 4 +-- .../model/dataformat/FlatpackDataFormat.java | 26 +++++++++--------- .../camel/model/dataformat/JaxbDataFormat.java | 4 +-- .../dataformat/MimeMultipartDataFormat.java | 3 -- .../dataformat/UniVocityCsvDataFormat.java | 8 +++--- .../UniVocityFixedWidthDataFormat.java | 6 ++-- .../dataformat/UniVocityTsvDataFormat.java | 2 +- .../model/dataformat/XmlJsonDataFormat.java | 2 +- .../src/main/docs/base64-dataformat.adoc | 2 +- .../camel-csv/src/main/docs/csv-dataformat.adoc | 2 +- .../src/main/docs/flatpack-dataformat.adoc | 4 +-- .../camel-ftp/src/main/docs/ftp-component.adoc | 2 +- .../camel-ftp/src/main/docs/ftps-component.adoc | 2 +- .../src/main/docs/univocity-csv-dataformat.adoc | 3 +- .../main/docs/univocity-fixed-dataformat.adoc | 3 +- .../src/main/docs/univocity-tsv-dataformat.adoc | 3 +- .../Base64DataFormatConfiguration.java | 4 +-- .../springboot/CsvDataFormatConfiguration.java | 3 +- .../FlatpackDataFormatConfiguration.java | 29 ++++++++++---------- .../UniVocityCsvDataFormatConfiguration.java | 5 ++-- ...VocityFixedWidthDataFormatConfiguration.java | 5 ++-- .../UniVocityTsvDataFormatConfiguration.java | 5 ++-- 23 files changed, 68 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java index 8aad5c9..2fcec60 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java @@ -48,9 +48,9 @@ public class BeanioDataFormat extends DataFormatDefinition { private Boolean ignoreInvalidRecords; @XmlAttribute private String encoding; - @XmlAttribute + @XmlAttribute @Metadata(label = "advanced") private String beanReaderErrorHandlerType; - @XmlAttribute + @XmlAttribute @Metadata(label = "advanced") private Boolean unmarshalSingleObject; public BeanioDataFormat() { http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index 254c0e1..7eeb27c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -38,9 +38,9 @@ import org.apache.camel.util.ObjectHelper; @XmlAccessorType(XmlAccessType.FIELD) public class CsvDataFormat extends DataFormatDefinition { // Format options - @XmlAttribute + @XmlAttribute @Metadata(label = "advanced") private String formatRef; - @XmlAttribute + @XmlAttribute @Metadata(enums = "DEFAULT,EXCEL,INFORMIX_UNLOAD,INFORMIX_UNLOAD_CSV,MYSQL,RFC4180") private String formatName; @XmlAttribute private Boolean commentMarkerDisabled; http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java index 6a71d56..93faadf 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java @@ -37,8 +37,6 @@ import org.apache.camel.util.ObjectHelper; @XmlAccessorType(XmlAccessType.FIELD) public class FlatpackDataFormat extends DataFormatDefinition { @XmlAttribute - private String parserFactoryRef; - @XmlAttribute private String definition; @XmlAttribute private Boolean fixed; @@ -52,22 +50,13 @@ public class FlatpackDataFormat extends DataFormatDefinition { private Boolean allowShortLines; @XmlAttribute private Boolean ignoreExtraColumns; + @XmlAttribute @Metadata(label = "advanced") + private String parserFactoryRef; public FlatpackDataFormat() { super("flatpack"); } - public String getParserFactoryRef() { - return parserFactoryRef; - } - - /** - * References to a custom parser factory to lookup in the registry - */ - public void setParserFactoryRef(String parserFactoryRef) { - this.parserFactoryRef = parserFactoryRef; - } - public String getDefinition() { return definition; } @@ -150,6 +139,17 @@ public class FlatpackDataFormat extends DataFormatDefinition { this.ignoreExtraColumns = ignoreExtraColumns; } + public String getParserFactoryRef() { + return parserFactoryRef; + } + + /** + * References to a custom parser factory to lookup in the registry + */ + public void setParserFactoryRef(String parserFactoryRef) { + this.parserFactoryRef = parserFactoryRef; + } + @Override protected DataFormat createDataFormat(RouteContext routeContext) { DataFormat flatpack = super.createDataFormat(routeContext); http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java index 0dcdb3e..ed32ef7 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java @@ -64,13 +64,13 @@ public class JaxbDataFormat extends DataFormatDefinition { private String partNamespace; @XmlAttribute private String namespacePrefixRef; - @XmlAttribute + @XmlAttribute @Metadata(label = "advanced") private String xmlStreamWriterWrapper; @XmlAttribute private String schemaLocation; @XmlAttribute private String noNamespaceSchemaLocation; - @XmlAttribute + @XmlAttribute @Metadata(label = "advanced") private String jaxbProviderProperties; public JaxbDataFormat() { http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java index 8e4a01b..20d58ac 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java @@ -39,15 +39,12 @@ public class MimeMultipartDataFormat extends DataFormatDefinition { @Metadata(defaultValue = "mixed") private String multipartSubType = "mixed"; @XmlAttribute - @Metadata(defaultValue = "false") private Boolean multipartWithoutAttachment; @XmlAttribute - @Metadata(defaultValue = "false") private Boolean headersInline; @XmlAttribute private String includeHeaders; @XmlAttribute - @Metadata(defaultValue = "false") private Boolean binaryContent; public MimeMultipartDataFormat() { http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java index 63311d7..1ce32da 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java @@ -33,13 +33,13 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat { @XmlAttribute - protected Boolean quoteAllFields; + private Boolean quoteAllFields; @XmlAttribute @Metadata(defaultValue = "\"") - protected String quote; + private String quote; @XmlAttribute @Metadata(defaultValue = "\"") - protected String quoteEscape; + private String quoteEscape; @XmlAttribute @Metadata(defaultValue = ",") - protected String delimiter; + private String delimiter; public UniVocityCsvDataFormat() { super("univocity-csv"); http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java index 45c2bd6..fee00ad 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java @@ -33,11 +33,11 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityFixedWidthDataFormat extends UniVocityAbstractDataFormat { @XmlAttribute - protected Boolean skipTrailingCharsUntilNewline; + private Boolean skipTrailingCharsUntilNewline; @XmlAttribute - protected Boolean recordEndsOnNewline; + private Boolean recordEndsOnNewline; @XmlAttribute - protected String padding; + private String padding; public UniVocityFixedWidthDataFormat() { super("univocity-fixed"); http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java index b422098..ed6fea5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat { @XmlAttribute @Metadata(defaultValue = "\\") - protected String escapeChar; + private String escapeChar; public UniVocityTsvDataFormat() { super("univocity-tsv"); http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java index fe6da57..2144a24 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java @@ -73,7 +73,7 @@ public class XmlJsonDataFormat extends DataFormatDefinition { private Boolean skipNamespaces; @XmlAttribute private Boolean removeNamespacePrefixes; - @XmlAttribute @XmlList + @XmlAttribute @XmlList @Metadata(label = "advanced") private List<String> expandableProperties; @XmlAttribute private String typeHints; http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-base64/src/main/docs/base64-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-base64/src/main/docs/base64-dataformat.adoc b/components/camel-base64/src/main/docs/base64-dataformat.adoc index 7603b9d..040e3bc 100644 --- a/components/camel-base64/src/main/docs/base64-dataformat.adoc +++ b/components/camel-base64/src/main/docs/base64-dataformat.adoc @@ -15,7 +15,7 @@ The Base64 dataformat supports 4 options which are listed below. |=== | Name | Default | Java Type | Description | lineLength | 76 | Integer | To specific a maximum line length for the encoded data. By default 76 is used. -| lineSeparator | \r\n | String | The line separators to use. By default \r\n is used. +| lineSeparator | | String | The line separators to use. Uses new line characters (CRLF) by default. | urlSafe | false | Boolean | Instead of emitting '' and '/' we emit '-' and '_' respectively. urlSafe is only applied to encode operations. Decoding seamlessly handles both modes. Is by default false. | 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. |=== http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-csv/src/main/docs/csv-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/docs/csv-dataformat.adoc b/components/camel-csv/src/main/docs/csv-dataformat.adoc index cc0fd28..979edaa 100644 --- a/components/camel-csv/src/main/docs/csv-dataformat.adoc +++ b/components/camel-csv/src/main/docs/csv-dataformat.adoc @@ -35,7 +35,7 @@ The CSV dataformat supports 27 options which are listed below. | quoteDisabled | false | Boolean | Used to disable quotes | quote | | String | Sets the quote which by default is | recordSeparatorDisabled | | String | Used for disabling record separator -| recordSeparator | | String | Sets the record separator (aka new line) which by default is \r\n (CRLF) +| recordSeparator | | String | Sets the record separator (aka new line) which by default is new line characters (CRLF) | skipHeaderRecord | false | Boolean | Whether to skip the header record in the output | quoteMode | | String | Sets the quote mode | ignoreHeaderCase | false | Boolean | Sets whether or not to ignore case when accessing header names. http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc index c9e1fa8..d4ef7e5 100644 --- a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc +++ b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc @@ -28,14 +28,14 @@ The Flatpack dataformat supports 9 options which are listed below. [width="100%",cols="2s,1m,1m,6",options="header"] |=== | Name | Default | Java Type | Description -| parserFactoryRef | | String | References to a custom parser factory to lookup in the registry | definition | | String | The flatpack pzmap configuration file. Can be omitted in simpler situations but its preferred to use the pzmap. | fixed | false | Boolean | Delimited or fixed. Is by default false = delimited | ignoreFirstRecord | true | Boolean | Whether the first line is ignored for delimited files (for the column headers). Is by default true. -| textQualifier | " | String | If the text is qualified with a char such as " +| textQualifier | | String | If the text is qualified with a character. Uses quote character by default. | delimiter | , | String | The delimiter char (could be ; or similar) | allowShortLines | false | Boolean | Allows for lines to be shorter than expected and ignores the extra characters | ignoreExtraColumns | false | Boolean | Allows for lines to be longer than expected and ignores the extra characters. +| parserFactoryRef | | String | References to a custom parser factory to lookup in the registry | 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 http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-ftp/src/main/docs/ftp-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc index cc3cd91..126e964 100644 --- a/components/camel-ftp/src/main/docs/ftp-component.adoc +++ b/components/camel-ftp/src/main/docs/ftp-component.adoc @@ -153,7 +153,7 @@ with the following path and query parameters: | *ftpClientParameters* (advanced) | Used by FtpComponent to provide additional parameters for the FTPClient | | Map | *maximumReconnectAttempts* (advanced) | Specifies the maximum reconnect attempts Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior. | | int | *reconnectDelay* (advanced) | Delay in millis Camel will wait before performing a reconnect attempt. | | long -| *siteCommand* (advanced) | Sets optional site command(s) to be executed after successful login. Multiple site commands can be separated using a new line character (\n). | | String +| *siteCommand* (advanced) | Sets optional site command(s) to be executed after successful login. Multiple site commands can be separated using a new line character. | | String | *soTimeout* (advanced) | Sets the so timeout Used only by FTPClient | 300000 | int | *stepwise* (advanced) | Sets whether we should stepwise change directories while traversing file structures when downloading files or as well when uploading a file to a directory. You can disable this if you for example are in a situation where you cannot change directory on the FTP server due security reasons. | true | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-ftp/src/main/docs/ftps-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc index 51ec986..558d89e 100644 --- a/components/camel-ftp/src/main/docs/ftps-component.adoc +++ b/components/camel-ftp/src/main/docs/ftps-component.adoc @@ -113,7 +113,7 @@ with the following path and query parameters: | *ftpClientParameters* (advanced) | Used by FtpComponent to provide additional parameters for the FTPClient | | Map | *maximumReconnectAttempts* (advanced) | Specifies the maximum reconnect attempts Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior. | | int | *reconnectDelay* (advanced) | Delay in millis Camel will wait before performing a reconnect attempt. | | long -| *siteCommand* (advanced) | Sets optional site command(s) to be executed after successful login. Multiple site commands can be separated using a new line character (\n). | | String +| *siteCommand* (advanced) | Sets optional site command(s) to be executed after successful login. Multiple site commands can be separated using a new line character. | | String | *soTimeout* (advanced) | Sets the so timeout Used only by FTPClient | 300000 | int | *stepwise* (advanced) | Sets whether we should stepwise change directories while traversing file structures when downloading files or as well when uploading a file to a directory. You can disable this if you for example are in a situation where you cannot change directory on the FTP server due security reasons. | true | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc index e030656..7615e25 100644 --- a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc +++ b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc @@ -63,7 +63,8 @@ The uniVocity CSV dataformat supports 18 options which are listed below. | numberOfRecordsToRead | | Integer | The maximum number of record to read. | emptyValue | | String | The String representation of an empty value | lineSeparator | | String | The line separator of the files The default value is to use the JVM platform line separator -| normalizedLineSeparator | \n | String | The normalized line separator of the files The default value is \n +| normalizedLineSeparator | + | String | The normalized line separator of the files The default value is a new line character. | comment | # | String | The comment symbol. The default value is | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc index 3777483..2687ee3 100644 --- a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc +++ b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc @@ -62,7 +62,8 @@ The uniVocity Fixed Length dataformat supports 17 options which are listed below | numberOfRecordsToRead | | Integer | The maximum number of record to read. | emptyValue | | String | The String representation of an empty value | lineSeparator | | String | The line separator of the files The default value is to use the JVM platform line separator -| normalizedLineSeparator | \n | String | The normalized line separator of the files The default value is \n +| normalizedLineSeparator | + | String | The normalized line separator of the files The default value is a new line character. | comment | # | String | The comment symbol. The default value is | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc index 24ee98a..ed18be5 100644 --- a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc +++ b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc @@ -60,7 +60,8 @@ The uniVocity TSV dataformat supports 15 options which are listed below. | numberOfRecordsToRead | | Integer | The maximum number of record to read. | emptyValue | | String | The String representation of an empty value | lineSeparator | | String | The line separator of the files The default value is to use the JVM platform line separator -| normalizedLineSeparator | \n | String | The normalized line separator of the files The default value is \n +| normalizedLineSeparator | + | String | The normalized line separator of the files The default value is a new line character. | comment | # | String | The comment symbol. The default value is | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatConfiguration.java index 71c48bd..746cdfa 100644 --- a/platforms/spring-boot/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatConfiguration.java @@ -37,9 +37,9 @@ public class Base64DataFormatConfiguration */ private Integer lineLength = 76; /** - * The line separators to use. By default \r\n is used. + * The line separators to use. Uses new line characters (CRLF) by default. */ - private String lineSeparator = "\\r\\n"; + private String lineSeparator; /** * Instead of emitting '' and '/' we emit '-' and '_' respectively. urlSafe * is only applied to encode operations. Decoding seamlessly handles both http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java index 108af25..183a46c 100644 --- a/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java @@ -102,7 +102,8 @@ public class CsvDataFormatConfiguration */ private String recordSeparatorDisabled; /** - * Sets the record separator (aka new line) which by default is \r\n (CRLF) + * Sets the record separator (aka new line) which by default is new line + * characters (CRLF) */ private String recordSeparator; /** http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java index 4f97b36..34f0ddb 100644 --- a/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java @@ -32,10 +32,6 @@ public class FlatpackDataFormatConfiguration DataFormatConfigurationPropertiesCommon { /** - * References to a custom parser factory to lookup in the registry - */ - private String parserFactoryRef; - /** * The flatpack pzmap configuration file. Can be omitted in simpler * situations but its preferred to use the pzmap. */ @@ -50,9 +46,10 @@ public class FlatpackDataFormatConfiguration */ private Boolean ignoreFirstRecord = true; /** - * If the text is qualified with a char such as " + * If the text is qualified with a character. Uses quote character by + * default. */ - private String textQualifier = "\""; + private String textQualifier; /** * The delimiter char (could be ; or similar) */ @@ -68,6 +65,10 @@ public class FlatpackDataFormatConfiguration */ private Boolean ignoreExtraColumns = false; /** + * References to a custom parser factory to lookup in the registry + */ + private String parserFactoryRef; + /** * 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 @@ -75,14 +76,6 @@ public class FlatpackDataFormatConfiguration */ private Boolean contentTypeHeader = false; - public String getParserFactoryRef() { - return parserFactoryRef; - } - - public void setParserFactoryRef(String parserFactoryRef) { - this.parserFactoryRef = parserFactoryRef; - } - public String getDefinition() { return definition; } @@ -139,6 +132,14 @@ public class FlatpackDataFormatConfiguration this.ignoreExtraColumns = ignoreExtraColumns; } + public String getParserFactoryRef() { + return parserFactoryRef; + } + + public void setParserFactoryRef(String parserFactoryRef) { + this.parserFactoryRef = parserFactoryRef; + } + public Boolean getContentTypeHeader() { return contentTypeHeader; } http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatConfiguration.java index ea1bf8d..c645fb6 100644 --- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatConfiguration.java @@ -90,9 +90,10 @@ public class UniVocityCsvDataFormatConfiguration */ private String lineSeparator; /** - * The normalized line separator of the files The default value is \n + * The normalized line separator of the files The default value is a new + * line character. */ - private String normalizedLineSeparator = "\\n"; + private String normalizedLineSeparator; /** * The comment symbol. The default value is */ http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatConfiguration.java index 561af7a..7e3d0be 100644 --- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatConfiguration.java @@ -87,9 +87,10 @@ public class UniVocityFixedWidthDataFormatConfiguration */ private String lineSeparator; /** - * The normalized line separator of the files The default value is \n + * The normalized line separator of the files The default value is a new + * line character. */ - private String normalizedLineSeparator = "\\n"; + private String normalizedLineSeparator; /** * The comment symbol. The default value is */ http://git-wip-us.apache.org/repos/asf/camel/blob/5e325a95/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatConfiguration.java index f385088..d65bce0 100644 --- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatConfiguration.java @@ -78,9 +78,10 @@ public class UniVocityTsvDataFormatConfiguration */ private String lineSeparator; /** - * The normalized line separator of the files The default value is \n + * The normalized line separator of the files The default value is a new + * line character. */ - private String normalizedLineSeparator = "\\n"; + private String normalizedLineSeparator; /** * The comment symbol. The default value is */
