fixup from static analysis #1159

ehennum · ehennum · commit a7615c1059b4 · 2019-11-19T15:30:42.000-08:00
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java b/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java
@@ -158,14 +158,17 @@ public HostnameVerifierAdapter(SSLHostnameVerifier verifier) {
     	/**
     	 * verify method verifies the incoming hostname and SSLSession.
     	 * @param hostname denotes the hostname.
-    	 * @param session represents the SSLSession containing the pper certificates.
+    	 * @param session represents the SSLSession containing the peer certificates.
     	 * @return true if the hostname and peer certificates are valid and false if they are invalid.
     	 * */
     	@Override
     	public boolean verify(String hostname, SSLSession session) {
     		try {
     			Certificate[] certificates = session.getPeerCertificates();
-	            verify(hostname, (X509Certificate) certificates[0]);
+	            verify(
+	                hostname,
+                    (X509Certificate) ((certificates == null || certificates.length == 0) ? null : certificates[0])
+                );
 	            return true;
 	          } catch(SSLException e) {
 	            return false;
@@ -1496,11 +1499,11 @@ static public class Bean implements Serializable {
     private           String                password;
     private           Authentication        authentication;
     private           String                externalName;
-    private           SecurityContext       securityContext;
     private           DatabaseClient.ConnectionType connectionType;
-    private           HandleFactoryRegistry handleRegistry =
-      HandleFactoryRegistryImpl.newDefault();
 
+    transient private SecurityContext       securityContext;
+    transient private HandleFactoryRegistry handleRegistry =
+      HandleFactoryRegistryImpl.newDefault();
     transient private SSLContext            context;
     transient private SSLHostnameVerifier   verifier;
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java
@@ -21,10 +21,7 @@
 import javax.xml.bind.DatatypeConverter;
 import javax.xml.datatype.Duration;
 
-import com.marklogic.client.FailedRequestException;
-import com.marklogic.client.ForbiddenUserException;
-import com.marklogic.client.ResourceNotFoundException;
-import com.marklogic.client.Transaction;
+import com.marklogic.client.*;
 import com.marklogic.client.bitemporal.TemporalDescriptor;
 import com.marklogic.client.document.DocumentDescriptor;
 import com.marklogic.client.document.DocumentManager;
@@ -68,8 +65,9 @@ public String toString() {
           return "noWipe";
         case NOUPDATE:
           return "noUpdate";
+        default:
+          throw new MarkLogicInternalException("Unknown enumeration");
       }
-      return null;
     }
   }
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java
@@ -19,6 +19,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -97,6 +98,9 @@ public void initializeListener(QueryBatcher queryBatcher) {
   @Override
   public void processEvent(QueryBatch batch) {
     try {
+      if (batch.getClient() == null) {
+        throw new IllegalStateException("null DatabaseClient");
+      }
       batch.getClient().newDocumentManager().delete( batch.getItems() );
     } catch (Throwable t) {
       for ( BatchFailureListener<Batch<String>> listener : failureListeners ) {
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java
@@ -24,14 +24,12 @@
 import com.marklogic.client.io.Format;
 import com.marklogic.client.query.QueryManager;
 
+import com.marklogic.client.query.StructuredQueryDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.*;
 import java.util.function.Consumer;
-import java.util.List;
-import java.util.Set;
 
 /**
  * <p>Reads document contents (and optionally metadata) for each batch, then sends
@@ -87,6 +85,9 @@ public ExportListener() {
   }
 
   protected DocumentPage getDocs(QueryBatch batch) {
+    if (batch.getClient() == null) {
+      throw new IllegalStateException("null DatabaseClient");
+    }
     GenericDocumentManager docMgr = batch.getClient().newDocumentManager();
     if ( view              != null ) docMgr.setSearchView(view);
     if ( categories        != null ) docMgr.setMetadataCategories(categories);
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java
@@ -139,6 +139,9 @@ public ExtractRowsViaTemplateListener onFailure(BatchFailureListener<QueryBatch>
 
   @Override
   public void initializeListener(QueryBatcher queryBatcher) {
+    if (queryBatcher.getPrimaryClient() == null) {
+      throw new IllegalStateException("null DatabaseClient");
+    }
     pb = queryBatcher.getPrimaryClient().newRowManager().newPlanBuilder();
   }
 
@@ -185,6 +188,9 @@ public void processEvent(QueryBatch batch) {
    * create an iterator out of it.
    */
   private Iterable<TypedRow> getTypedRows(QueryBatch batch) throws IOException {
+    if (batch.getClient() == null) {
+      throw new IllegalStateException("null DatabaseClient");
+    }
     StringHandle uris = new StringHandle(String.join("\n", batch.getItems()))
       .withMimetype("text/uri-list");
     RESTServices services = ((DatabaseClientImpl) batch.getClient()).getServices();
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java
@@ -16,7 +16,6 @@
 package com.marklogic.client.datamovement;
 
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.FailedRetryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,11 +25,7 @@
 import java.net.UnknownHostException;
 import javax.net.ssl.SSLException;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.concurrent.Executors;
@@ -83,6 +78,9 @@ public RetryListener(QueryBatchListener queryBatchListener) {
 
     @Override
     public void processFailure(QueryBatch batch, Throwable throwable) {
+      if (batch.getClient() == null) {
+        throw new IllegalStateException("null DatabaseClient");
+      }
       boolean isHostUnavailableException = processException(batch.getBatcher(), throwable, batch.getClient().getHost());
       if ( isHostUnavailableException == true ) {
         try {
@@ -191,6 +189,9 @@ public int getMinHosts() {
    * @param throwable the exception
    */
   public void processFailure(WriteBatch batch, Throwable throwable) {
+    if (batch.getClient() == null) {
+      throw new IllegalStateException("null DatabaseClient");
+    }
     boolean isHostUnavailableException = processException(batch.getBatcher(), throwable, batch.getClient().getHost());
     if ( isHostUnavailableException == true ) {
       try {
@@ -211,6 +212,9 @@ public void processFailure(WriteBatch batch, Throwable throwable) {
    * @param queryBatch the exception with information about the failed query attempt
    */
   public void processFailure(QueryBatchException queryBatch) {
+    if (queryBatch.getClient() == null) {
+      throw new IllegalStateException("null DatabaseClient");
+    }
     boolean isHostUnavailableException = processException(queryBatch.getBatcher(), queryBatch, queryBatch.getClient().getHost());
     if ( isHostUnavailableException == true ) {
       try {
@@ -271,7 +275,7 @@ private boolean processForestHostException(Batcher batcher, Throwable throwable,
           List<String> availableHosts = Stream.of(preferredHosts)
             .filter( (availableHost) -> ! availableHost.equals(host) )
             .collect(Collectors.toList());
-          int randomPos = Math.abs(host.hashCode()) % availableHosts.size();
+          int randomPos = new Random().nextInt(availableHosts.size());
           String randomAvailableHost = availableHosts.get(randomPos);
           filteredForestConfig = filteredForestConfig.withRenamedHost(host, randomAvailableHost);
         }
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java
@@ -47,6 +47,9 @@ public Calendar getTimestamp() {
   }
 
   public BatchEventImpl withTimestamp(Calendar timestamp) {
+    if (timestamp == null) {
+      timestamp = Calendar.getInstance();
+    }
     this.timestamp = timestamp;
     return this;
   }
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java
@@ -26,7 +26,6 @@ public abstract class BatcherImpl implements Batcher {
   private int batchSize = 100;
   private int threadCount = 1;
   private ForestConfiguration forestConfig;
-  private DatabaseClient client;
   private DataMovementManagerImpl moveMgr;
 
   protected BatcherImpl(DataMovementManager moveMgr){
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java
@@ -33,17 +33,16 @@ public class JobReportImpl implements JobReport {
   static public JobReportImpl about(JobTicketImpl ticket) {
     BatcherImpl       batcher = ticket.getBatcher();
     JobTicket.JobType jobType = ticket.getJobType();
+    if (jobType == null) {
+      throw new InternalError("null job type");
+    }
     switch(jobType) {
       case QUERY_BATCHER:
         return new JobReportImpl((QueryBatcher) batcher);
       case WRITE_BATCHER:
         return new JobReportImpl((WriteBatcher) batcher);
       default:
-        throw new InternalError(
-                (jobType == null) ?
-                        "null job type" :
-                        "unknown job type: "+jobType.name()
-        );
+        throw new InternalError("unknown job type: "+jobType.name());
     }
   }
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java
@@ -39,15 +39,15 @@ public JobType getJobType() {
 
   @Override
   public BatcherImpl getBatcher() {
-    switch(this.jobType) {
+    JobType jobType = getJobType();
+    if (jobType == null) {
+      throw new InternalError("null job type");
+    }
+    switch(jobType) {
       case QUERY_BATCHER: return getQueryBatcher();
       case WRITE_BATCHER: return getWriteBatcher();
       default:
-        throw new InternalError(
-                (jobType == null) ?
-                        "null job type" :
-                        "unknown job type: "+jobType.name()
-        );
+        throw new InternalError("unknown job type: "+jobType.name());
     }
   }
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java
@@ -41,15 +41,7 @@
 import com.marklogic.client.impl.QueryManagerImpl;
 import com.marklogic.client.impl.UrisHandle;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.TimeUnit;
@@ -93,10 +85,8 @@ public class QueryBatcherImpl extends BatcherImpl implements QueryBatcher {
   private long maxBatches = Long.MAX_VALUE;
 
   public QueryBatcherImpl(QueryDefinition query, DataMovementManager moveMgr, ForestConfiguration forestConfig) {
-    super(moveMgr);
+    this(moveMgr, forestConfig);
     this.query = query;
-    withForestConfig(forestConfig);
-    withBatchSize(1000);
     if (query instanceof RawQueryDefinition) {
       RawQueryDefinition rawQuery = (RawQueryDefinition) query;
 
@@ -118,10 +108,12 @@ public QueryBatcherImpl(QueryDefinition query, DataMovementManager moveMgr, Fore
       }
     }
   }
-
   public QueryBatcherImpl(Iterator<String> iterator, DataMovementManager moveMgr, ForestConfiguration forestConfig) {
-    super(moveMgr);
+    this(moveMgr, forestConfig);
     this.iterator = iterator;
+  }
+  private QueryBatcherImpl(DataMovementManager moveMgr, ForestConfiguration forestConfig) {
+    super(moveMgr);
     withForestConfig(forestConfig);
     withBatchSize(1000);
   }
@@ -470,7 +462,7 @@ private synchronized void calculateDeltas(Set<Forest> oldForests, Forest[] fores
       DataMovementManagerImpl moveMgrImpl = getMoveMgr();
       String primaryHost = moveMgrImpl.getPrimaryClient().getHost();
       if ( getHostNames(blackListedForests).contains(primaryHost) ) {
-        int randomPos = Math.abs(primaryHost.hashCode()) % clientList.get().size();
+        int randomPos = new Random().nextInt(clientList.get().size());
         moveMgrImpl.setPrimaryClient(clientList.get().get(randomPos));
       }
     }
@@ -521,9 +513,9 @@ private synchronized void cleanupExistingTasks(Set<Forest> addedForests, Set<For
         for ( QueryTask task : blackListedTaskList ) {
           threadPool.execute(task);
         }
+        // we can clear blackListedTaskList because we have a synchronized lock
+        blackListedTaskList.clear();
       }
-      // we can clear blackListedTaskList because we have a synchronized lock
-      blackListedTaskList.clear();
     }
   }
 
@@ -936,17 +928,18 @@ private class BlockingRunsPolicy implements RejectedExecutionHandler {
      * @param executor the executor attempting to execute this task
      */
     public void rejectedExecution(Runnable runnable, ThreadPoolExecutor executor) {
-      if ( !executor.isShutdown() ) {
-        try {
-          synchronized ( lock ) {
-            if(executor.getQueue().remainingCapacity() == 0) {
-              lock.wait();
-            }
+      if (executor.isShutdown()) {
+        return;
+      }
+      try {
+        synchronized ( lock ) {
+          while (executor.getQueue().remainingCapacity() == 0) {
+            lock.wait();
           }
-        } catch ( InterruptedException e ) {
-          logger.warn("Thread interrupted while waiting for the work queue to become empty" + e);
+          if (!executor.isShutdown()) executor.execute(runnable);
         }
-        if ( !executor.isShutdown() ) executor.execute(runnable);
+      } catch ( InterruptedException e ) {
+        logger.warn("Thread interrupted while waiting for the work queue to become empty" + e);
       }
     }
   }
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java
@@ -16,14 +16,7 @@
 package com.marklogic.client.datamovement.impl;
 
 import java.io.Closeable;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -67,7 +60,6 @@
 import com.marklogic.client.datamovement.WriteBatchListener;
 import com.marklogic.client.datamovement.WriteEvent;
 import com.marklogic.client.datamovement.WriteFailureListener;
-import com.marklogic.client.datamovement.Forest.HostType;
 import com.marklogic.client.datamovement.WriteBatcher;
 
 /**
@@ -543,7 +535,7 @@ private void flush(boolean waitForCompletion) {
     requireNotStopped();
     // drain any docs left in the queue
     List<DocumentWriteOperation> docs = new ArrayList<>();
-    long recordInBatch = batchCounter.getAndSet(0);
+    batchCounter.set(0);
     queue.drainTo(docs);
     logger.info("flushing {} queued docs", docs.size());
     Iterator<DocumentWriteOperation> iter = docs.iterator();
@@ -839,7 +831,7 @@ public synchronized WriteBatcher withForestConfig(ForestConfiguration forestConf
       DataMovementManagerImpl moveMgrImpl = getMoveMgr();
       String primaryHost = moveMgrImpl.getPrimaryClient().getHost();
       if ( removedHostInfos.containsKey(primaryHost) ) {
-        int randomPos = Math.abs(primaryHost.hashCode()) % newHostInfos.length;
+        int randomPos = new Random().nextInt(newHostInfos.length);
         moveMgrImpl.setPrimaryClient(newHostInfos[randomPos].client);
       }
       // since some hosts have been removed, let's remove from the queue any jobs that were targeting that host
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java
@@ -76,7 +76,7 @@ public enum PathLanguage {
     @Override
     public String toString() {
       return super.toString().toLowerCase();
-    };
+    }
 
   }
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java
@@ -212,7 +212,8 @@ public byte[] toBuffer() {
   @Override
   public String toString() {
     try {
-      return new String(toBuffer(),"UTF-8");
+      byte[] buffer = toBuffer();
+      return (buffer == null) ? "" : new String(buffer,"UTF-8");
     } catch (UnsupportedEncodingException e) {
       throw new MarkLogicIOException(e);
     }
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ public Calendar getTimestamp() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public BatchEventImpl withTimestamp(Calendar timestamp) {`
	`50`	`+ if (timestamp == null) {`
	`51`	`+ timestamp = Calendar.getInstance();`
	`52`	`+ }`
`50`	`53`	`this.timestamp = timestamp;`
`51`	`54`	`return this;`
`52`	`55`	`}`