accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/3] accumulo git commit: ACCUMULO-2129 Update javadocs for overridden methods
Date Tue, 07 Apr 2015 01:36:31 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
index 266b638..8710acd 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
@@ -39,6 +39,7 @@ public class SequenceFileIterator implements FileSKVIterator {
   private Key top_key;
   private boolean readValue;
 
+  @Override
   public SequenceFileIterator deepCopy(IteratorEnvironment env) {
     throw new UnsupportedOperationException("SequenceFileIterator does not yet support cloning");
   }
@@ -60,18 +61,22 @@ public class SequenceFileIterator implements FileSKVIterator {
     next();
   }
 
+  @Override
   public Key getTopKey() {
     return top_key;
   }
 
+  @Override
   public Value getTopValue() {
     return top_value;
   }
 
+  @Override
   public boolean hasTop() {
     return top_key != null;
   }
 
+  @Override
   public void next() throws IOException {
     boolean valid;
     if (readValue)
@@ -91,6 +96,7 @@ public class SequenceFileIterator implements FileSKVIterator {
     throw new UnsupportedOperationException("seek() not supported");
   }
 
+  @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
     throw new UnsupportedOperationException();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index ef4003c..f776569 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -70,9 +70,6 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
    */
   public abstract Value rowEncoder(List<Key> keys, List<Value> values) throws IOException;
 
-  /**
-   * Implement deepCopy. Ensure sourceIter is copied appropriately.
-   */
   @Override
   public abstract SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
index 7b8ec9e..0724f0e 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
@@ -86,6 +86,7 @@ public class BlockedInputStream extends InputStream {
   }
 
   // Amount available to read
+  @Override
   public int available() {
     int toRet = writePos + 1 - readPos;
     if (toRet < 0)
@@ -168,6 +169,7 @@ public class BlockedInputStream extends InputStream {
     writePos = -1;
   }
 
+  @Override
   public boolean markSupported() {
     return false;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
index ddfdefd..2d31be4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
@@ -32,6 +32,7 @@ public class DiscardCloseOutputStream extends FilterOutputStream {
     super(out);
   }
 
+  @Override
   public void close() throws IOException {
     // Discard
     log.trace("Discarded close");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index 25d0f32..f13f77e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@ -50,6 +50,7 @@ public class LogEntry {
     this.logSet = new ArrayList<String>(le.logSet);
   }
 
+  @Override
   public String toString() {
     return extent.toString() + " " + filename + " (" + tabletId + ")";
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
index 7a0b6a2..3af0513 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
@@ -32,6 +32,7 @@ public class NamingThreadFactory implements ThreadFactory {
     this.name = name;
   }
 
+  @Override
   public Thread newThread(Runnable r) {
     return new Daemon(new LoggingRunnable(log, r), name + " " + threadNum.getAndIncrement());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/Stat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Stat.java b/core/src/main/java/org/apache/accumulo/core/util/Stat.java
index d2d560e..b7d4165 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Stat.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Stat.java
@@ -68,6 +68,7 @@ public class Stat {
     return sd.getResult();
   }
 
+  @Override
   public String toString() {
     return String.format("%,d %,d %,.2f %,d", getMin(), getMax(), getAverage(), mean.getN());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
index ec20da5..a5f6a8d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.io.Text;
 public class BinaryFormatter extends DefaultFormatter {
   private static int showLength;
 
+  @Override
   public String next() {
     checkState(true);
     return formatEntry(getScannerIterator().next(), isDoTimestamps());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
index 24c2bbc..a99f415 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
@@ -70,6 +70,7 @@ public class TestThrift1474 {
     args.stopTimeoutUnit = TimeUnit.MILLISECONDS;
     final TServer server = new TThreadPoolServer(args.processor(processor));
     Thread thread = new Thread() {
+      @Override
       public void run() {
         server.serve();
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
index 41084e6..6353863 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
-import org.apache.accumulo.core.util.TextUtil;
-import org.apache.hadoop.io.Text;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
+import org.apache.accumulo.core.util.TextUtil;
+import org.apache.hadoop.io.Text;
+
 public class ListLexicoderTest extends AbstractLexicoderTest {
 
   private List<Long> data1 = new ArrayList<Long>();
@@ -32,6 +32,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   private List<Long> data4 = new ArrayList<Long>();
   private List<Long> data5 = new ArrayList<Long>();
 
+  @Override
   public void setUp() {
 
     data1.add(1l);
@@ -49,6 +50,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
     data5.add(2l);
     data5.add(1l);
   }
+
   public void testSortOrder() {
     List<List<Long>> data = new ArrayList<List<Long>>();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
index 125268a..5ff5722 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
@@ -52,26 +52,32 @@ public class IteratorUtilTest {
 
     protected SortedKeyValueIterator<Key,Value> source;
 
+    @Override
     public WrappedIter deepCopy(IteratorEnvironment env) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public Key getTopKey() {
       return source.getTopKey();
     }
 
+    @Override
     public Value getTopValue() {
       return source.getTopValue();
     }
 
+    @Override
     public boolean hasTop() {
       return source.hasTop();
     }
 
+    @Override
     public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
       this.source = source;
     }
 
+    @Override
     public void next() throws IOException {
       source.next();
     }
@@ -86,6 +92,7 @@ public class IteratorUtilTest {
 
     int amount = 1;
 
+    @Override
     public Value getTopValue() {
       Value val = super.getTopValue();
 
@@ -94,6 +101,7 @@ public class IteratorUtilTest {
       return new Value(((orig + amount) + "").getBytes());
     }
 
+    @Override
     public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
       super.init(source, options, env);
 
@@ -106,6 +114,7 @@ public class IteratorUtilTest {
   }
 
   static class SquaringIter extends WrappedIter {
+    @Override
     public Value getTopValue() {
       Value val = super.getTopValue();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index 3aefdf1..0c4ffa2 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -52,6 +52,7 @@ public class FilterTest {
   private static final Map<String,String> EMPTY_OPTS = new HashMap<String,String>();
 
   public static class SimpleFilter extends Filter {
+    @Override
     public boolean accept(Key k, Value v) {
       // System.out.println(k.getRow());
       if (k.getRow().toString().endsWith("0"))
@@ -61,6 +62,7 @@ public class FilterTest {
   }
 
   public static class SimpleFilter2 extends Filter {
+    @Override
     public boolean accept(Key k, Value v) {
       if (k.getColumnFamily().toString().equals("a"))
         return false;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
index 002c1ab..0e6e319 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * An input stream that reads file data stored in one or more Accumulo values. Used by {@link ChunkInputFormat} to present input streams to a mapper.
  */
@@ -178,6 +177,7 @@ public class ChunkInputStream extends InputStream {
     return currentVis;
   }
 
+  @Override
   public int read() throws IOException {
     if (source == null)
       return -1;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
index 728aa08..e429f62 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
@@ -25,6 +25,7 @@ import org.apache.commons.cli.CommandLine;
 
 public class DebugCommand extends Command {
 
+  @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
     Set<String> lines = new TreeSet<String>();
     lines.add("This is a test");
@@ -32,10 +33,12 @@ public class DebugCommand extends Command {
     return 0;
   }
 
+  @Override
   public String description() {
     return "prints a message to test extension feature";
   }
 
+  @Override
   public int numArgs() {
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
index e37acbd..14dc170 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
@@ -21,6 +21,7 @@ import org.apache.accumulo.shell.ShellExtension;
 
 public class MyAppShellExtension extends ShellExtension {
 
+  @Override
   public String getExtensionName() {
     return "MyApp";
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 bdcfba3..9b28d72 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -34,13 +34,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
    */
   long create();
 
-  /**
-   * Get the current operation for the given transaction id.
-   *
-   * @param tid
-   *          transaction id
-   * @return the operation
-   */
   @Override
   Repo<T> top(long tid);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 6c8a7d6..8115fd5 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -190,6 +190,7 @@ public class ZooStore<T> implements TStore<T> {
     }
   }
 
+  @Override
   public void reserve(long tid) {
     synchronized (this) {
       reservationsWaiting++;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
index 6f1b20e..3702239 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
@@ -20,7 +20,6 @@ import java.util.Date;
 
 import org.slf4j.Logger;
 
-
 public class LoggingRunnable implements Runnable {
   private Runnable runnable;
   private Logger log;
@@ -30,6 +29,7 @@ public class LoggingRunnable implements Runnable {
     this.log = log;
   }
 
+  @Override
   public void run() {
     try {
       runnable.run();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
index 14d104b..ad82739 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
@@ -63,6 +63,7 @@ public interface IZooReaderWriter extends IZooReader {
 
   void mkdirs(String path) throws KeeperException, InterruptedException;
 
+  @Override
   void sync(String path) throws KeeperException, InterruptedException;
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 76181a7..11da1ec 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
@@ -258,6 +258,7 @@ public class ZooLock implements Watcher {
           asyncLock = null;
         }
 
+        @Override
         public void process(WatchedEvent event) {
           synchronized (ZooLock.this) {
             if (lock != null && event.getType() == EventType.NodeDeleted && event.getPath().equals(path + "/" + lock)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
index 1286c01..e7ba7d5 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
@@ -63,11 +63,6 @@ public class ZooReaderWriter extends ZooReader implements IZooReaderWriter {
     ZooUtil.recursiveDelete(info, zPath, policy);
   }
 
-  /**
-   * Create a persistent node with the default ACL
-   *
-   * @return true if the node was created or altered; false if it was skipped
-   */
   @Override
   public boolean putPersistentData(String zPath, byte[] data, NodeExistsPolicy policy) throws KeeperException, InterruptedException {
     return ZooUtil.putPersistentData(info, zPath, data, policy);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 518ab81..2c3b813 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -32,6 +32,7 @@ public class AgeOffStoreTest {
   private static class TestTimeSource implements TimeSource {
     long time = 0;
 
+    @Override
     public long currentTimeMillis() {
       return time;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 919d5aa..2df1c5d 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -287,6 +287,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
     for (Entry<String,String> sysProp : config.getSystemProperties().entrySet()) {
       argList.add(String.format("-D%s=%s", sysProp.getKey(), sysProp.getValue()));
     }
+    // @formatter:off
     argList.addAll(Arrays.asList(
         "-XX:+UseConcMarkSweepGC",
         "-XX:CMSInitiatingOccupancyFraction=75",
@@ -295,6 +296,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
         "-XX:+PerfDisableSharedMem",
         "-XX:+AlwaysPreTouch",
         Main.class.getName(), className));
+    // @formatter:on
     argList.addAll(Arrays.asList(args));
 
     ProcessBuilder builder = new ProcessBuilder(argList);
@@ -652,24 +654,18 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
     getClusterControl().killProcess(type, proc);
   }
 
-  /**
-   * @return Accumulo instance name
-   */
   @Override
   public String getInstanceName() {
     return config.getInstanceName();
   }
 
-  /**
-   * @return zookeeper connection string
-   */
   @Override
   public String getZooKeepers() {
     return config.getZooKeepers();
   }
 
   /**
-   * Stops Accumulo and Zookeeper processes. If stop is not called, there is a shutdown hook that is setup to kill the processes. However its probably best to
+   * Stops Accumulo and Zookeeper processes. If stop is not called, there is a shutdown hook that is setup to kill the processes. However it's probably best to
    * call stop in a finally block as soon as possible.
    */
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d5035f..7ac9962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1009,6 +1009,8 @@
                   <property name="allowThrowsTagsForSubclasses" value="true" />
                 </module>
                 <module name="SingleLineJavadoc" />
+                <module name="MissingOverrideCheck" />
+                <module name="AnnotationLocation" />
               </module>
             </module>
           </checkstyleRules>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 170fe27..bae694b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@ -156,9 +156,6 @@ public class NamespaceConfiguration extends ObservableConfiguration {
     return key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) || key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey());
   }
 
-  /**
-   * Invalidates the <code>ZooCache</code> used for storage and quick retrieval of properties for this namespace configuration.
-   */
   @Override
   public synchronized void invalidateCache() {
     if (null != propCacheAccessor) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index 53d1e47..259f2a2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -123,9 +123,6 @@ public class TableConfiguration extends ObservableConfiguration {
     return parent;
   }
 
-  /**
-   * Invalidates the <code>ZooCache</code> used for storage and quick retrieval of properties for this table configuration.
-   */
   @Override
   public synchronized void invalidateCache() {
     if (null != propCacheAccessor) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java b/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
index f891065..d4da91a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
@@ -27,6 +27,7 @@ public class ServerColumnUpdate extends ColumnUpdate {
     parent = serverMutation;
   }
 
+  @Override
   public long getTimestamp() {
     if (hasTimestamp())
       return super.getTimestamp();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java b/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
index eb42a11..82186f8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
@@ -44,6 +44,7 @@ public class FileRef implements Comparable<FileRef> {
     this(path, new Path(path));
   }
 
+  @Override
   public String toString() {
     return fullReference.toString();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 4290bd5..aa8e219 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -43,6 +43,9 @@ import org.slf4j.LoggerFactory;
 /**
  * A chaotic load balancer used for testing. It constantly shuffles tablets, preventing them from resting in a single location for very long. This is not
  * designed for performance, do not use on production systems. I'm calling it the LokiLoadBalancer.
+ *
+ * <p>
+ * Will balance randomly, maintaining distribution
  */
 public class ChaoticLoadBalancer extends TabletBalancer {
   private static final Logger log = LoggerFactory.getLogger(ChaoticLoadBalancer.class);
@@ -83,9 +86,6 @@ public class ChaoticLoadBalancer extends TabletBalancer {
 
   protected final OutstandingMigrations outstandingMigrations = new OutstandingMigrations(log);
 
-  /**
-   * Will balance randomly, maintaining distribution
-   */
   @Override
   public long balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
     Map<TServerInstance,Long> numTablets = new HashMap<TServerInstance,Long>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
index b24b562..2e79ba9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
@@ -68,6 +68,7 @@ public class TabletLocationState {
   final public Collection<Collection<String>> walogs;
   final public boolean chopped;
 
+  @Override
   public String toString() {
     return extent + "@(" + future + "," + current + "," + last + ")" + (chopped ? " chopped" : "");
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
index e852af3..573b2eb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
@@ -29,6 +29,7 @@ public class TabletMigration {
     this.newServer = after;
   }
 
+  @Override
   public String toString() {
     return tablet + ": " + oldServer + " -> " + newServer;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
index f65a333..401b14c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
@@ -64,9 +64,6 @@ public class StatusCombiner extends TypedValueCombiner<Status> {
       }
     }
 
-    /**
-     * Makes a copy of the subarray of {@code b}, then passes it through {@link Status#parseFrom(byte[])}
-     */
     @Override
     protected Status decodeUnchecked(byte[] b, int offset, int len) throws ValueFormatException {
       try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
index 2dbb8e7..a766b30 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
@@ -95,6 +95,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
     }
   }
 
+  @Override
   public void listen() throws TTransportException {
     // Make sure not to block on accept
     if (serverSocket_ != null) {
@@ -106,6 +107,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
     }
   }
 
+  @Override
   protected TNonblockingSocket acceptImpl() throws TTransportException {
     if (serverSocket_ == null) {
       throw new TTransportException(TTransportException.NOT_OPEN, "No underlying server socket.");
@@ -124,6 +126,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
     }
   }
 
+  @Override
   public void registerSelector(Selector selector) {
     try {
       // Register the server socket channel, indicating an interest in
@@ -135,6 +138,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
     }
   }
 
+  @Override
   public void close() {
     if (serverSocket_ != null) {
       try {
@@ -146,6 +150,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
     }
   }
 
+  @Override
   public void interrupt() {
     // The thread-safeness of this is dubious, but Java documentation suggests
     // that it is safe to do this from a different thread context

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
index 092b92d..a3735a9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
@@ -40,12 +40,18 @@ public interface Authenticator {
 
   Set<String> listUsers() throws AccumuloSecurityException;
 
+  /**
+   * Creates a user with no initial permissions whatsoever
+   */
   void createUser(String principal, AuthenticationToken token) throws AccumuloSecurityException;
 
   void dropUser(String user) throws AccumuloSecurityException;
 
   void changePassword(String principal, AuthenticationToken token) throws AccumuloSecurityException;
 
+  /**
+   * Checks if a user exists
+   */
   boolean userExists(String user) throws AccumuloSecurityException;
 
   Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index 67f25a9..ca39f3b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -106,9 +106,6 @@ public final class ZKAuthenticator implements Authenticator {
     return new TreeSet<String>(zooCache.getChildren(ZKUserPath));
   }
 
-  /**
-   * Creates a user with no permissions whatsoever
-   */
   @Override
   public void createUser(String principal, AuthenticationToken token) throws AccumuloSecurityException {
     try {
@@ -174,9 +171,6 @@ public final class ZKAuthenticator implements Authenticator {
       throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST); // user doesn't exist
   }
 
-  /**
-   * Checks if a user exists
-   */
   @Override
   public boolean userExists(String user) {
     return zooCache.get(ZKUserPath + "/" + user) != null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index c2eac02..c1a318f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -51,6 +51,7 @@ public class UniqueNameAllocator {
 
       try {
         byte[] max = ZooReaderWriter.getInstance().mutate(nextNamePath, null, ZooUtil.PRIVATE, new ZooReaderWriter.Mutator() {
+          @Override
           public byte[] mutate(byte[] currentValue) throws Exception {
             long l = Long.parseLong(new String(currentValue, UTF_8), Character.MAX_RADIX);
             l += allocate;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index 18ca881..a9ecf47 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -92,6 +92,7 @@ public class ChangeSecret {
     String root = ZooUtil.getRoot(inst);
     final List<String> ephemerals = new ArrayList<String>();
     recurse(zooReader, root, new Visitor() {
+      @Override
       public void visit(ZooReader zoo, String path) throws Exception {
         Stat stat = zoo.getStatus(path);
         if (stat.getEphemeralOwner() != 0)
@@ -115,6 +116,7 @@ public class ChangeSecret {
     final String newInstanceId = UUID.randomUUID().toString();
     String root = ZooUtil.getRoot(inst);
     recurse(orig, root, new Visitor() {
+      @Override
       public void visit(ZooReader zoo, String path) throws Exception {
         String newPath = path.replace(inst.getInstanceID(), newInstanceId);
         byte[] data = zoo.getData(path, null);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 94a80d9..f1ba8dc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -91,6 +91,7 @@ public class FileSystemMonitor {
           checkMounts(procFile);
         } catch (final Exception e) {
           Halt.halt(-42, new Runnable() {
+            @Override
             public void run() {
               log.fatal("Exception while checking mount points, halting process", e);
             }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
index 5be9344..7f57687 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
@@ -25,8 +25,9 @@ public class Halt {
   static private final Logger log = LoggerFactory.getLogger(Halt.class);
 
   public static void halt(final String msg) {
-    //ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+    // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
     halt(0, new Runnable() {
+      @Override
       public void run() {
         log.error("FATAL {}", msg);
       }
@@ -35,6 +36,7 @@ public class Halt {
 
   public static void halt(final String msg, int status) {
     halt(status, new Runnable() {
+      @Override
       public void run() {
         log.error("FATAL {}", msg);
       }
@@ -45,6 +47,7 @@ public class Halt {
     try {
       // give ourselves a little time to try and do something
       new Daemon() {
+        @Override
         public void run() {
           UtilWaitThread.sleep(100);
           Runtime.getRuntime().halt(status);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
index 697a058..cbe021a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
@@ -38,6 +38,7 @@ public class SimpleTimer {
   private static final Logger log = LoggerFactory.getLogger(SimpleTimer.class);
 
   private static class ExceptionHandler implements Thread.UncaughtExceptionHandler {
+    @Override
     public void uncaughtException(Thread t, Throwable e) {
       log.warn("SimpleTimer task failed", e);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/scripts/generate-protobuf.sh
----------------------------------------------------------------------
diff --git a/server/base/src/main/scripts/generate-protobuf.sh b/server/base/src/main/scripts/generate-protobuf.sh
index 3fc70a1..8bfb25a 100755
--- a/server/base/src/main/scripts/generate-protobuf.sh
+++ b/server/base/src/main/scripts/generate-protobuf.sh
@@ -32,7 +32,7 @@ fail() {
   exit 1
 }
 
-# Test to see if we have thrift installed
+# Test to see if we have protoc installed
 VERSION=$(protoc --version 2>/dev/null | grep -F "${REQUIRED_PROTOC_VERSION}" |  wc -l)
 if [[ $VERSION -ne 1 ]] ; then
   # Nope: bail
@@ -50,7 +50,7 @@ mkdir -p $BUILD_DIR
 
 protoc ${PROTOC_ARGS} src/main/protobuf/*.proto || fail unable to generate Java protocol buffer classes
 
-# For all generated thrift code, suppress all warnings and add the LICENSE header
+# For all generated protobuf code, suppress all warnings and add the LICENSE header
 s='@SuppressWarnings({"unused"})'
 find $BUILD_DIR -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public final class \)/'"$s"' \1/'
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
index 58760a4..8fb24dc 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
@@ -26,6 +26,7 @@ public class BaseRelativeTimeTest {
   static class BogusTime implements ProvidesTime {
     public long value = 0;
 
+    @Override
     public long currentTime() {
       return value;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
index 9bde842..4b83e5f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
@@ -45,6 +45,7 @@ public class SimpleTimerTest {
       canceled = false;
     }
 
+    @Override
     public void run() {
       if (canceled) {
         return;
@@ -60,6 +61,7 @@ public class SimpleTimerTest {
   private static class Thrower implements Runnable {
     boolean wasRun = false;
 
+    @Override
     public void run() {
       wasRun = true;
       throw new IllegalStateException("You shall not pass");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
index 0148129..ddf559f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
@@ -66,6 +66,7 @@ public class ListType extends Basic {
 
     if (null != entry.getValue()) {
       entry.getValue().doAs(new PrivilegedAction<Void>() {
+        @Override
         public Void run() {
           addRows(scanner, type, trace);
           return null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
index 39609c3..4bf64fe 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
@@ -86,9 +86,10 @@ public class ShowTrace extends Basic {
     long start;
     if (null != entry.getValue()) {
       start = entry.getValue().doAs(new PrivilegedAction<Long>() {
-         public Long run() {
-           return addSpans(scanner, tree, Long.MAX_VALUE);
-         }
+        @Override
+        public Long run() {
+          return addSpans(scanner, tree, Long.MAX_VALUE);
+        }
       });
     } else {
       start = addSpans(scanner, tree, Long.MAX_VALUE);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index c15bbe3..5c58375 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -171,6 +171,7 @@ public class Summary extends Basic {
     final Map<String,Stats> summary = new TreeMap<String,Stats>();
     if (null != pair.getValue()) {
       pair.getValue().doAs(new PrivilegedAction<Void>() {
+        @Override
         public Void run() {
           parseSpans(scanner, summary);
           return null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index e389679..703670f 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -170,6 +170,7 @@ public class TracerTest {
     args.processor(new Processor<Iface>(TraceWrap.service(new Service())));
     final TServer tserver = new TThreadPoolServer(args);
     Thread t = new Thread() {
+      @Override
       public void run() {
         tserver.serve();
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
index 79a1176..68ccdf0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
@@ -38,6 +38,7 @@ public class ConditionalMutationSet {
   }
 
   static class DuplicateFilter implements DeferFilter {
+    @Override
     public void defer(List<ServerConditionalMutation> scml, List<ServerConditionalMutation> okMutations, List<ServerConditionalMutation> deferred) {
       okMutations.add(scml.get(0));
       for (int i = 1; i < scml.size(); i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
index 443ffb2..88cc4ba 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
@@ -41,6 +41,7 @@ class MemKey extends Key {
     this.kvCount = mc;
   }
 
+  @Override
   public String toString() {
     return super.toString() + " mc=" + kvCount;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
index ba3ea42..b97b88b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
@@ -76,6 +76,7 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
   private int minFiles = 1;
   private WriteParameters writeParams = new WriteParameters();
 
+  @Override
   public void init(Map<String,String> options) {
 
     Set<Entry<String,String>> es = options.entrySet();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
index 64bc2cd..16fb9bc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
@@ -32,10 +32,12 @@ public class UnsatisfiableConstraint implements Constraint {
     this.vDesc = violationDescription;
   }
 
+  @Override
   public List<Short> check(Environment env, Mutation mutation) {
     return violations;
   }
 
+  @Override
   public String getViolationDescription(short violationCode) {
     return vDesc;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
index 0c93a86..fa35cd3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
@@ -46,6 +46,7 @@ public class SplitReportMessage implements MasterMessage {
     extents.put(ne2, np2);
   }
 
+  @Override
   public void send(TCredentials credentials, String serverName, MasterClientService.Iface client) throws TException, ThriftSecurityException {
     TabletSplit split = new TabletSplit();
     split.oldTablet = old_extent.toThrift();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
index 25db744..d40e514 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
@@ -34,6 +34,7 @@ public class TabletStatusMessage implements MasterMessage {
     this.status = status;
   }
 
+  @Override
   public void send(TCredentials auth, String serverName, Iface client) throws TException, ThriftSecurityException {
     client.reportTabletStatus(Tracer.traceInfo(), auth, serverName, status, extent.toThrift());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 6152500..43bd9d9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2115,11 +2115,6 @@ public class Tablet implements TabletCommitter {
     return majCStats;
   }
 
-  /**
-   * Returns a KeyExtent object representing this tablet's key range.
-   *
-   * @return extent
-   */
   @Override
   public KeyExtent getExtent() {
     return extent;
@@ -2441,7 +2436,7 @@ public class Tablet implements TabletCommitter {
     return currentLogs.size();
   }
 
-  /* don't release the lock if this method returns true for success; instead, the caller should clean up by calling finishUpdatingLogsUsed() */
+  // don't release the lock if this method returns true for success; instead, the caller should clean up by calling finishUpdatingLogsUsed()
   @Override
   public boolean beginUpdatingLogsUsed(InMemoryMap memTable, Collection<DfsLogger> more, boolean mincFinish) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
index 4bc05a6..3f1af82 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
@@ -44,6 +44,11 @@ public interface TabletCommitter {
 
   TableConfiguration getTableConfiguration();
 
+  /**
+   * Returns a KeyExtent object representing this tablet's key range.
+   *
+   * @return extent
+   */
   KeyExtent getExtent();
 
   int getLogId();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
index 49e7163..d24c4e0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
@@ -36,6 +36,7 @@ public class ShellCommandException extends Exception {
       return this.description;
     }
 
+    @Override
     public String toString() {
       return getDescription();
     }
@@ -53,6 +54,7 @@ public class ShellCommandException extends Exception {
     this.command = command;
   }
 
+  @Override
   public String getMessage() {
     return code + (command != null ? " (" + command + ")" : "");
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/Token.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index cd25ada..a533aa1 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -131,6 +131,7 @@ public class Token {
     }
   }
 
+  @Override
   public String toString() {
     return this.command.toString();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
index 37cf644..964ec41 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.io.Text;
 public class AddSplitsCommand extends Command {
   private Option optSplitsFile, base64Opt;
 
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
     final boolean decode = cl.hasOption(base64Opt.getOpt());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
index bc58a92..daca82c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
@@ -79,6 +79,7 @@ public class CloneTableCommand extends Command {
     return "clones a table";
   }
 
+  @Override
   public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
     registerCompletionForTables(root, completionSet);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
index 131534f..e39d862 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
@@ -53,6 +53,7 @@ public class CompactCommand extends TableOperation {
         + "concurrent user initiated compactions specify iterators or a compaction strategy, then all but one will fail to start.";
   }
 
+  @Override
   protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException {
     // compact the tables
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
index 6abcdf0..7f5b740 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class DebugCommand extends Command {
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
     if (cl.getArgs().length == 1) {
       if (cl.getArgs()[0].equalsIgnoreCase("on")) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
index c8ab6d8..3400680 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
@@ -34,6 +34,7 @@ import org.apache.commons.cli.Options;
 public class DeleteManyCommand extends ScanCommand {
   private Option forceOpt;
 
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
index 7bcc67d..9de3e50 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
@@ -68,6 +68,7 @@ public class ExportTableCommand extends Command {
     return "exports a table";
   }
 
+  @Override
   public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
     registerCompletionForTables(root, completionSet);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
index 88a023b..4c4bdca 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
@@ -37,6 +37,7 @@ public class FlushCommand extends TableOperation {
     return "flushes a tables data that is currently in memory to disk";
   }
 
+  @Override
   protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     shellState.getConnector().tableOperations().flush(tableName, startRow, endRow, wait);
     Shell.log.info("Flush of table " + tableName + (wait ? " completed." : " initiated..."));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
index 931383b..fa4ea8a 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
@@ -53,6 +53,7 @@ public class FormatterCommand extends ShellPluginConfigurationCommand {
     return options;
   }
 
+  @Override
   protected void setPlugin(final CommandLine cl, final Shell shellState, final String tableName, final String className) throws AccumuloException,
       AccumuloSecurityException {
     super.setPlugin(cl, shellState, tableName, className);
@@ -61,6 +62,7 @@ public class FormatterCommand extends ShellPluginConfigurationCommand {
     }
   }
 
+  @Override
   protected void removePlugin(final CommandLine cl, final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException {
     super.removePlugin(cl, shellState, tableName);
     if (cl.hasOption(interpeterOption.getOpt())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
index 6d0426a..5945cc3 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
@@ -34,6 +34,7 @@ public class HelpCommand extends Command {
   private Option disablePaginationOpt;
   private Option noWrapOpt;
 
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws ShellCommandException, IOException {
     int numColumns = shellState.getReader().getTerminal().getWidth();
     if (cl.hasOption(noWrapOpt.getOpt())) {
@@ -99,10 +100,12 @@ public class HelpCommand extends Command {
     return 0;
   }
 
+  @Override
   public String description() {
     return "provides information about the available commands";
   }
 
+  @Override
   public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> special) {
     registerCompletionForCommands(root, special);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
index d899d1d..70e1c10 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
@@ -78,6 +78,7 @@ public class ListShellIterCommand extends Command {
     return 0;
   }
 
+  @Override
   public String description() {
     return "lists iterators profiles configured in shell";
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
index 71a0338..9839aa8 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
@@ -29,6 +29,7 @@ public class MaxRowCommand extends ScanCommand {
 
   private static final Logger log = LoggerFactory.getLogger(MaxRowCommand.class);
 
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
index bd4843d..90fcace 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
@@ -64,6 +64,7 @@ public class MergeCommand extends Command {
     } else {
       final boolean finalVerbose = verbose;
       final Merge merge = new Merge() {
+        @Override
         protected void message(String fmt, Object... args) {
           if (finalVerbose) {
             try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
index a3b0105..a9a6e19 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
@@ -35,6 +35,7 @@ public class OfflineCommand extends TableOperation {
     return "starts the process of taking table offline";
   }
 
+  @Override
   protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     if (tableName.equals(MetadataTable.NAME)) {
       Shell.log.info("  You cannot take the " + MetadataTable.NAME + " offline.");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
index 7709798..3059b52 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
@@ -53,6 +53,7 @@ public class ScriptCommand extends Command {
   protected Option list, engine, script, file, args, out, function, object;
   private static final String DEFAULT_ENGINE = "rhino";
 
+  @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
 
     boolean invoke = false;
@@ -172,10 +173,12 @@ public class ScriptCommand extends Command {
     return 0;
   }
 
+  @Override
   public String description() {
     return "execute JSR-223 scripts";
   }
 
+  @Override
   public int numArgs() {
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
index ec1bd42..86e44e7 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.io.Text;
 
 public class TraceCommand extends DebugCommand {
 
+  @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
     if (cl.getArgs().length == 1) {
       if (cl.getArgs()[0].equalsIgnoreCase("on")) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
index d340ca2..c11aed5 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
@@ -74,6 +74,7 @@ public class MockShell extends Shell {
     instance = new MockInstance();
   }
 
+  @Override
   public int start() throws IOException {
     String input;
     if (isVerbose())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
index 0f2cc36..4f2577c 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
@@ -63,17 +63,11 @@ public class HdfsFileObject extends AbstractFileObject {
     this.path = p;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#canRenameTo(org.apache.commons.vfs2.FileObject)
-   */
   @Override
   public boolean canRenameTo(final FileObject newfile) {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doAttach()
-   */
   @Override
   protected void doAttach() throws Exception {
     try {
@@ -84,9 +78,6 @@ public class HdfsFileObject extends AbstractFileObject {
     }
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetAttributes()
-   */
   @Override
   protected Map<String,Object> doGetAttributes() throws Exception {
     if (null == this.stat) {
@@ -104,25 +95,16 @@ public class HdfsFileObject extends AbstractFileObject {
     }
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetContentSize()
-   */
   @Override
   protected long doGetContentSize() throws Exception {
     return stat.getLen();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetInputStream()
-   */
   @Override
   protected InputStream doGetInputStream() throws Exception {
     return this.hdfs.open(this.path);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetLastModifiedTime()
-   */
   @Override
   protected long doGetLastModifiedTime() throws Exception {
     if (null != this.stat) {
@@ -132,9 +114,6 @@ public class HdfsFileObject extends AbstractFileObject {
     }
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetRandomAccessContent (org.apache.commons.vfs2.util.RandomAccessMode)
-   */
   @Override
   protected RandomAccessContent doGetRandomAccessContent(final RandomAccessMode mode) throws Exception {
     if (mode.equals(RandomAccessMode.READWRITE)) {
@@ -143,9 +122,6 @@ public class HdfsFileObject extends AbstractFileObject {
     return new HdfsRandomAccessContent(this.path, this.hdfs);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetType()
-   */
   @Override
   protected FileType doGetType() throws Exception {
     try {
@@ -163,41 +139,26 @@ public class HdfsFileObject extends AbstractFileObject {
     }
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsHidden()
-   */
   @Override
   protected boolean doIsHidden() throws Exception {
     return false;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsReadable()
-   */
   @Override
   protected boolean doIsReadable() throws Exception {
     return true;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsSameFile(org.apache.commons.vfs2.FileObject)
-   */
   @Override
   protected boolean doIsSameFile(final FileObject destFile) throws FileSystemException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsWriteable()
-   */
   @Override
   protected boolean doIsWriteable() throws Exception {
     return false;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doListChildren()
-   */
   @Override
   protected String[] doListChildren() throws Exception {
     if (this.doGetType() != FileType.FOLDER) {
@@ -213,9 +174,6 @@ public class HdfsFileObject extends AbstractFileObject {
     return children;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doListChildrenResolved()
-   */
   @Override
   protected FileObject[] doListChildrenResolved() throws Exception {
     if (this.doGetType() != FileType.FOLDER) {
@@ -230,33 +188,21 @@ public class HdfsFileObject extends AbstractFileObject {
     return fo;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doRemoveAttribute(java.lang.String)
-   */
   @Override
   protected void doRemoveAttribute(final String attrName) throws Exception {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doSetAttribute(java.lang.String, java.lang.Object)
-   */
   @Override
   protected void doSetAttribute(final String attrName, final Object value) throws Exception {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#doSetLastModifiedTime(long)
-   */
   @Override
   protected boolean doSetLastModifiedTime(final long modtime) throws Exception {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
   @Override
   public boolean equals(final Object o) {
     if (null == o) {
@@ -274,10 +220,6 @@ public class HdfsFileObject extends AbstractFileObject {
     return false;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileObject#exists()
-   * @return boolean true if file exists, false if not
-   */
   @Override
   public boolean exists() throws FileSystemException {
     try {
@@ -290,9 +232,6 @@ public class HdfsFileObject extends AbstractFileObject {
     }
   }
 
-  /**
-   * @see java.lang.Object#hashCode()
-   */
   @Override
   public int hashCode() {
     return this.path.getName().toString().hashCode();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
index 9ddfab5..4006feb 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
@@ -47,26 +47,16 @@ public class HdfsFileProvider extends AbstractOriginatingFileProvider {
     this.setFileNameParser(HttpFileNameParser.getInstance());
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#doCreateFileSystem(org.apache.commons.vfs2.FileName,
-   *      org.apache.commons.vfs2.FileSystemOptions)
-   */
   @Override
   protected FileSystem doCreateFileSystem(final FileName rootName, final FileSystemOptions fileSystemOptions) throws FileSystemException {
     return new HdfsFileSystem(rootName, fileSystemOptions);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.FileProvider#getCapabilities()
-   */
   @Override
   public Collection<Capability> getCapabilities() {
     return CAPABILITIES;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileProvider#getConfigBuilder()
-   */
   @Override
   public FileSystemConfigBuilder getConfigBuilder() {
     return HdfsFileSystemConfigBuilder.getInstance();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
index 7ad68f9..26aa5c1 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
@@ -49,17 +49,11 @@ public class HdfsFileSystem extends AbstractFileSystem {
     super(rootName, null, fileSystemOptions);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileSystem#addCapabilities(java.util.Collection)
-   */
   @Override
   protected void addCapabilities(final Collection<Capability> capabilities) {
     capabilities.addAll(HdfsFileProvider.CAPABILITIES);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileSystem#close()
-   */
   @Override
   synchronized public void close() {
     try {
@@ -72,17 +66,11 @@ public class HdfsFileSystem extends AbstractFileSystem {
     super.close();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileSystem#createFile(org.apache.commons.vfs2.provider.AbstractFileName)
-   */
   @Override
   protected FileObject createFile(final AbstractFileName name) throws Exception {
     throw new FileSystemException("Operation not supported");
   }
 
-  /**
-   * @see org.apache.commons.vfs2.provider.AbstractFileSystem#resolveFile(org.apache.commons.vfs2.FileName)
-   */
   @Override
   public FileObject resolveFile(final FileName name) throws FileSystemException {
 


Mime
View raw message