Added multiline support

data-integrations · Jul 20, 2023 · d4b3531 · d4b3531
1 parent 6a3afe8
commit d4b3531
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,8 +34,8 @@
 
   <properties>
     <!-- properties for script build step that creates the config files for the artifacts -->
-    <data.pipeline.parent>system:cdap-data-pipeline[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</data.pipeline.parent>
-    <data.stream.parent>system:cdap-data-streams[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</data.stream.parent>
+    <data.pipeline.parent>system:cdap-data-pipeline[6.9.2-SNAPSHOT,7.0.0-SNAPSHOT)</data.pipeline.parent>
+    <data.stream.parent>system:cdap-data-streams[6.9.2-SNAPSHOT,7.0.0-SNAPSHOT)</data.stream.parent>
     <cdap.version>6.8.0</cdap.version>
     <hydrator.version>2.10.0</hydrator.version>
     <hadoop.version>2.3.0</hadoop.version>
@@ -384,7 +384,8 @@
         <version>2.14.1</version>
         <configuration>
           <argLine>-Xmx3g -Djava.awt.headless=true -XX:MaxPermSize=256m
-            -XX:+UseConcMarkSweepGC -Djava.net.preferIPv4Stack=true</argLine>
+            -XX:+UseConcMarkSweepGC -Djava.net.preferIPv4Stack=true
+          </argLine>
           <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
           <reuseForks>false</reuseForks>
           <reportFormat>plain</reportFormat>

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
@@ -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
@@ -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": {