Added few tests and some Sonar fixes

Author: rjrudin

src/main/java/com/marklogic/spark/writer/WriteContext.java

@@ -25,7 +25,6 @@
 import com.marklogic.spark.Util;
 import org.apache.spark.sql.types.StructType;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -69,9 +68,9 @@ WriteBatcher newWriteBatcher(DataMovementManager dataMovementManager) {
             // WriteBatcherImpl has its own warn-level logging which is a bit verbose, including more than just the
             // message from the server. This is intended to always show up and be associated with our Spark connector
             // and also to be more brief, just capturing the main message from the server.
-            .onBatchFailure(((batch, failure) -> {
-                Util.MAIN_LOGGER.error("Failed to write documents: {}", failure.getMessage());
-            }));
+            .onBatchFailure((batch, failure) ->
+                Util.MAIN_LOGGER.error("Failed to write documents: {}", failure.getMessage())
+            );
 
         if (logger.isDebugEnabled()) {
             writeBatcher.onBatchSuccess(this::logBatchOnSuccess);

src/test/java/com/marklogic/spark/reader/document/ReadDocumentRowsWithPartitionCountsTest.java

@@ -50,6 +50,24 @@ void invalidValue() {
         assertEquals("Value of 'spark.marklogic.read.documents.partitionsPerForest' option must be numeric.", ex.getMessage());
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {
+        "{\"ctsquery\": {\"collectionQuery\": {\"uris\": [\"author\"]}}}",
+        "{\"query\": {\"collection-query\": {\"uri\": [\"author\"]}}}",
+        "{\"search\": {\"query\": {\"collection-query\": {\"uri\": [\"author\"]}}}}"
+    })
+    void complexQuery(String query) {
+        long count = newSparkSession().read()
+            .format(CONNECTOR_IDENTIFIER)
+            .option(Options.CLIENT_URI, makeClientUri())
+            .option(Options.READ_DOCUMENTS_QUERY, query)
+            .option(Options.READ_DOCUMENTS_PARTITIONS_PER_FOREST, 3)
+            .load()
+            .count();
+
+        assertEquals(15, count, "Unexpected count for query: " + query);
+    }
+
     private Dataset<Row> readAuthors(int partitionsPerForest) {
         return newSparkSession().read()
             .format(CONNECTOR_IDENTIFIER)