Addressing all Sonar warnings

Ran an "optimize imports" on src/main and src/test, so some files had imports optimized even though they didn't have unused imports.

Author: rjrudin

src/main/java/com/marklogic/spark/MarkLogicTable.java

@@ -3,9 +3,9 @@
  */
 package com.marklogic.spark;
 
-import com.marklogic.spark.reader.optic.OpticScanBuilder;
-import com.marklogic.spark.reader.optic.OpticReadContext;
 import com.marklogic.spark.reader.customcode.CustomCodeScanBuilder;
+import com.marklogic.spark.reader.optic.OpticReadContext;
+import com.marklogic.spark.reader.optic.OpticScanBuilder;
 import com.marklogic.spark.writer.MarkLogicWriteBuilder;
 import com.marklogic.spark.writer.WriteContext;
 import org.apache.spark.sql.SparkSession;

src/main/java/com/marklogic/spark/reader/optic/PlanUtil.java

@@ -17,7 +17,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 

src/test/java/com/marklogic/spark/AbstractIntegrationTest.java

@@ -120,7 +120,7 @@ protected final boolean isMarkLogic10() {
             String version = getDatabaseClient().newServerEval().javascript("xdmp.version()").evalAs(String.class);
             markLogicVersion = new MarkLogicVersion(version);
         }
-        return markLogicVersion.getMajor() == 10;
+        return markLogicVersion.getMajorNumber() == 10;
     }
 
     protected final boolean isSpark340OrHigher() {

src/test/java/com/marklogic/spark/MarkLogicVersion.java

@@ -14,8 +14,8 @@
  */
 class MarkLogicVersion {
 
-    private int major;
-    private Integer minor;
+    private int majorNumber;
+    private Integer minorNumber;
     private boolean nightly;
 
     private static final String VERSION_WITH_PATCH_PATTERN = "^.*-(.+)\\..*";
@@ -27,28 +27,28 @@ public MarkLogicVersion(String version) {
         if (version.matches(nightlyPattern)) {
             this.nightly = true;
         } else if (version.matches(majorWithMinorPattern)) {
-            this.minor = version.matches(VERSION_WITH_PATCH_PATTERN) ?
+            this.minorNumber = version.matches(VERSION_WITH_PATCH_PATTERN) ?
                     parseMinorWithPatch(version) :
                     Integer.parseInt(version.replaceAll(majorWithMinorPattern, "$1") + "00");
         }
-        this.major = major;
+        this.majorNumber = major;
     }
 
     private int parseMinorWithPatch(String version) {
-        final int minorNumber = Integer.parseInt(version.replaceAll(VERSION_WITH_PATCH_PATTERN, "$1"));
+        final int minorValue = Integer.parseInt(version.replaceAll(VERSION_WITH_PATCH_PATTERN, "$1"));
         final int patch = Integer.parseInt(version.replaceAll("^.*-(.+)\\.(.*)", "$2"));
         final String leftPaddedPatchNumber = patch < 10 ?
                 StringUtils.leftPad(String.valueOf(patch), 2, "0") :
                 String.valueOf(patch);
-        return Integer.parseInt(minorNumber + leftPaddedPatchNumber);
+        return Integer.parseInt(minorValue + leftPaddedPatchNumber);
     }
 
-    public int getMajor() {
-        return major;
+    public int getMajorNumber() {
+        return majorNumber;
     }
 
-    public Integer getMinor() {
-        return minor;
+    public Integer getMinorNumber() {
+        return minorNumber;
     }
 
     public boolean isNightly() {

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

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.spark.AbstractIntegrationTest;
 import com.marklogic.spark.ConnectorException;
 import com.marklogic.spark.Options;
 import com.marklogic.spark.writer.AbstractWriteTest;

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

@@ -37,7 +37,7 @@ void wayTooManyPartitions() {
     @Test
     void zeroPartitions() {
         Dataset<Row> dataset = readAuthors(0);
-        ConnectorException ex = assertThrows(ConnectorException.class, () -> dataset.count());
+        assertThrows(ConnectorException.class, () -> dataset.count());
     }
 
     @Test

src/test/java/com/marklogic/spark/reader/optic/AnalyzePlanTest.java

@@ -10,8 +10,6 @@
 import com.marklogic.client.row.RawQueryDSLPlan;
 import com.marklogic.client.row.RowManager;
 import com.marklogic.spark.AbstractIntegrationTest;
-import com.marklogic.spark.reader.optic.PlanAnalysis;
-import com.marklogic.spark.reader.optic.PlanAnalyzer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -47,7 +45,7 @@ void setup() {
         "5,15"
     })
     void partitionCountAndBatchSize(long partitionCount, long batchSize) {
-        logger.info(partitionCount + ":" + batchSize);
+        logger.info("{}:{}", partitionCount, batchSize);
 
         PlanAnalysis planAnalysis = analyzePlan(partitionCount, batchSize);
         verifyBucketsCoverAllUnsignedLongs(planAnalysis);
@@ -58,8 +56,6 @@ private PlanAnalysis analyzePlan(long partitionCount, long batchSize) {
         RawQueryDSLPlan userPlan = rowManager.newRawQueryDSLPlan(new StringHandle("op.fromView('Medical', 'Authors').select(['LastName', 'rowID'])"));
         PlanAnalyzer partitioner = new PlanAnalyzer((DatabaseClientImpl) getDatabaseClient());
         PlanAnalysis planAnalysis = partitioner.analyzePlan(userPlan.getHandle(), partitionCount, batchSize);
-//        System.out.println("BUCKET COUNT: " + planAnalysis.getAllBuckets().size());
-//        System.out.println(planAnalysis.boundedPlan.toPrettyString());
         assertEquals(partitionCount, planAnalysis.getPartitions().size());
         return planAnalysis;
     }
@@ -96,7 +92,6 @@ private void verifyAllFifteenAuthorsAreReturned(PlanAnalysis planAnalysis) {
         JacksonHandle initialHandle = new JacksonHandle();
         runPlan(planAnalysis, planAnalysis.getPartitions().get(0).getBuckets().get(0), initialHandle);
         final long serverTimestamp = initialHandle.getServerTimestamp();
-//        System.out.println("ST: " + serverTimestamp);
         // Now run the plan on each bucket and keep track of the total number of rows returned.
         // This uses a thread pool solely to improve the performance of the test.
         ExecutorService executor = Executors.newFixedThreadPool(planAnalysis.getAllBuckets().size());
@@ -114,15 +109,12 @@ private void verifyAllFifteenAuthorsAreReturned(PlanAnalysis planAnalysis) {
                     if (result != null) {
                         JsonNode rows = result.get("rows");
                         for (int i = 0; i < rows.size(); i++) {
-//                            System.out.println(rows.get(i).toPrettyString());
                             String name = rows.get(i).get("Medical.Authors.LastName").get("value").asText();
                             names.add(name);
                             bucketNames.add(name + ":" + rows.get(i).get("Medical.Authors.rowid").get("value").asText());
                         }
-                        // Scarsbrick:14992830574179162536:4435912200092073691
                         returnedRowCount.addAndGet(rows.size());
                     }
-//                    System.out.println(bucket + ": " + bucketNames);
                 }));
             }
         }
@@ -136,8 +128,6 @@ private void verifyAllFifteenAuthorsAreReturned(PlanAnalysis planAnalysis) {
             }
         });
 
-//        System.out.println("NAMES: " + names);
-//        System.out.println("NAME COUNT: " + names.size());
         assertEquals(15, returnedRowCount.get(),
             "All 15 author rows should have been returned; we can't assume how many will be in a bucket since the " +
                 "row ID of each row is random, we just know we should get 15 back.");

src/test/java/com/marklogic/spark/reader/optic/PerformanceTester.java

@@ -22,8 +22,6 @@ class PerformanceTester {
     public static void main(String[] args) {
         final int sparkConcurrentTaskCount = 16;
         final String query = "op.fromView('demo','employee')";
-//        final String query = "op.fromView('demo','employee').where(op.eq(op.col('job_description'), 'Technician'))";
-//        final String query = "op.fromView('demo', 'employee').where(op.le(op.col('person_id'), 8))";
         final long partitionCount = 8;
         final long batchSize = 100000;
 
@@ -48,6 +46,5 @@ public static void main(String[] args) {
         long duration = System.currentTimeMillis() - now;
         logger.info("Duration: {}; row count: {}; rows per second: {}", duration, count,
             (double) count / ((double) duration / 1000));
-//        rows.forEach(row -> logger.info(row.prettyJson()));
     }
 }

src/test/java/com/marklogic/spark/reader/optic/PushDownGroupByCountTest.java

@@ -4,7 +4,6 @@
 package com.marklogic.spark.reader.optic;
 
 import com.marklogic.spark.Options;
-import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Row;
 import org.junit.jupiter.api.Test;
 

src/test/java/com/marklogic/spark/reader/optic/PushDownGroupByMaxTest.java

@@ -12,7 +12,6 @@
 
 import static org.apache.spark.sql.functions.max;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class PushDownGroupByMaxTest extends AbstractPushDownTest {