You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/09/13 00:37:32 UTC

[03/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch

ACCUMULO-3119 Cleanup javadocs in 1.5.x branch


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b56159c

Branch: refs/heads/master
Commit: 9b56159c10f52a549aa20da12ead855a9155ade8
Parents: 7699e1f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:02:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:02:24 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/BatchScanner.java       |  1 -
 .../core/client/impl/OfflineScanner.java         | 13 -------------
 .../client/impl/TabletServerBatchWriter.java     |  3 ---
 .../accumulo/core/file/BloomFilterLayer.java     |  1 -
 .../accumulo/core/file/rfile/bcfile/BCFile.java  |  3 ---
 .../accumulo/core/file/rfile/bcfile/Chunk.java   |  3 ---
 .../accumulo/core/file/rfile/bcfile/TFile.java   | 13 -------------
 .../core/client/mock/MockConnectorTest.java      |  2 --
 .../simple/client/RandomBatchScanner.java        |  1 -
 .../examples/simple/client/RowOperations.java    | 19 -------------------
 .../simple/mapreduce/TeraSortIngest.java         |  2 --
 .../java/org/apache/accumulo/fate/TStore.java    |  2 --
 .../apache/accumulo/fate/zookeeper/ZooLock.java  |  2 --
 .../server/gc/GarbageCollectWriteAheadLogs.java  |  4 ----
 .../accumulo/server/metanalysis/FindTablet.java  |  6 ------
 .../accumulo/server/metanalysis/PrintEvents.java |  7 -------
 .../apache/accumulo/server/monitor/Monitor.java  |  3 ---
 .../server/security/SecurityOperation.java       |  5 -----
 .../server/tabletserver/MemoryManager.java       |  2 --
 .../server/tabletserver/TabletServer.java        |  3 ---
 .../tabletserver/log/TabletServerLogger.java     |  1 -
 .../apache/accumulo/server/util/Initialize.java  |  3 ---
 .../org/apache/accumulo/server/util/ZooZap.java  |  3 ---
 .../accumulo/server/master/TestMergeState.java   |  6 ------
 .../start/classloader/AccumuloClassLoader.java   |  5 -----
 .../test/functional/SparseColumnFamilyTest.java  |  6 ------
 .../apache/accumulo/test/randomwalk/Module.java  |  1 -
 .../accumulo/test/randomwalk/bulk/Verify.java    |  4 ----
 28 files changed, 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
    * <p>
    * If not set, there is not timeout. The BatchScanner will retry forever.
    * 
-   * @param timeout
    * @param timeUnit
    *          determines how timeout is interpreted
    * @since 1.5.0

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 1132e74..80d2c4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -167,12 +167,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     }
   }
   
-  /**
-   * @throws TableNotFoundException
-   * @throws IOException
-   * @throws AccumuloException
-   * 
-   */
   private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
     
     Range nextRange = null;
@@ -274,13 +268,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     return new Pair<KeyExtent,String>(extent, location);
   }
   
-  /**
-   * @param absFiles
-   * @return
-   * @throws AccumuloException
-   * @throws TableNotFoundException
-   * @throws IOException
-   */
   private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
       IOException {
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 5b24f4a..f1af7e4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -543,9 +543,6 @@ public class TabletServerBatchWriter {
   
   /**
    * Add mutations that previously failed back into the mix
-   * 
-   * @param mutationsprivate
-   *          static final Logger log = Logger.getLogger(TabletServerBatchWriter.class);
    */
   private synchronized void addFailedMutations(MutationSet failedMutations) throws Exception {
     mutations.addAll(failedMutations);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 01485d3..af3bf5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -286,7 +286,6 @@ public class BloomFilterLayer {
      * @param range
      *          range of keys to check
      * @return false iff key doesn't exist, true if key probably exists.
-     * @throws IOException
      */
     boolean probablyHasKey(Range range) throws IOException {
       if (bloomFilter == null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 7d15851..aeafe4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -145,7 +145,6 @@ public final class BCFile {
        * Get the current position in file.
        * 
        * @return The current byte offset in underlying file.
-       * @throws IOException
        */
       long getCurrentPos() throws IOException {
         return fsOut.getPos() + fsBufferedOutput.size();
@@ -157,8 +156,6 @@ public final class BCFile {
       
       /**
        * Current size of compressed data.
-       * 
-       * @throws IOException
        */
       long getCompressedSize() throws IOException {
         long ret = getCurrentPos() - posStart;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
index 345d406..abb1798 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
@@ -239,7 +239,6 @@ final class Chunk {
      *          The chunk buffer.
      * @param offset
      *          Offset to chunk buffer for the beginning of chunk.
-     * @param len
      * @param last
      *          Is this the last call to flushBuffer?
      */
@@ -280,8 +279,6 @@ final class Chunk {
      * Flush the internal buffer.
      * 
      * Is this the last call to flushBuffer?
-     * 
-     * @throws java.io.IOException
      */
     private void flushBuffer() throws IOException {
       if (count > 0) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
index b7a927b..7b9be44 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
@@ -544,8 +544,6 @@ public class TFile {
     
     /**
      * Check if we need to start a new data block.
-     * 
-     * @throws IOException
      */
     private void initDataBlock() throws IOException {
       // for each new block, get a new appender
@@ -559,7 +557,6 @@ public class TFile {
      * 
      * @param bForceFinish
      *          Force the closure regardless of the block size.
-     * @throws IOException
      */
     void finishDataBlock(boolean bForceFinish) throws IOException {
       if (blkAppender == null) {
@@ -777,8 +774,6 @@ public class TFile {
     
     /**
      * Lazily loading the TFile index.
-     * 
-     * @throws IOException
      */
     synchronized void checkTFileDataIndex() throws IOException {
       if (tfileIndex == null) {
@@ -866,7 +861,6 @@ public class TFile {
      *          the input key
      * @param greater
      *          boolean flag
-     * @throws IOException
      */
     Location getBlockContainsKey(RawComparable key, boolean greater) throws IOException {
       if (!isSorted()) {
@@ -1040,7 +1034,6 @@ public class TFile {
        *          Begin location of the scan.
        * @param end
        *          End location of the scan.
-       * @throws IOException
        */
       Scanner(Reader reader, Location begin, Location end) throws IOException {
         this.reader = reader;
@@ -1139,7 +1132,6 @@ public class TFile {
        * 
        * @param l
        *          new cursor location. It must fall between the begin and end location of the scanner.
-       * @throws IOException
        */
       private void seekTo(Location l) throws IOException {
         if (l.compareTo(beginLocation) < 0) {
@@ -1268,8 +1260,6 @@ public class TFile {
       
       /**
        * Load a compressed block for reading. Expecting blockIndex is valid.
-       * 
-       * @throws IOException
        */
       private void initBlock(int blockIndex) throws IOException {
         klen = -1;
@@ -1350,7 +1340,6 @@ public class TFile {
        * @param other
        *          user-specified key.
        * @return negative if key at cursor is smaller than user key; 0 if equal; and positive if key at cursor greater than user key.
-       * @throws IOException
        */
       int compareCursorKeyTo(RawComparable other) throws IOException {
         checkKey();
@@ -1641,7 +1630,6 @@ public class TFile {
        * 
        * @param n
        *          Number of key-value pairs to skip in block.
-       * @throws IOException
        */
       private void inBlockAdvance(long n) throws IOException {
         for (long i = 0; i < n; ++i) {
@@ -1662,7 +1650,6 @@ public class TFile {
        * @param greater
        *          advance until we find a key greater than the input key.
        * @return true if we find a equal key.
-       * @throws IOException
        */
       private boolean inBlockAdvance(RawComparable key, boolean greater) throws IOException {
         int curBid = currentLocation.getBlockIndex();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 71352ee..e0485a6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -260,8 +260,6 @@ public class MockConnectorTest {
    *          Table to check
    * @param count
    *          number of entries to expect in the table
-   * @param count
-   *          number of rows the table should contain
    */
   private void checkRemaining(Connector c, String tableName, int count) throws Exception {
     Scanner scanner = c.createScanner(tableName, Constants.NO_AUTHS);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index a3bcf62..bf927e7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -114,7 +114,6 @@ public class RandomBatchScanner {
   /**
    * Prints a count of the number of rows mapped to false.
    * 
-   * @param expectedRows
    * @return boolean indicating "were all the rows found?"
    */
   private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 2c0a58b..00ab21c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.examples.simple.client;
 
-import java.io.IOException;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
@@ -166,12 +165,6 @@ public class RowOperations {
   
   /**
    * Deletes a row given a text object
-   * @param opts 
-   * 
-   * @param row
-   * @throws TableNotFoundException
-   * @throws AccumuloSecurityException
-   * @throws AccumuloException
    */
   private static void deleteRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     deleteRow(getRow(opts, scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
   
   /**
    * Deletes a row, given a Scanner of JUST that row
-   * 
-   * @param scanner
    */
   private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
     Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
   
   /**
    * Just a generic print function given an iterator. Not necessarily just for printing a single row
-   * 
-   * @param scanner
    */
   private static void printRow(Scanner scanner) {
     // iterates through and prints
@@ -209,14 +198,6 @@ public class RowOperations {
   
   /**
    * Gets a scanner over one row
-   * @param opts 
-   * 
-   * @param row
-   * @return
-   * @throws TableNotFoundException
-   * @throws AccumuloSecurityException
-   * @throws AccumuloException
-   * @throws IOException
    */
   private static Scanner getRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     // Create a scanner

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index bdcf943..30bc656 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -299,8 +299,6 @@ public class TeraSortIngest extends Configured implements Tool {
     
     /**
      * Add the rowid to the row.
-     * 
-     * @param rowId
      */
     private Text getRowIdString(long rowId) {
       Text paddedRowIdString = new Text();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
 
   /**
    * Remove the last pushed operation from the given transaction.
-   * 
-   * @param tid
    */
   void pop(long tid);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 03e159f..960ba50 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
     
     /**
      * lost the ability to monitor the lock node, and its status is unknown
-     * 
-     * @param e
      */
     void unableToMonitorLockNode(Throwable e);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index eddedc9..0992eae 100644
--- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -285,10 +285,6 @@ public class GarbageCollectWriteAheadLogs {
     return sortedWALogs;
   }
 
-  /**
-   * @param name
-   * @return
-   */
   static private boolean isUUID(String name) {
     try {
       UUID.fromString(name);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
index f7e5de9..41b15e6 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
@@ -49,12 +49,6 @@ public class FindTablet {
     findContainingTablets(opts);
   }
 
-  /**
-   * @param conn
-   * @param tablePrefix
-   * @param tableID
-   * @param option
-   */
   private static void findContainingTablets(Opts opts) throws Exception {
     Range range = new KeyExtent(new Text(opts.tableId), null, null).toMetadataRange();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
index 0478d83..5bb0171 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
@@ -61,13 +61,6 @@ public class PrintEvents {
     printEvents(conn, opts.tableId, opts.endRow, opts.time);
   }
   
-  /**
-   * @param conn
-   * @param tablePrefix
-   * @param tableId
-   * @param endRow
-   * @param time
-   */
   private static void printEvents(Connector conn, String tableId, String endRow, Long time) throws Exception {
     Scanner scanner = conn.createScanner("tabletEvents", new Authorizations());
     String metaRow = tableId + (endRow == null ? "<" : ";" + endRow);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 00bd3ca..225e249 100644
--- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -541,9 +541,6 @@ public class Monitor {
 
   /**
    * Get the monitor lock in ZooKeeper
-   * 
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   private void getMonitorLock() throws KeeperException, InterruptedException {
     final String zRoot = ZooUtil.getRoot(instance);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 2d70796..e562f7c 100644
--- a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -178,11 +178,6 @@ public class SecurityOperation {
     }
   }
 
-  /**
-   * @param toAuth
-   * @return
-   * @throws AccumuloSecurityException
-   */
   private AuthenticationToken reassembleToken(TCredentials toAuth) throws AccumuloSecurityException {
     String tokenClass = toAuth.getTokenClassName();
     if (authenticator.validTokenClass(tokenClass)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
   
   /**
    * Initialize the memory manager.
-   * 
-   * @param conf
    */
   void init(ServerConfiguration conf);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 73834e3..a730d9f 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -396,10 +396,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
     
     /**
      * while a session is reserved, it cannot be canceled or removed
-     * 
-     * @param sessionId
      */
-    
     synchronized Session reserveSession(long sessionId) {
       Session session = sessions.get(sessionId);
       if (session != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
index d3c09f8..a638540 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
@@ -95,7 +95,6 @@ public class TabletServerLogger {
    *          lock to use
    * @param code
    *          a test/work pair
-   * @throws IOException
    */
   private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
     // Get a read lock

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index ce26ff5..0d66af8 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -238,9 +238,6 @@ public class Initialize {
     return true;
   }
 
-  /**
-   * @return
-   */
   private static boolean zookeeperAvailable() {
     try {
       return zoo.exists("/");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
   
   static boolean verbose = false;
   
-  /**
-   * @param args
-   */
   private static void message(String msg) {
     if (verbose)
       System.out.println(msg);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
index 80b8d68..94df69c 100644
--- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
+++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
@@ -176,12 +176,6 @@ public class TestMergeState {
     
   }
   
-  /**
-   * @param state
-   * @param metaDataStateStore
-   * @param locations
-   * @return
-   */
   private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
     MergeStats stats = new MergeStats(state.mergeInfo);
     stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 1e2b4b5..bcfa830 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -88,7 +88,6 @@ public class AccumuloClassLoader {
    * 
    * @param d
    *          XMLDocument to search through
-   * @param propertyName
    */
   private static String getAccumuloClassPathStrings(Document d, String propertyName) {
     NodeList pnodes = d.getElementsByTagName("property");
@@ -157,10 +156,6 @@ public class AccumuloClassLoader {
   
   /**
    * Populate the list of URLs with the items in the classpath string
-   * 
-   * @param classpath
-   * @param urls
-   * @throws MalformedURLException
    */
   private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
     classpath = classpath.trim();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
index 4a0a708..af6eaee 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
@@ -98,12 +98,6 @@ public class SparseColumnFamilyTest extends FunctionalTest {
     }
   }
   
-  /**
-   * @param i
-   * @param j
-   * @param k
-   * @return
-   */
   private Mutation nm(int row, int cf, int val) {
     Mutation m = new Mutation(String.format("%06d", row));
     m.put(String.format("%03d", cf), "", "" + val);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index fadcb66..61177ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
      * Chooses a random neighbor node
      * 
      * @return Node or null if no edges
-     * @throws Exception
      */
     private String randomNeighbor() throws Exception {
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
     }
   }
   
-  /**
-   * @param startBadEntry
-   * @param lastBadEntry
-   */
   private static void report(Text startBadRow, Text lastBadRow, Value value) {
     System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
     System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");