javadoc/imports formatting updates

ace-am/src/main/java/edu/umiacs/ace/driver/FileBean.java

@@ -83,7 +83,6 @@ public class FileBean {
      * [0] /1k-10/d7/file-19
      * [1] /1k-10/d7
      * [2] /1k-10
-     * @param parentPathList
      */
     public void setPathList( String[] pathList ) {
         if ( pathList != null ) {

ace-am/src/main/java/edu/umiacs/ace/driver/irods/IrodsHandler.java

@@ -36,11 +36,12 @@ import edu.umiacs.ace.driver.filter.PathFilter;
 import edu.umiacs.ace.util.HashValue;
 import edu.umiacs.irods.operation.BulkFileHandler;
 import edu.umiacs.srb.util.StringUtil;
+import org.apache.log4j.Logger;
+
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
 
 /**
  *
@@ -61,7 +62,6 @@ public class IrodsHandler implements BulkFileHandler {
      * @param readyList
      * @param filter
      * @param digestAlgorithm
-     * @param base prefix to add to returned files (no trailing /)
      */
     public IrodsHandler( LinkedBlockingQueue<FileBean> readyList,
             PathFilter filter, String digestAlgorithm ) {

ace-am/src/main/java/edu/umiacs/ace/driver/swap/SwapSettings.java

@@ -133,7 +133,6 @@ public class SwapSettings implements Serializable {
     }
 
     /**
-     * @param server the server to set
      */
     public void setServers( String servers ) {
         this.servers = servers;

ace-am/src/main/java/edu/umiacs/ace/monitor/audit/TokenAuditCallback.java

@@ -31,20 +31,20 @@
 package edu.umiacs.ace.monitor.audit;
 
 import edu.umiacs.ace.ims.api.ValidationCallback;
-import edu.umiacs.ace.util.PersistUtil;
+import edu.umiacs.ace.monitor.core.Collection;
 import edu.umiacs.ace.monitor.core.MonitoredItem;
 import edu.umiacs.ace.monitor.core.Token;
-import edu.umiacs.ace.monitor.log.LogEventManager;
-import java.util.Date;
-import java.util.Map;
-import edu.umiacs.ace.ims.ws.TokenResponse;
-import edu.umiacs.ace.monitor.core.Collection;
 import edu.umiacs.ace.monitor.log.LogEnum;
+import edu.umiacs.ace.monitor.log.LogEventManager;
 import edu.umiacs.ace.token.AceToken;
+import edu.umiacs.ace.util.PersistUtil;
 import edu.umiacs.util.Strings;
+import org.apache.log4j.Logger;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
-import org.apache.log4j.Logger;
+import java.util.Date;
+import java.util.Map;
 
 /**
  *
@@ -89,7 +89,6 @@ public final class TokenAuditCallback implements ValidationCallback {
         // trans.commit();
         em.close();
         cancel.cancel();
-
     }
 
     @Override

ace-am/src/main/java/edu/umiacs/ace/monitor/log/LogServlet.java

@@ -31,16 +31,12 @@
 
 package edu.umiacs.ace.monitor.log;
 
+import edu.umiacs.ace.monitor.core.Collection;
 import edu.umiacs.ace.util.EntityManagerServlet;
 import edu.umiacs.ace.util.PersistUtil;
-import edu.umiacs.ace.monitor.core.Collection;
 import edu.umiacs.util.Strings;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.log4j.Logger;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.servlet.RequestDispatcher;
@@ -48,7 +44,12 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Event log querying servlet

ace-am/src/main/java/edu/umiacs/ace/monitor/register/IngestThread.java

@@ -43,7 +43,8 @@ import edu.umiacs.ace.util.TokenUtil;
 import edu.umiacs.util.Strings;
 import org.apache.log4j.Logger;
 
-import java.text.DecimalFormat;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -51,8 +52,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.RecursiveAction;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
 
 /**
  * A recursive action for fork join pools. Splits its work up to worker threads
@@ -143,9 +142,9 @@ public class IngestThread extends RecursiveAction {
     }
 
     public void run() {
-        updatedTokens = new HashSet<String>();
-        newTokens = new HashSet<String>();
-        unchangedTokens = new HashSet<String>();
+        updatedTokens = new HashSet<>();
+        newTokens = new HashSet<>();
+        unchangedTokens = new HashSet<>();
         MonitoredItemManager mim = new MonitoredItemManager(em);
         MonitoredItem item = null;
         session = System.currentTimeMillis();
@@ -249,7 +248,7 @@ public class IngestThread extends RecursiveAction {
             String path, Collection coll) {
         // We don't have a FileBean, so build the pathList ourselves
         StringBuilder fullPath = new StringBuilder(path);
-        List <String> pathList = new LinkedList<String>();
+        List <String> pathList = new LinkedList<>();
         int index = 0;
         if (fullPath.charAt(0) != '/') {
             fullPath.insert(0, "/");

ace-ims-ejb/src/main/java/edu/umiacs/ace/ims/witness/WitnessBean.java

@@ -15,12 +15,7 @@ import edu.umiacs.ace.ims.tokenclass.TokenClassLocal;
 import edu.umiacs.ace.util.HashValue;
 import edu.umiacs.sql.SQL;
 import edu.umiacs.util.Check;
-import java.security.MessageDigest;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
+
 import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -31,6 +26,12 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 import javax.sql.DataSource;
+import java.security.MessageDigest;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
 
 /**
  *
@@ -182,9 +183,6 @@ public class WitnessBean implements WitnessLocal
      * Regenerate a witness proof tree for a given token class that includes
      * the round range that was described
      * 
-     * @param tokenClassName
-     * @param startRound
-     * @param finishRound
      * @return
      */
     public HashTree generateWitnessHashTree(Witness witness)

ace-ims-ejb/src/main/java/edu/umiacs/ace/server/exception/ACEFault.java

@@ -18,7 +18,6 @@ public class ACEFault extends Exception
     
     /**
      * Constructs an instance of <code>ACEFault</code> with the specified detail message.
-     * @param msg the detail message.
      */
     public ACEFault(Exception e) 
     {

ace-ims-server/src/main/java/edu/umiacs/ace/server/exception/ACEFault.java

@@ -18,7 +18,6 @@ public class ACEFault extends Exception
     
     /**
      * Constructs an instance of <code>ACEFault</code> with the specified detail message.
-     * @param msg the detail message.
      */
     public ACEFault(Exception e) 
     {

ace-ims-war/src/main/java/edu/umiacs/ace/ims/processor/WitnessValidation.java

@@ -15,14 +15,15 @@ import edu.umiacs.ace.ims.ws.RoundResponse;
 import edu.umiacs.ace.server.ServiceLocator;
 import edu.umiacs.ace.server.exception.InvalidParameterException;
 import edu.umiacs.ace.util.HashValue;
+import org.apache.log4j.Logger;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBException;
+import javax.persistence.NoResultException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.persistence.NoResultException;
-import org.apache.log4j.Logger;
 
 /**
  * Class for generating proofs linking supplied rounds to witness values
@@ -120,7 +121,6 @@ public class WitnessValidation
     /**
      * Test to see if we've loaded the witness yet. If we have, update the cache to
      * reflect that.
-     * @param l roundId to look for
      * @param rs
      * @return
      */

audit-core/src/main/java/edu/umiacs/ace/audit/AuditSource.java

@@ -4,9 +4,6 @@
  */
 package edu.umiacs.ace.audit;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 /**
  *
  * @author toaster
@@ -111,7 +108,6 @@ public abstract class AuditSource {
      * the preferred request.
      * 
      * Default implementation is a no-op.
-     * @param auditPolicy preferred items that should be available after this completes
      */
     public void queueNext(int preferred) {
     }