Added jsonLinesRaw support to API

Also deprecated existing jsonLines method - no need for a boolean, though there's a general lack of consistency there in the API.

Author: rjrudin

flux-cli/src/main/java/com/marklogic/flux/api/AggregateJsonFilesImporter.java

@@ -17,13 +17,27 @@ interface ReadJsonFilesOptions extends ReadFilesOptions<ReadJsonFilesOptions> {
         /**
          * @param value set to true to read JSON Lines files. Defaults to reading files that either contain an array
          *              of JSON objects or a single JSON object.
+         * @deprecated since 1.1.2; use {@code jsonLines()} instead.
          */
+        @SuppressWarnings("java:S1133") // Telling Sonar we don't need a reminder to remove this some day.
+        @Deprecated(since = "1.1.2", forRemoval = true)
         ReadJsonFilesOptions jsonLines(boolean value);
 
         /**
+         * Call this to read JSON Lines files. Otherwise, defaults to reading files that either contain an array of
+         * JSON objects or a single JSON object.
+         *
          * @since 1.1.2
          */
-        ReadJsonFilesOptions jsonLinesRaw(boolean value);
+        ReadJsonFilesOptions jsonLines();
+
+        /**
+         * Call this to read JSON Lines files "as is", without any alteration to the documents associated with each
+         * line.
+         *
+         * @since 1.1.2
+         */
+        ReadJsonFilesOptions jsonLinesRaw();
 
         ReadJsonFilesOptions encoding(String encoding);
 

flux-cli/src/main/java/com/marklogic/flux/impl/importdata/ImportAggregateJsonFilesCommand.java

@@ -101,8 +101,14 @@ public ReadJsonFilesOptions jsonLines(boolean value) {
         }
 
         @Override
-        public ReadJsonFilesOptions jsonLinesRaw(boolean value) {
-            this.jsonLinesRaw = value;
+        public ReadJsonFilesOptions jsonLines() {
+            this.jsonLines = true;
+            return this;
+        }
+
+        @Override
+        public ReadJsonFilesOptions jsonLinesRaw() {
+            this.jsonLinesRaw = true;
             return this;
         }
 

flux-cli/src/test/java/com/marklogic/flux/api/AggregateJsonFilesImporterTest.java

@@ -21,7 +21,7 @@ void test() {
             .connectionString(makeConnectionString())
             .from(options -> options
                 .paths("src/test/resources/delimited-files/custom-delimiter-json.txt")
-                .jsonLines(true)
+                .jsonLines()
                 .additionalOptions(Map.of("lineSep", ":\n")))
             .to(options -> options
                 .permissionsString(DEFAULT_PERMISSIONS)
@@ -47,4 +47,20 @@ void missingPath() {
         FluxException ex = assertThrowsFluxException(() -> importer.execute());
         assertEquals("Must specify one or more file paths", ex.getMessage());
     }
+
+    @Test
+    void jsonLinesRaw() {
+        Flux.importAggregateJsonFiles()
+            .connectionString(makeConnectionString())
+            .from(options -> options
+                .paths("src/test/resources/delimited-files/different-objects.txt")
+                .jsonLinesRaw()
+            )
+            .to(options -> options
+                .collections("json-lines")
+                .permissionsString(DEFAULT_PERMISSIONS)
+            ).execute();
+
+        assertCollectionSize("json-lines", 2);
+    }
 }

flux-cli/src/test/java/com/marklogic/flux/api/JsonLinesFilesExporterTest.java

@@ -24,7 +24,7 @@ void test(@TempDir Path tempDir) {
         Flux.importAggregateJsonFiles()
             .from(options -> options
                 .paths(tempDir.toFile().getAbsolutePath())
-                .jsonLines(true))
+                .jsonLines())
             .connectionString(makeConnectionString())
             .to(options -> options
                 .permissionsString(DEFAULT_PERMISSIONS)