diff --git a/pom.xml b/pom.xml index 9bcf4f9..144ce00 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ - system:cdap-data-pipeline[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-pipeline[6.9.2-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-streams[6.9.2-SNAPSHOT,7.0.0-SNAPSHOT) 6.8.0 2.10.0 2.3.0 @@ -384,7 +384,8 @@ 2.14.1 -Xmx3g -Djava.awt.headless=true -XX:MaxPermSize=256m - -XX:+UseConcMarkSweepGC -Djava.net.preferIPv4Stack=true + -XX:+UseConcMarkSweepGC -Djava.net.preferIPv4Stack=true + ${surefire.redirectTestOutputToFile} false plain diff --git a/src/main/java/io/cdap/plugin/batch/source/ftp/FTPBatchSource.java b/src/main/java/io/cdap/plugin/batch/source/ftp/FTPBatchSource.java index 11d0ace..15c46df 100644 --- a/src/main/java/io/cdap/plugin/batch/source/ftp/FTPBatchSource.java +++ b/src/main/java/io/cdap/plugin/batch/source/ftp/FTPBatchSource.java @@ -181,6 +181,11 @@ public static class FTPBatchSourceConfig extends PluginConfig implements FileSou "is 'csv', 'tsv' or 'delimited'. The default value is false.") protected Boolean enableQuotedValues; + @Macro + @Nullable + @Description("Enable the support for a single field, enclosed in quotes, to span over multiple lines. This " + + "value will only be used if the format is 'csv', 'tsv' or 'delimited'. The default value is false.") + protected Boolean enableMultilineSupport; @VisibleForTesting FTPBatchSourceConfig() { diff --git a/widgets/FTP-batchsource.json b/widgets/FTP-batchsource.json index 301edaf..a7c37b5 100644 --- a/widgets/FTP-batchsource.json +++ b/widgets/FTP-batchsource.json @@ -81,6 +81,22 @@ } } }, + { + "widget-type": "toggle", + "name": "enableMultilineSupport", + "label": "Enable Multiline Support", + "widget-attributes": { + "default": "false", + "on": { + "value": "true", + "label": "True" + }, + "off": { + "value": "false", + "label": "False" + } + } + }, { "widget-type": "toggle", "name": "skipHeader", @@ -179,6 +195,17 @@ } ] }, + { + "name": "enableMultilineSupport", + "condition": { + "expression": "enableQuotedValues == true" + }, + "show": [ + { + "name": "enableMultilineSupport" + } + ] + }, { "name": "skipHeader", "condition": {