You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/05/09 20:15:51 UTC

[GitHub] mikewalch closed pull request #481: Cleaned up comments

mikewalch closed pull request #481: Cleaned up comments
URL: https://github.com/apache/accumulo/pull/481
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/src/main/java/org/apache/accumulo/core/client/AccumuloException.java b/core/src/main/java/org/apache/accumulo/core/client/AccumuloException.java
index 97bfebde65..cd2f7d3234 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloException.java
@@ -18,7 +18,6 @@
 
 /**
  * A generic Accumulo Exception for general accumulo failures.
- *
  */
 public class AccumuloException extends Exception {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java b/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
index f9bcc8994f..e64c806519 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
@@ -23,7 +23,6 @@
 /**
  * An Accumulo Exception for security violations, authentication failures, authorization failures,
  * etc.
- *
  */
 public class AccumuloSecurityException extends Exception {
   private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java b/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
index 0e3856e24d..093b5f669c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
@@ -22,9 +22,7 @@
 
 /**
  * Implementations of BatchDeleter support efficient deletion of ranges in accumulo.
- *
  */
-
 public interface BatchDeleter extends ScannerBase {
   /**
    * Deletes the ranges specified by {@link #setRanges}.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
index e6099dd8e2..db630b388d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
@@ -24,7 +24,6 @@
 import org.apache.accumulo.core.security.Authorizations;
 
 /**
- *
  * @since 1.6.0
  */
 public class ConditionalWriterConfig {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index 3bc0ff4d5a..f38920228c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -25,7 +25,6 @@
 /**
  * This class represents the information a client needs to know to connect to an instance of
  * accumulo.
- *
  */
 public interface Instance {
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
index d4120ee4a0..f823680947 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
@@ -37,9 +37,7 @@
  * the client side. If you think your rows may not fit into memory, then you can provide an
  * alternative row buffer factory to the constructor. This would allow rows to be buffered to disk
  * for example.
- *
  */
-
 public class IsolatedScanner extends ScannerOptions implements Scanner {
 
   private static class RowBufferingIterator implements Iterator<Entry<Key,Value>> {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MultiTableBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/MultiTableBatchWriter.java
index 399eda825f..8ea675d22e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MultiTableBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MultiTableBatchWriter.java
@@ -20,7 +20,6 @@
  * This class enables efficient batch writing to multiple tables. When creating a batch writer for
  * each table, each has its own memory and network resources. Using this class these resources may
  * be shared among multiple tables.
- *
  */
 public interface MultiTableBatchWriter {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index e3a767fc2c..178e7cb43b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -32,7 +32,6 @@
 
 /**
  * Communicate the failed mutations of a BatchWriter back to the client.
- *
  */
 public class MutationsRejectedException extends AccumuloException {
   private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/NamespaceExistsException.java b/core/src/main/java/org/apache/accumulo/core/client/NamespaceExistsException.java
index aa317175f0..16e685bd26 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/NamespaceExistsException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/NamespaceExistsException.java
@@ -24,7 +24,6 @@
 public class NamespaceExistsException extends Exception {
   /**
    * Exception to throw if an operation is attempted on a namespace that already exists.
-   *
    */
   private static final long serialVersionUID = 1L;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
index a12ba459f1..e148fed83d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
@@ -24,7 +24,6 @@
 public class NamespaceNotFoundException extends Exception {
   /**
    * Exception to throw if an operation is attempted on a namespace that doesn't exist.
-   *
    */
   private static final long serialVersionUID = 1L;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/SampleNotPresentException.java b/core/src/main/java/org/apache/accumulo/core/client/SampleNotPresentException.java
index 187cfc08a2..8d06923068 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/SampleNotPresentException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/SampleNotPresentException.java
@@ -23,7 +23,6 @@
  *
  * @since 1.8.0
  */
-
 public class SampleNotPresentException extends RuntimeException {
 
   public SampleNotPresentException(String message, Exception cause) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 503d307642..6fdc13a56b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -29,7 +29,6 @@
 
 /**
  * This class hosts configuration methods that are shared between different types of scanners.
- *
  */
 public interface ScannerBase extends Iterable<Entry<Key,Value>>, AutoCloseable {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java b/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
index a50627013d..644f752d58 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
@@ -21,9 +21,7 @@
  *
  * For example if table A exist when a scan is started, but is deleted during the scan then this
  * exception is thrown.
- *
  */
-
 public class TableDeletedException extends RuntimeException {
 
   private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java b/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
index 6eff0b2537..5473b8eb09 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
@@ -25,7 +25,6 @@
 public class TableNotFoundException extends Exception {
   /**
    * Exception to throw if an operation is attempted on a table that doesn't exist.
-   *
    */
   private static final long serialVersionUID = 1L;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index d7e97cf39b..3b0392abbd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -59,9 +59,7 @@
  *
  * If you do not know the instance names then run accumulo
  * org.apache.accumulo.server.util.ListInstances on an accumulo server.
- *
  */
-
 public class ZooKeeperInstance implements Instance {
 
   private static final Logger log = LoggerFactory.getLogger(ZooKeeperInstance.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index d5233b970a..16d086ddb3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -23,7 +23,6 @@
 import org.apache.accumulo.core.data.TabletId;
 
 /**
- *
  * @since 1.5.0
  */
 public abstract class ActiveCompaction {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
index 9510895200..93697ee90c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
@@ -25,7 +25,6 @@
 
 /**
  * A class that contains information about an ActiveScan
- *
  */
 public abstract class ActiveScan {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/CompactionConfig.java b/core/src/main/java/org/apache/accumulo/core/client/admin/CompactionConfig.java
index 766867fa0a..3b13b74a54 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/CompactionConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/CompactionConfig.java
@@ -32,7 +32,6 @@
  *
  * @since 1.7.0
  */
-
 public class CompactionConfig {
   private Text start = null;
   private Text end = null;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
index c5331b2d1c..6773f125da 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
@@ -22,9 +22,6 @@
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 
-/**
- *
- */
 public interface InstanceOperations {
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 1596ea265d..86943436c8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -45,9 +45,7 @@
 
 /**
  * Provides a class for administering tables
- *
  */
-
 public interface TableOperations {
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloServerException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloServerException.java
index ad9fff7ad4..37177fc950 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloServerException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloServerException.java
@@ -21,9 +21,7 @@
 
 /**
  * This class is intended to encapsulate errors that occurred on the server side.
- *
  */
-
 public class AccumuloServerException extends AccumuloException {
   private static final long serialVersionUID = 1L;
   private String server;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
index 72b1455443..ccd055e3e2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
@@ -30,7 +30,6 @@
 import org.apache.accumulo.core.data.thrift.IterInfo;
 
 /**
- *
  * @since 1.6.0
  */
 public class ActiveCompactionImpl extends ActiveCompaction {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/BaseIteratorEnvironment.java b/core/src/main/java/org/apache/accumulo/core/client/impl/BaseIteratorEnvironment.java
index b0f390bb5b..ddcb06655d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/BaseIteratorEnvironment.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/BaseIteratorEnvironment.java
@@ -33,7 +33,6 @@
  * {@link UnsupportedOperationException} for each operation. This is useful for situations that need
  * to extend {@link IteratorEnvironment} and implement a subset of the methods.
  */
-
 public class BaseIteratorEnvironment implements IteratorEnvironment {
 
   @Override
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 1be64ea794..8d3eb8d3dc 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
@@ -79,7 +79,7 @@
 
 import com.google.common.base.Joiner;
 
-/*
+/**
  * Differences from previous TabletServerBatchWriter
  *   + As background threads finish sending mutations to tablet servers they decrement memory usage
  *   + Once the queue of unprocessed mutations reaches 50% it is always pushed
@@ -100,7 +100,6 @@
  *   + when a mutation successfully leaves the system memory is decremented
  *
  */
-
 public class TabletServerBatchWriter {
 
   private static final Logger log = LoggerFactory.getLogger(TabletServerBatchWriter.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ZookeeperLockChecker.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ZookeeperLockChecker.java
index b90478e5b4..19df08017d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ZookeeperLockChecker.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ZookeeperLockChecker.java
@@ -25,9 +25,6 @@
 import org.apache.accumulo.fate.zookeeper.ZooLock;
 import org.apache.zookeeper.KeeperException;
 
-/**
- *
- */
 public class ZookeeperLockChecker implements TabletServerLockChecker {
 
   private final ZooCache zc;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index e5db4b9c67..c6eef7a5c3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -50,7 +50,6 @@
  *
  * @since 1.6.0
  */
-
 public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>>
     extends AbstractLexicoder<ComparablePair<A,B>> {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
index c526acb5b4..1745a7b191 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
@@ -29,7 +29,6 @@
  *
  * @since 1.6.0
  */
-
 public class ReverseLexicoder<T> extends AbstractLexicoder<T> {
 
   private Lexicoder<T> lexicoder;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index 6c28175387..0313b6b36f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -26,7 +26,6 @@
  *
  * @since 1.6.0
  */
-
 public class StringLexicoder extends AbstractLexicoder<String> {
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 5c7a70b774..888321c64f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -26,7 +26,6 @@
  *
  * @since 1.6.0
  */
-
 public class TextLexicoder extends AbstractLexicoder<Text> {
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/client/sample/AbstractHashSampler.java b/core/src/main/java/org/apache/accumulo/core/client/sample/AbstractHashSampler.java
index ad7814919b..d046ebfa63 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/sample/AbstractHashSampler.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/sample/AbstractHashSampler.java
@@ -49,7 +49,6 @@
  *
  * @since 1.8.0
  */
-
 public abstract class AbstractHashSampler implements Sampler {
 
   private HashFunction hashFunction;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/sample/RowColumnSampler.java b/core/src/main/java/org/apache/accumulo/core/client/sample/RowColumnSampler.java
index 82cd577dbe..c2f8f66d4c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/sample/RowColumnSampler.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/sample/RowColumnSampler.java
@@ -61,7 +61,6 @@
  *
  * @since 1.8.0
  */
-
 public class RowColumnSampler extends AbstractHashSampler {
 
   private boolean row = true;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/sample/RowSampler.java b/core/src/main/java/org/apache/accumulo/core/client/sample/RowSampler.java
index 5c202f07b6..50e8788993 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/sample/RowSampler.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/sample/RowSampler.java
@@ -44,7 +44,6 @@
  *
  * @since 1.8.0
  */
-
 public class RowSampler extends AbstractHashSampler {
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
index e774ec5a60..607daa2061 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
@@ -30,7 +30,6 @@
  *
  * @since 1.8.0
  */
-
 public class SamplerConfiguration {
 
   private String className;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
index b4027b2114..efa75e56de 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.core.client.security;
 
-/**
- *
- */
 public enum SecurityErrorCode {
   DEFAULT_SECURITY_ERROR,
   BAD_CREDENTIALS,
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
index dcb1dfffec..4cf86fef21 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
@@ -33,7 +33,6 @@
 import org.apache.hadoop.io.Writable;
 
 /**
- *
  * @since 1.5.0
  */
 public interface AuthenticationToken extends Writable, Destroyable, Cloneable {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
index 28c68e0d5b..c52e15beda 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
@@ -33,7 +33,6 @@
  *
  * @since 1.7.0
  */
-
 public interface DelegationToken extends AuthenticationToken {
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 912a8cefa2..a3b3ee3122 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -36,7 +36,6 @@
 /**
  * @since 1.5.0
  */
-
 public class PasswordToken implements AuthenticationToken {
   private byte[] password = null;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java b/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
index c36c18edb7..adae2fe997 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
@@ -29,7 +29,6 @@
  *
  * @since 2.0.0
  */
-
 public class CounterSummary {
   private Map<String,Long> stats;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java b/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
index 37610cbc76..ba607ceb72 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
@@ -20,7 +20,6 @@
 
 /**
  * A single column and value pair within a {@link Mutation}.
- *
  */
 public class ColumnUpdate {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index 5b7929ef29..ea9d1eafa3 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -39,7 +39,6 @@
  * of a row, column family, column qualifier, column visibility, timestamp, and delete marker.
  *
  * Keys are comparable and therefore have a sorted order defined by {@link #compareTo(Key)}.
- *
  */
 public class Key implements WritableComparable<Key>, Cloneable {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
index 4899556303..d4833d517d 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
@@ -54,9 +54,7 @@
 
 /**
  * keeps track of information needed to identify a tablet
- *
  */
-
 public class KeyExtent implements WritableComparable<KeyExtent> {
 
   private Table.ID tableId;
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 4c503f9669..7d1e999207 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
@@ -67,7 +67,6 @@
 /**
  * A class that sits on top of different accumulo file formats and provides bloom filter
  * functionality.
- *
  */
 public class BloomFilterLayer {
   private static final Logger LOG = LoggerFactory.getLogger(BloomFilterLayer.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java
index b3807ec7da..dd256d8765 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java
@@ -23,12 +23,9 @@
 
 import org.apache.accumulo.core.file.blockfile.cache.CacheEntry.Weighbable;
 
-/*
- * Minimal interface to read a block from a
- * block based file
- *
+/**
+ * Minimal interface to read a block from a block based file
  */
-
 public interface ABlockReader extends DataInput {
 
   DataInputStream getStream() throws IOException;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockWriter.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockWriter.java
index f7a734bcfc..7e3242a92e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockWriter.java
@@ -19,12 +19,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-/*
- * Minimal interface to write a block to a
- * block based file
- *
+/**
+ * Minimal interface to write a block to a block based file
  */
-
 public interface ABlockWriter extends DataOutput {
 
   long getCompressedSize() throws IOException;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileReader.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileReader.java
index b290cc87d9..26dc126bd0 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileReader.java
@@ -19,14 +19,11 @@
 import java.io.IOException;
 
 /**
- *
  * Provides a generic interface for a Reader for a BlockBaseFile format. Supports the minimal
  * interface required.
  *
  * Read a metaBlock and a dataBlock
- *
  */
-
 public interface BlockFileReader {
 
   ABlockReader getMetaBlock(String name) throws IOException;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileWriter.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileWriter.java
index f4e8c51ff6..ab72c35f88 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/BlockFileWriter.java
@@ -19,14 +19,11 @@
 import java.io.IOException;
 
 /**
- *
  * Provides a generic interface for a Writer for a BlockBaseFile format. Supports the minimal
  * interface required.
  *
  * Write a metaBlock and a dataBlock.
- *
  */
-
 public interface BlockFileWriter {
 
   ABlockWriter prepareMetaBlock(String name) throws IOException;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 3a4a26d998..aaec9f3e0f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -57,7 +57,6 @@
  * This is a wrapper class for BCFile that includes a cache for independent caches for datablocks
  * and metadatablocks
  */
-
 public class CachableBlockFile {
 
   private CachableBlockFile() {}
diff --git a/core/src/main/java/org/apache/accumulo/core/file/keyfunctor/KeyFunctor.java b/core/src/main/java/org/apache/accumulo/core/file/keyfunctor/KeyFunctor.java
index 5c35f65318..0de6e1a6fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/keyfunctor/KeyFunctor.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/keyfunctor/KeyFunctor.java
@@ -22,7 +22,6 @@
 public interface KeyFunctor {
   /**
    * Implementations should return null if a range can not be converted to a bloom key.
-   *
    */
   org.apache.hadoop.util.bloom.Key transform(Range range);
 
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
index 812bb7da44..fa302b4efc 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
@@ -29,9 +29,6 @@
 import org.apache.accumulo.core.file.blockfile.cache.impl.SizeConstants;
 import org.apache.accumulo.core.file.rfile.MultiLevelIndex.IndexEntry;
 
-/**
- *
- */
 public class BlockIndex implements Weighbable {
 
   public static BlockIndex getIndex(ABlockReader cacheBlock, IndexEntry indexEntry)
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
index c860076186..c3663cd72f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
@@ -38,7 +38,6 @@
 
 /**
  * Split an RFile into large and small key/value files.
- *
  */
 public class SplitLarge {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index a36930c7be..9316825b59 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -38,7 +38,6 @@
  *
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Combiner}
  */
-
 @Deprecated
 public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>, OptionDescriber {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/DevNull.java b/core/src/main/java/org/apache/accumulo/core/iterators/DevNull.java
index 68a6cac743..e105b488b7 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/DevNull.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/DevNull.java
@@ -38,9 +38,7 @@
  * And to make major compactions never write anything
  *
  * config -t ci -s table.iterator.majc.devnull=21,org.apache.accumulo.core.iterators.DevNull
- *
  */
-
 public class DevNull implements SortedKeyValueIterator<Key,Value> {
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
index dc897a58b3..a2b22cf511 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
@@ -31,7 +31,6 @@
  * OptionDescribers will need to implement two methods: {@code describeOptions()} which returns an
  * instance of {@link IteratorOptions} and {@code validateOptions(Map<String,String> options)} which
  * is intended to throw an exception or return false if the options are not acceptable.
- *
  */
 public interface OptionDescriber {
   public class IteratorOptions {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
index c8a05c8125..513491954b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
@@ -79,7 +79,6 @@
  * row3 steve:20
  * </pre>
  */
-
 public class OrIterator implements SortedKeyValueIterator<Key,Value>, OptionDescriber {
   private static final Logger LOG = LoggerFactory.getLogger(OrIterator.class);
   public static final String COLUMNS_KEY = "or.iterator.columns";
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
index 580efd4233..de3b204c0d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
@@ -30,7 +30,6 @@
  * An iterator that supports iterating over key and value pairs. Anything implementing this
  * interface should return keys in sorted order.
  */
-
 public interface SortedKeyValueIterator<K extends WritableComparable<?>,V extends Writable>
     extends YieldingKeyValueIterator<K,V> {
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/SortedMapIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/SortedMapIterator.java
index 40ab1f4775..1bdf009992 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/SortedMapIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/SortedMapIterator.java
@@ -40,9 +40,7 @@
  * CFs, construct a new ColumnFamilySkippingIterator(new SortedMapIterator(map)).
  *
  * @see org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator
- *
  */
-
 public class SortedMapIterator implements InterruptibleIterator {
   private Iterator<Entry<Key,Value>> iter;
   private Entry<Key,Value> entry;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index d955585c71..382e77be36 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@ -38,9 +38,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-/**
- *
- */
 public class LocalityGroupIterator extends HeapIterator implements InterruptibleIterator {
 
   private static final Collection<ByteSequence> EMPTY_CF_SET = Collections.emptySet();
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
index ac780c7861..14e6f89472 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
@@ -32,11 +32,7 @@
 
 /**
  * An iterator capable of iterating over other iterators in sorted order.
- *
- *
- *
  */
-
 public class MultiIterator extends HeapIterator {
 
   private List<SortedKeyValueIterator<Key,Value>> iters;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java
index 306906cee7..0ae4d3c422 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java
@@ -28,9 +28,6 @@
 import org.apache.accumulo.core.iterators.ServerWrappingIterator;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
-/**
- *
- */
 public class StatsIterator extends ServerWrappingIterator {
 
   private int numRead = 0;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
index 2d65263f39..dcf76f1ba5 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
@@ -49,9 +49,7 @@
  * metadata locality group. Therefore, you would want to put the empty column family in the locality
  * group that contains the metadata. Another option is to put the empty column in its own locality
  * group. Which is best depends on your data.
- *
  */
-
 public class RowDeletingIterator implements SortedKeyValueIterator<Key,Value> {
 
   public static final Value DELETE_ROW_VALUE = new Value("DEL_ROW".getBytes(UTF_8));
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
index 3884b3e14d..67a20dbcd8 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
@@ -49,7 +49,6 @@
  * be re-executed because the iterator stack is reseeked for each batch. The batch size may be
  * increased to reduce the number of times the test is executed. With the normal Scanner, if
  * isolation is enabled then it will read an entire row w/o seeking this iterator.
- *
  */
 public abstract class RowFilter extends WrappingIterator {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
index 37dcb76f74..cdc6f09622 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
@@ -39,7 +39,6 @@
 import org.apache.hadoop.io.Text;
 
 /**
- *
  * The WholeColumnFamilyIterator is designed to provide row/cf-isolation so that queries see
  * mutations as atomic. It does so by grouping row/Column family (as key) and rest of data as Value
  * into a single key/value pair, which is returned through the client as an atomic operation.
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
index d04fb79709..5680d34ff1 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
@@ -31,7 +31,6 @@
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
 /**
- *
  * The WholeRowIterator is designed to provide row-isolation so that queries see mutations as
  * atomic. It does so by encapsulating an entire row of key/value pairs into a single key/value
  * pair, which is returned through the client as an atomic operation.
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java b/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
index 4ba941d846..7fcc8b8ed1 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
@@ -20,9 +20,6 @@
 import org.apache.accumulo.core.client.impl.Table;
 import org.apache.accumulo.core.data.impl.KeyExtent;
 
-/**
- *
- */
 public class RootTable {
 
   public static final Table.ID ID = Table.ID.ROOT;
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/AccumuloReplicationReplayer.java b/core/src/main/java/org/apache/accumulo/core/replication/AccumuloReplicationReplayer.java
index 4520286f2b..93468ca0cd 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/AccumuloReplicationReplayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/AccumuloReplicationReplayer.java
@@ -23,9 +23,6 @@
 import org.apache.accumulo.core.replication.thrift.RemoteReplicationException;
 import org.apache.accumulo.core.replication.thrift.WalEdits;
 
-/**
- *
- */
 public interface AccumuloReplicationReplayer {
 
   public long replicateLog(ClientContext context, String tableName, WalEdits data)
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationConstants.java b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationConstants.java
index 3f96eca4e9..82a806d14b 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationConstants.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationConstants.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.core.replication;
 
-/**
- *
- */
 public class ReplicationConstants {
 
   // Constants for replication information in zookeeper
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
index 6d84a6dab4..eaeeb2424b 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
@@ -35,9 +35,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class ReplicationSchema {
   private static final Logger log = LoggerFactory.getLogger(ReplicationSchema.class);
 
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTableOfflineException.java b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTableOfflineException.java
index 3cc56e0d0f..c248c32b6b 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTableOfflineException.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTableOfflineException.java
@@ -18,9 +18,6 @@
 
 import org.apache.accumulo.core.client.TableOfflineException;
 
-/**
- *
- */
 public class ReplicationTableOfflineException extends Exception {
 
   private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
index 532516ca60..31612847bd 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
@@ -21,11 +21,11 @@
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-/*
+/**
  * Buffers all input in a growing buffer until flush() is called. Then entire
  * buffer is written, with size information, and padding to force the
  * underlying crypto output stream to also fully flush
-*/
+ */
 public class BlockedOutputStream extends OutputStream {
   int blockSize;
   DataOutputStream out;
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
index 56eace6889..323a5fd5cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
@@ -31,7 +31,6 @@
  *
  * When implementing CryptoModule, it is recommended that any {@link CipherOutputStream} uses
  * {@link RFileCipherOutputStream} instead.
- *
  */
 public interface CryptoModule {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index 9db8d11c1b..d209307838 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -48,7 +48,6 @@
  * In general, the module is quite straightforward: provide it with crypto-related settings and an
  * input/output stream, and it will hand back those streams wrapped in encrypting (or decrypting)
  * streams.
- *
  */
 public class DefaultCryptoModule implements CryptoModule {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/RFileCipherOutputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/RFileCipherOutputStream.java
index edc23fb85a..270a02e2ea 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/RFileCipherOutputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/RFileCipherOutputStream.java
@@ -23,11 +23,9 @@
 import javax.crypto.CipherOutputStream;
 
 /**
- *
  * This class extends {@link CipherOutputStream} to include a way to track the number of bytes that
  * have been encrypted by the stream. The write method also includes a mechanism to stop writing and
  * throw an exception if exceeding a maximum number of bytes is attempted.
- *
  */
 public class RFileCipherOutputStream extends CipherOutputStream {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategy.java
index 8dfdee16aa..547c47f7e8 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategy.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategy.java
@@ -18,9 +18,6 @@
 
 import java.io.IOException;
 
-/**
- *
- */
 public interface SecretKeyEncryptionStrategy {
 
   CryptoModuleParameters encryptSecretKey(CryptoModuleParameters params) throws IOException;
diff --git a/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java b/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
index b42debc628..d84f91084b 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
@@ -53,9 +53,7 @@
  * summaries are merged to 5 and summaries are then created for every 2000 key values. The code
  * keeps merging summaries and doubling the amount of key values per summary. This results in each
  * summary covering about the same number of key values.
- *
  */
-
 class SummarySerializer {
 
   private SummarizerConfiguration sconf;
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index 6153728892..d65f32be1e 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@ -39,7 +39,6 @@
 
 /**
  * Utility class to enable tracing for Accumulo server processes.
- *
  */
 public class DistributedTrace {
   private static final Logger log = LoggerFactory.getLogger(DistributedTrace.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/Trace.java b/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
index fd2d9010a6..e6aded71c5 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
@@ -26,7 +26,6 @@
 
 /**
  * Utility class for tracing within Accumulo. Not intended for client use!
- *
  */
 public class Trace {
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
index 0ef07538c0..755ad041e4 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
@@ -36,7 +36,6 @@
  *
  * Note that the result of these calls is a Proxy object that conforms to the basic interfaces, but
  * is not your concrete instance.
- *
  */
 public class TraceWrap {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java b/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java
index 1cee6e4195..def3520313 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/CleanUp.java
@@ -23,9 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class CleanUp {
 
   private static final Logger log = LoggerFactory.getLogger(CleanUp.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ComparablePair.java b/core/src/main/java/org/apache/accumulo/core/util/ComparablePair.java
index f493a8d10b..1f3b0b9ffd 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ComparablePair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ComparablePair.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.core.util;
 
-/**
- *
- */
 public class ComparablePair<A extends Comparable<A>,B extends Comparable<B>> extends Pair<A,B>
     implements Comparable<ComparablePair<A,B>> {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
index aec7ccbe2f..43417f923f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
@@ -58,9 +58,7 @@
  * Note that this is not an exhaustive list, because these methods are only concerned with brackets,
  * colons, and port numbers. Full validation of the host field (if desired) is the caller's
  * responsibility.
- *
  */
-
 public final class HostAndPort implements Serializable {
   /** Magic value indicating the absence of a port number. */
   private static final int NO_PORT = -1;
diff --git a/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java b/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
index 761756fb58..44f93812d6 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
@@ -18,9 +18,6 @@
 
 import org.apache.hadoop.io.Text;
 
-/**
- *
- */
 public class DefaultScanInterpreter implements ScanInterpreter {
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java
index ac746c8ee6..d42ad50434 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java
@@ -16,7 +16,9 @@
  */
 package org.apache.accumulo.core.util.ratelimit;
 
-/** A rate limiter which doesn't actually limit rates at all. */
+/**
+ * A rate limiter which doesn't actually limit rates at all.
+ */
 public class NullRateLimiter implements RateLimiter {
   public static final NullRateLimiter INSTANCE = new NullRateLimiter();
 
diff --git a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index e78b6ff5b0..399fc633a0 100644
--- a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -32,7 +32,6 @@
  * than a configurable time period.
  *
  * No external time source is used. It starts tracking idle time when its created.
- *
  */
 public class AgeOffStore<T> implements TStore<T> {
 
diff --git a/core/src/main/java/org/apache/accumulo/fate/Fate.java b/core/src/main/java/org/apache/accumulo/fate/Fate.java
index 8da069f03d..6e13bd5c2f 100644
--- a/core/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -30,10 +30,7 @@
 
 /**
  * Fault tolerant executor
- *
- *
  */
-
 public class Fate<T> {
 
   private static final String DEBUG_PROP = "debug";
diff --git a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
index cf368eefee..a123ebf304 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
@@ -21,7 +21,6 @@
  *
  * By definition, these methods are safe to call without impacting the state of FATE. They should
  * also be safe to call without impacting the state of system components.
- *
  */
 public interface ReadOnlyRepo<T> {
 
diff --git a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
index d304608e73..57312c8b93 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
@@ -27,7 +27,6 @@
  *
  * Unlike relying directly on the ReadOnlyTStore interface, this class will not allow subsequent
  * users to cast back to a mutable TStore successfully.
- *
  */
 public class ReadOnlyStore<T> implements ReadOnlyTStore<T> {
 
diff --git a/core/src/main/java/org/apache/accumulo/fate/Repo.java b/core/src/main/java/org/apache/accumulo/fate/Repo.java
index 0dcfd7f589..1e127e2b45 100644
--- a/core/src/main/java/org/apache/accumulo/fate/Repo.java
+++ b/core/src/main/java/org/apache/accumulo/fate/Repo.java
@@ -20,7 +20,6 @@
 
 /**
  * Repeatable persisted operation
- *
  */
 public interface Repo<T> extends ReadOnlyRepo<T>, Serializable {
 
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 0c26a650e8..7b350be91f 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -31,8 +31,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// A ReadWriteLock that can be implemented in ZooKeeper.  Features the ability to store data
-// with the lock, and recover the lock using that data to find the lock.
+/**
+ * A ReadWriteLock that can be implemented in ZooKeeper. Features the ability to store data
+ * with the lock, and recover the lock using that data to find the lock.
+ */
 public class DistributedReadWriteLock implements java.util.concurrent.locks.ReadWriteLock {
 
   static enum LockType {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java b/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
index 5c02311131..052dfeb0b0 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
@@ -30,9 +30,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class BatchWriterConfigTest {
 
   @Test
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerImplTest.java
index 7bbff8fec0..0dfdd5a35c 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerImplTest.java
@@ -25,9 +25,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- *
- */
 public class ScannerImplTest {
 
   private ClientContext context;
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoderTest.java
index 1efeef7918..205ceeb965 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoderTest.java
@@ -21,9 +21,6 @@
 
 import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
 
-/**
- *
- */
 public class BigIntegerLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     assertSortOrder(new BigIntegerLexicoder(), Arrays.asList(new BigInteger("-1"),
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoderTest.java
index 5bb0a5048c..83690b2d9d 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoderTest.java
@@ -20,9 +20,6 @@
 
 import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
 
-/**
- *
- */
 public class DoubleLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     assertSortOrder(new DoubleLexicoder(),
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoderTest.java
index c3487dcd7d..da6682e898 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoderTest.java
@@ -20,9 +20,6 @@
 
 import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
 
-/**
- *
- */
 public class FloatLexicoderTest extends AbstractLexicoderTest {
 
   public void testSortOrder() {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
index 8ce0ec6687..9281d4d56b 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
@@ -21,9 +21,6 @@
 import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
 import org.apache.accumulo.core.util.ComparablePair;
 
-/**
- *
- */
 public class PairLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     PairLexicoder<String,String> plexc = new PairLexicoder<>(new StringLexicoder(),
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
index 5c42876bd8..6cdfa29720 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
@@ -21,9 +21,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class SecurityErrorCodeTest {
 
   @Test
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/PasswordTokenTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/PasswordTokenTest.java
index 2d8a603818..026b631916 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/PasswordTokenTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/PasswordTokenTest.java
@@ -23,9 +23,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class PasswordTokenTest {
 
   @Test
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
index f57cf1b13f..94df562c67 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
@@ -36,9 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class CredentialProviderFactoryShimTest {
 
   private static final Logger log = LoggerFactory
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
index 0032ff051e..2ec6ab9f43 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
@@ -31,9 +31,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class BlockIndexTest {
 
   private static class MyCacheEntry implements CacheEntry {
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
index 482e1617cf..fe3d98f9f5 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
@@ -42,9 +42,6 @@
 
 import com.google.common.util.concurrent.AtomicLongMap;
 
-/**
- *
- */
 public class RFileMetricsTest {
 
   @Rule
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
index 5051c44e71..8f52fdd4d8 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
@@ -31,9 +31,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- *
- */
 public class ReplicationConfigurationUtilTest {
 
   private AccumuloConfiguration conf;
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
index a28c04eaf4..d1e66fe5ab 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
@@ -23,9 +23,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class ReplicationTargetTest {
 
   @Test
diff --git a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
index 9cc2256619..f332d491d1 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
@@ -30,9 +30,6 @@
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.junit.Test;
 
-/**
- *
- */
 public class AuthenticationTokenTest {
   @Test
   public void testSerializeDeserializeToken() throws AccumuloSecurityException, IOException {
diff --git a/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java
index 926afd7a4b..be27d9a662 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java
@@ -22,7 +22,6 @@
 
 /**
  * Test the TextUtil class.
- *
  */
 public class TextUtilTest extends TestCase {
   /**
diff --git a/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 552103c366..6ad8098c94 100644
--- a/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -24,9 +24,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class AgeOffStoreTest {
 
   private static class TestTimeSource implements TimeSource {
diff --git a/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 1241c369da..f611662153 100644
--- a/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -25,7 +25,6 @@
 
 /**
  * Test the AddressUtil class.
- *
  */
 public class AddressUtilTest extends TestCase {
 
diff --git a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.java b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.java
index f25555e251..7d90ac957f 100644
--- a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.java
+++ b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.java
@@ -51,7 +51,6 @@
  *   return BaseJUnit4IteratorTest.createParameters(input, expectedOutput, testCases);
  * }
  * </pre>
- *
  */
 @RunWith(Parameterized.class)
 public class BaseJUnit4IteratorTest {
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
index a66d69b0fd..4a99a749c0 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
@@ -34,7 +34,6 @@
  *
  * @since 1.6.0
  */
-
 public interface AccumuloCluster {
 
   /**
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
index fa3fc163bc..d52f91fb88 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
@@ -19,7 +19,6 @@
 /**
  * @since 1.6.0
  */
-
 public enum MemoryUnit {
 
   BYTE(1L, ""),
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
index b76daf0405..2a5a772bea 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
@@ -26,7 +26,6 @@
 import org.apache.hadoop.conf.Configuration;
 
 /**
- *
  * @since 1.6.0
  */
 public class MiniAccumuloInstance extends ZooKeeperInstance {
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/ServerType.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/ServerType.java
index a20699a8b1..19c36c8643 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/ServerType.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/ServerType.java
@@ -19,7 +19,6 @@
 /**
  * @since 1.6.0
  */
-
 public enum ServerType {
   MASTER("Master"),
   ZOOKEEPER("ZooKeeper"),
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index 25babd7975..bf10434f3e 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -45,9 +45,6 @@
 
 import com.google.common.collect.Maps;
 
-/**
- *
- */
 public class MiniAccumuloClusterControl implements ClusterControl {
   private static final Logger log = LoggerFactory.getLogger(MiniAccumuloClusterControl.class);
 
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
index 937aca6482..14abb00048 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
@@ -27,9 +27,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-/**
- *
- */
 public class CleanShutdownMacTest {
 
   @Rule
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
index b9ec2ae87d..65e8d600af 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
@@ -60,7 +60,6 @@
 /**
  * An implementation of Instance that looks in HDFS and ZooKeeper to find the master and root tablet
  * location.
- *
  */
 public class HdfsZooInstance implements Instance {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/ViewFSUtils.java b/server/base/src/main/java/org/apache/accumulo/server/fs/ViewFSUtils.java
index df542da4dc..31e698487c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/ViewFSUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/ViewFSUtils.java
@@ -22,9 +22,6 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
-/**
- *
- */
 public class ViewFSUtils {
 
   public static final String VIEWFS_CLASSNAME = "org.apache.hadoop.fs.viewfs.ViewFileSystem";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
index c8b9706446..80ffacc8be 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
@@ -35,7 +35,6 @@
 
 /**
  * A special iterator for the metadata table that removes inactive bulk load flags
- *
  */
 public class MetadataBulkLoadFilter extends Filter {
   private static final Logger log = LoggerFactory.getLogger(MetadataBulkLoadFilter.class);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
index 15eb5a29af..da74826d63 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
@@ -64,7 +64,6 @@
  * <p>
  * Even when a log is UNREFERENCED by the tablet server, the replication mechanism may still need
  * the log. The GC will defer log removal until replication is finished with it.
- *
  */
 public class WalStateManager {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index 171ec0d687..2eaeefb6aa 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -69,7 +69,6 @@
  * To use this balancer you must extend it and implement {@link #getPartitioner()}. See
  * {@link RegexGroupBalancer} as an example.
  */
-
 public abstract class GroupBalancer extends TabletBalancer {
 
   private final Table.ID tableId;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java
index e340910eea..6e85a21133 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java
@@ -44,7 +44,6 @@
  * metadata table, may want to set this higher for large tables.
  * </ul>
  */
-
 public class RegexGroupBalancer extends GroupBalancer {
 
   public static final String REGEX_PROPERTY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
index cc9ac3e1f9..3cdd569d77 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
@@ -22,9 +22,6 @@
 import org.apache.accumulo.server.fs.VolumeManager.FileType;
 import org.apache.hadoop.fs.Path;
 
-/**
- *
- */
 public class RecoveryPath {
 
   // given a wal path, transform it to a recovery path
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStore.java
index 32769451d2..275c9d2072 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStore.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-/*
+/**
  * An abstract version of ZooKeeper that we can write tests against.
  */
 public interface DistributedStore {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java
index ccdef293ef..43ac71097f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java
@@ -24,7 +24,9 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.HostAndPort;
 
-/** For a suspended tablet, the time of suspension and the server it was suspended from. */
+/**
+ * For a suspended tablet, the time of suspension and the server it was suspended from.
+ */
 public class SuspendingTServer {
   public final HostAndPort server;
   public final long suspensionTime;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
index c1b620aacf..82311dd628 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
@@ -35,7 +35,6 @@
  * When the tablet server is restarted, the instance information it advertises will change.
  * Therefore tablet assignments can be considered out-of-date if the tablet server instance
  * information has been changed.
- *
  */
 public class TServerInstance implements Comparable<TServerInstance>, Serializable {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
index aea0d0ff10..b08191c2da 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
@@ -30,7 +30,6 @@
  *
  * ZooTabletStateStore: information about the root tablet is stored in ZooKeeper MetaDataStateStore:
  * information about the other tablets are stored in the metadata table
- *
  */
 public abstract class TabletStateStore implements Iterable<TabletLocationState> {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics.java
index f4512668e1..aafea71106 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.server.metrics;
 
-/**
- *
- */
 public interface Metrics {
 
   String PREFIX = "Accumulo";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
index dc1c0cb684..7908ec3f22 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
@@ -24,9 +24,6 @@
 import org.apache.hadoop.metrics2.lib.Interns;
 import org.apache.hadoop.metrics2.lib.MetricsRegistry;
 
-/**
- *
- */
 public class Metrics2ThriftMetrics implements Metrics, MetricsSource, ThriftMetricsKeys {
   public static final String CONTEXT = "thrift";
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsFactory.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsFactory.java
index aadf830267..fc5ddb2bd2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsFactory.java
@@ -20,9 +20,6 @@
 import org.apache.accumulo.core.conf.Property;
 import org.apache.hadoop.metrics2.MetricsSystem;
 
-/**
- *
- */
 public class MetricsFactory {
 
   private final boolean useOldMetrics;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
index bd6bccafdb..7671c12006 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
@@ -22,9 +22,6 @@
 import org.apache.hadoop.metrics2.source.JvmMetrics;
 import org.apache.hadoop.metrics2.source.JvmMetricsInfo;
 
-/**
- *
- */
 public class MetricsSystemHelper {
 
   private static String processName = "Unknown";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetricsKeys.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetricsKeys.java
index f527657adc..f83499e029 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetricsKeys.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetricsKeys.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.server.metrics;
 
-/**
- *
- */
 public interface ThriftMetricsKeys {
 
   static String idle = "idle";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
index 70017d028a..2fa5417de9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
@@ -41,7 +41,6 @@
 
 /**
  * Hijack log4j and capture log events for display.
- *
  */
 public class LogService extends org.apache.log4j.AppenderSkeleton {
 
@@ -49,7 +48,6 @@
 
   /**
    * Read logging events forward to us over the net.
-   *
    */
   static class SocketServer implements Runnable {
     private ServerSocket server = null;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java b/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java
index b4b4913847..605829b80c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java
@@ -26,9 +26,6 @@
 
 import com.google.common.collect.Maps;
 
-/**
- *
- */
 public class DistributedWorkQueueWorkAssignerHelper {
 
   public static final String KEY_SEPARATOR = "|";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/PrintReplicationRecords.java b/server/base/src/main/java/org/apache/accumulo/server/replication/PrintReplicationRecords.java
index a0e780c5d2..0e7914e2e2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/PrintReplicationRecords.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/PrintReplicationRecords.java
@@ -37,9 +37,6 @@
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
-/**
- *
- */
 public class PrintReplicationRecords implements Runnable {
   private static final Logger log = LoggerFactory.getLogger(PrintReplicationRecords.class);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemFactory.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemFactory.java
index 1ebed1420c..9335669b31 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemFactory.java
@@ -25,9 +25,6 @@
 
 import com.google.common.collect.Maps;
 
-/**
- *
- */
 public class ReplicaSystemFactory {
   private static final Logger log = LoggerFactory.getLogger(ReplicaSystemFactory.class);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
index e9a65076e7..404720bc9e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
@@ -34,9 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class ReplicaSystemHelper {
   private static final Logger log = LoggerFactory.getLogger(ReplicaSystemHelper.class);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
index 183725edec..15c2b96ee0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
@@ -54,9 +54,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class AuditedSecurityOperation extends SecurityOperation {
 
   public static final String AUDITLOG = "org.apache.accumulo.audit";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
index d46688a843..d923adad76 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
@@ -27,9 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class SecurityUtil {
   private static final Logger log = LoggerFactory.getLogger(SecurityUtil.class);
   private static final Logger renewalLog = LoggerFactory.getLogger("KerberosTicketRenewal");
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 689e647179..0150111bb5 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
@@ -28,7 +28,6 @@
  * implementation does not support configuration through Accumulo, it should throw an
  * AccumuloSecurityException with the error code UNSUPPORTED_OPERATION
  */
-
 public interface Authenticator {
 
   void initialize(String instanceId, boolean initialize);
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 1828aa6c94..4559a0d37a 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
@@ -31,9 +31,7 @@
  * instance.
  *
  * This is useful for filenames because it makes caching easy.
- *
  */
-
 public class UniqueNameAllocator {
   private long next = 0;
   private long maxAllocated = 0;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index 3cb005e620..bd09d84096 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -25,11 +25,7 @@
  * A MemoryManager in accumulo currently determines when minor compactions should occur and when
  * ingest should be put on hold. The goal of a memory manager implementation is to maximize ingest
  * throughput and minimize the number of minor compactions.
- *
- *
- *
  */
-
 public interface MemoryManager {
 
   /**
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java b/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java
index de28ad9942..39cc2d68b1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java
@@ -18,9 +18,6 @@
 
 import org.apache.accumulo.core.tabletserver.thrift.ActionStats;
 
-/**
- *
- */
 public class ActionStatsUpdator {
 
   public static void update(ActionStats summary, ActionStats td) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index c9a3c63f72..e2223f10af 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -63,9 +63,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class MasterMetadataUtil {
 
   private static final Logger log = LoggerFactory.getLogger(MasterMetadataUtil.class);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
index 5b0122c71d..3d568be45a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
@@ -56,7 +56,6 @@
 
 /**
  * Remove file entries for map files that don't exist.
- *
  */
 public class RemoveEntriesForMissingFiles {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index dd1b256163..89b8b66e2c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -24,9 +24,6 @@
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 
-/**
- *
- */
 public class TableInfoUtil {
 
   public static void add(TableInfo total, TableInfo more) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
index 7a0517aac6..6a9dd26a95 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
@@ -21,7 +21,6 @@
  *
  * RelativeTime and BaseRelativeTime are separated to provide unit tests of the core functionality
  * of Relative timekeeping.
- *
  */
 public class BaseRelativeTime implements ProvidesTime {
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/ProvidesTime.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/ProvidesTime.java
index 1042c3276d..16fe481237 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/ProvidesTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/ProvidesTime.java
@@ -18,7 +18,6 @@
 
 /**
  * An interface for anything that returns the time in the same format as System.currentTimeMillis().
- *
  */
 public interface ProvidesTime {
   long currentTime();
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 f97b74affe..04ce332582 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
@@ -32,7 +32,6 @@
 /**
  * Generic singleton timer. Don't use this if you are going to do anything that will take very long.
  * Please use it to reduce the number of threads dedicated to simple events.
- *
  */
 public class SimpleTimer {
   private static final Logger log = LoggerFactory.getLogger(SimpleTimer.class);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/SystemTime.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/SystemTime.java
index b8fe371189..e2a75ee173 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/SystemTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/SystemTime.java
@@ -18,7 +18,6 @@
 
 /**
  * The most obvious implementation of ProvidesTime.
- *
  */
 public class SystemTime implements ProvidesTime {
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
index 26822bb88e..d6da1ba65a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
@@ -32,9 +32,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-/**
- *
- */
 public class ServerConstantsTest {
   @Rule
   public TemporaryFolder folder = new TemporaryFolder(
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 3bfd8e5ebe..3e0868adf7 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -22,9 +22,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class FileRefTest {
 
   private void testBadTableSuffix(String badPath) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileTypeTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileTypeTest.java
index 695f6869f6..d9affc0fae 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileTypeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileTypeTest.java
@@ -21,9 +21,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class FileTypeTest {
   @Test
   public void testVolumeExtraction() {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/ViewFSUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/ViewFSUtilsTest.java
index d2fa9bafb9..3ae98c04ed 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/ViewFSUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/ViewFSUtilsTest.java
@@ -25,9 +25,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class ViewFSUtilsTest {
 
   private String[] shuffle(String... inputs) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
index e2db2ff0b9..e6484c0d0c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
@@ -31,9 +31,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-/**
- *
- */
 public class VolumeManagerImplTest {
 
   protected VolumeManager fs;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
index 149e555787..7505eb659f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
@@ -32,9 +32,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-/**
- *
- */
 public class VolumeUtilTest {
 
   @Rule
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index 70aa13e037..c101f16368 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -36,9 +36,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class MetadataBulkLoadFilterTest {
   static class TestArbitrator implements Arbitrator {
     @Override
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/ZooKeeperInitializationTest.java b/server/base/src/test/java/org/apache/accumulo/server/replication/ZooKeeperInitializationTest.java
index cc798679e6..76dce4f181 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/ZooKeeperInitializationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/ZooKeeperInitializationTest.java
@@ -26,9 +26,6 @@
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.junit.Test;
 
-/**
- *
- */
 public class ZooKeeperInitializationTest {
 
   @Test
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/proto/StatusTest.java b/server/base/src/test/java/org/apache/accumulo/server/replication/proto/StatusTest.java
index b2ce5eff0c..297b9fc556 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/proto/StatusTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/proto/StatusTest.java
@@ -20,9 +20,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class StatusTest {
 
   @Test
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index e7530813d7..68434cec57 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -40,9 +40,6 @@
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
-/**
- *
- */
 public class FileUtilTest {
   @SuppressWarnings("deprecation")
   private static Property INSTANCE_DFS_DIR = Property.INSTANCE_DFS_DIR;
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 5d1a0899c1..04f0c1aad4 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -51,9 +51,6 @@
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
 
-/**
- *
- */
 public class GarbageCollectionAlgorithm {
 
   private static final Logger log = LoggerFactory.getLogger(GarbageCollectionAlgorithm.class);
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index e7a00804c1..f9abfa11f8 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -36,9 +36,6 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
 import org.apache.accumulo.server.replication.proto.Replication.Status;
 
-/**
- *
- */
 public interface GarbageCollectionEnvironment {
 
   /**
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 7b0f13053c..a719378f9c 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -42,9 +42,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class GarbageCollectionTest {
   static class TestGCE implements GarbageCollectionEnvironment {
     TreeSet<String> candidates = new TreeSet<>();
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index 0777e13075..d4f04b2678 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -77,9 +77,6 @@
 import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
 
-/**
- *
- */
 class FateServiceHandler implements FateService.Iface {
 
   protected final Master master;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java
index bbf61a01f3..978f36cb88 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java
@@ -25,9 +25,6 @@
 import org.apache.accumulo.server.metrics.MetricsSystemHelper;
 import org.apache.hadoop.metrics2.MetricsSystem;
 
-/**
- *
- */
 public class MasterMetricsFactory {
 
   private final boolean useOldMetrics;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
index 2f5b30971c..db8db264e1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
@@ -43,9 +43,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class Metrics2ReplicationMetrics implements Metrics, MetricsSource {
   public static final String NAME = MASTER_NAME + ",sub=Replication",
       DESCRIPTION = "Data-Center Replication Metrics", CONTEXT = "master",
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetricsMBean.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetricsMBean.java
index a29e5b491b..fb2e703eda 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetricsMBean.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetricsMBean.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.master.metrics;
 
-/**
- *
- */
 public interface ReplicationMetricsMBean {
 
   /**
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
index 4bbb12b589..43131b2efc 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
@@ -22,9 +22,6 @@
 import org.apache.accumulo.core.trace.thrift.TInfo;
 import org.apache.accumulo.fate.Repo;
 
-/**
- *
- */
 public class TraceRepo<T> implements Repo<T> {
 
   private static final long serialVersionUID = 1L;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
index 368816f3fc..01d6a5822c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
@@ -51,7 +51,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/*
+/**
  * Bulk import makes requests of tablet servers, and those requests can take a
  * long time. Our communications to the tablet server may fail, so we won't know
  * the status of the request. The master will repeat failed requests so now
@@ -68,7 +68,6 @@
  * before it has made any bookkeeping about the request. To prevent problems
  * like this, an Arbitrator is used. Before starting any new request, the tablet
  * server checks the Arbitrator to see if the request is still valid.
- *
  */
 public class BulkImport extends MasterRepo {
   public static final String FAILURES_TXT = "failures.txt";
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
index 29839f89b9..db7f1f1a15 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
@@ -40,7 +40,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/*
+/**
  * Bulk import makes requests of tablet servers, and those requests can take a
  * long time. Our communications to the tablet server may fail, so we won't know
  * the status of the request. The master will repeat failed requests so now
@@ -57,7 +57,6 @@
  * before it has made any bookkeeping about the request. To prevent problems
  * like this, an Arbitrator is used. Before starting any new request, the tablet
  * server checks the Arbitrator to see if the request is still valid.
- *
  */
 class BulkImportMove extends MasterRepo {
 
diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java
index aa30f181d4..d418054b3f 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java
@@ -27,9 +27,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class DistributedWorkQueueWorkAssignerHelperTest {
 
   @Test
diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java
index 823fcf4b4a..e39654ab2d 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java
@@ -28,9 +28,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class MasterReplicationCoordinatorTest {
 
   @Test
diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java
index 38f13a06bd..e5aa9f47e1 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java
@@ -24,9 +24,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class ImportTableTest {
 
   @Test
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
index cfffbb4eeb..c2329e62b0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
@@ -30,11 +30,9 @@
 import org.apache.accumulo.monitor.rest.tservers.TabletServer;
 
 /**
- *
  * Generate summary of Monitor
  *
  * @since 2.0.0
- *
  */
 @XmlRootElement(name = "stats")
 public class SummaryInformation {
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
index ae9d4fc078..aa8d1b9df9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest;
 
 /**
- *
  * Generates the totals for XML summary
  *
  * @since 2.0.0
- *
  */
 public class Totals {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
index 8e68bc2068..d821707179 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
@@ -31,11 +31,9 @@
 import org.apache.accumulo.monitor.rest.tservers.TabletServer;
 
 /**
- *
  * Responsible for generating a JSON and XML summary of the Monitor
  *
  * @since 2.0.0
- *
  */
 @Path("/")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
index 1ebdc10719..7cbc1ed9e4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
@@ -23,7 +23,6 @@
  * BulkImport stores the bulk import and tserver bulk imports
  *
  * @since 2.0.0
- *
  */
 public class BulkImport {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
index e056a2c594..00688b62d1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
@@ -22,7 +22,6 @@
  * Stores bulk import in a JSON object
  *
  * @since 2.0.0
- *
  */
 public class BulkImportInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
index c5caf6ba52..40c46e9401 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
@@ -32,7 +32,6 @@
  * tablet server bulk import from the Monitor and creating the JSON objects with each
  *
  * @since 2.0.0
- *
  */
 @Path("/bulkImports")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/TabletServerBulkImportInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/TabletServerBulkImportInformation.java
index d990c42d4e..35dba1ece3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/TabletServerBulkImportInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/TabletServerBulkImportInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 
 /**
- *
  * Stores tserver bulk import information
  *
  * @since 2.0.0
- *
  */
 public class TabletServerBulkImportInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollection.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollection.java
index 188685d069..33f9e80720 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollection.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollection.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.gc.thrift.GcCycleStats;
 
 /**
- *
  * GarbageCollection is responsible for creating the gc JSON object
  *
  * @since 2.0.0
- *
  */
 public class GarbageCollection {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
index 933b119926..00bca7029f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.gc.thrift.GcCycleStats;
 
 /**
- *
  * Metrics about a single cycle of the garbage collector
  *
  * @since 2.0.0
- *
  */
 public class GarbageCollectorCycle {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
index e3e46779e0..ef612fa01a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
@@ -25,11 +25,9 @@
 import org.apache.accumulo.monitor.Monitor;
 
 /**
- *
  * GarbageCollector metrics
  *
  * @since 2.0.0
- *
  */
 @Path("/gc")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java
index af322aa230..97a063f992 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.gc.thrift.GCStatus;
 
 /**
- *
  * Responsible for grouping files and wals into a JSON object
  *
  * @since 2.0.0
- *
  */
 public class GarbageCollectorStatus {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
index 6950c5ecb6..2273a2ff53 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
@@ -19,11 +19,9 @@
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
- *
  * Stores dead logger information
  *
  * @since 2.0.0
- *
  */
 public class DeadLoggerInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerList.java
index 40cbe53a71..bbcc7c1265 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Stores a new dead logger object
  *
  * @since 2.0.0
- *
  */
 public class DeadLoggerList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java
index 4b025a823b..fd56514e07 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.logs;
 
 /**
- *
  * A single message logged
  *
  * @since 2.0.0
- *
  */
 public class LogEvent {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
index bb71eb089e..68e0ad2a2c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
@@ -30,11 +30,9 @@
 import org.apache.log4j.spi.LoggingEvent;
 
 /**
- *
  * Responsible for generating a new log JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/logs")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
index 6f132ac2d3..efdcc6054e 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
@@ -22,11 +22,9 @@
 import org.apache.accumulo.monitor.rest.tservers.ServersShuttingDown;
 
 /**
- *
  * Responsible for storing master information as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class MasterInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
index a9d52a5b33..0ab0abc4ff 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
@@ -44,11 +44,9 @@
 import org.apache.accumulo.server.master.state.TabletServerState;
 
 /**
- *
  * Responsible for generating a new Master information JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/master")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetail.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetail.java
index e65c6b291c..f9315b719a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetail.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetail.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Stores a new problem detail object
  *
  * @since 2.0.0
- *
  */
 public class ProblemDetail {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
index 68bd45d3be..434eeb9565 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
@@ -22,11 +22,9 @@
 import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
 
 /**
- *
  * Generates a problem detail as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class ProblemDetailInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummary.java
index 05e373e0c0..03bb013abd 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummary.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Stores a new problem summary object
  *
  * @since 2.0.0
- *
  */
 public class ProblemSummary {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
index 99cdf84bf5..1d0f75f0ea 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
@@ -22,11 +22,9 @@
 import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
 
 /**
- *
  * Generates a problem summary object
  *
  * @since 2.0.0
- *
  */
 public class ProblemSummaryInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
index 9da241fc7e..75b10f88d1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
@@ -46,11 +46,9 @@
 import org.slf4j.LoggerFactory;
 
 /**
- *
  * Generates a problem summary and details as a JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/problems")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationInformation.java
index 916a7dc466..8737563186 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.replication;
 
 /**
- *
  * Generates the replication information as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class ReplicationInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index ea060239a3..82d2692fc3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -57,11 +57,9 @@
 import org.slf4j.LoggerFactory;
 
 /**
- *
  * Generates the replication table with information from the Monitor
  *
  * @since 2.0.0
- *
  */
 @Path("/replication")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java
index 849e66c401..34a3ad58df 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 
 /**
- *
  * Generates a scan JSON object
  *
  * @since 2.0.0
- *
  */
 public class ScanInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java
index 5c34c29d98..d2a2660f04 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a new scan list as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class Scans {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
index 9eea79508e..57a9ca0874 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
@@ -29,11 +29,9 @@
 import org.apache.accumulo.monitor.Monitor.ScanStats;
 
 /**
- *
  * Generate a new Scan list JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/scans")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
index 1b9fbdffe7..bdbbc3f409 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
@@ -29,11 +29,9 @@
 import org.apache.accumulo.monitor.Monitor;
 
 /**
- *
  * Generates a list of statistics as a JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/statistics")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java
index 05e50b046a..d603c6dcf7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.status;
 
 /**
- *
  * Generates status of master, gc, and tservers, as well as log and problem report
  *
  * @since 2.0.0
- *
  */
 public class StatusInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
index 57332c1b0b..7d4f5293a9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
@@ -32,11 +32,9 @@
 import org.apache.log4j.Level;
 
 /**
- *
  * Generates the status for master, gc, and tservers as well as log and problem reports
  *
  * @since 2.0.0
- *
  */
 @Path("/status")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java
index 60f11e2118..3602d685a9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tables;
 
 /**
- *
  * Generates a list of compactions as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class CompactionsList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
index 4699c18c12..df2efe8469 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tables;
 
 /**
- *
  * Generates a list of compactions based on type
  *
  * @since 2.0.0
- *
  */
 public class CompactionsTypes {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
index b781712859..3f6b5771b5 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
@@ -23,11 +23,9 @@
 import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
 
 /**
- *
  * Generates table information as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class TableInformation {
   private final String ZERO_COMBO = "0(0)";
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java
index 15dead0833..0fead3e2d1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list with table information
  *
  * @since 2.0.0
- *
  */
 public class TableInformationList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java
index 4d6ae2aa6b..57f5425ef0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of tables grouped by namespace
  *
  * @since 2.0.0
- *
  */
 public class TableNamespace {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java
index e835b0505a..cc2348b733 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of tables as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class TablesList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 203ac0019f..af2fdc351f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -55,11 +55,9 @@
 import org.apache.hadoop.io.Text;
 
 /**
- *
  * Generates a tables list from the Monitor as a JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/tables")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
index ae53230564..fa65608622 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates addiotional information for the selected trace
  *
  * @since 2.0.0
- *
  */
 public class AddlInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
index c0d87f9e5e..80bc4f034b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.trace;
 
 /**
- *
  * Generates annotation information for the trace
  *
  * @since 2.0.0
- *
  */
 public class AnnotationInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
index 77a3ba862d..92a8af3fd6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.trace;
 
 /**
- *
  * Generate a new data information for a trace
  *
  * @since 2.0.0
- *
  */
 public class DataInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
index e6a7f2d73c..a0168bfa9d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.tracer.thrift.RemoteSpan;
 
 /**
- *
  * Generates a recent trace
  *
  * @since 2.0.0
- *
  */
 public class RecentTracesInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
index b0a3816a5e..9ac5c6acf5 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of recent traces
  *
  * @since 2.0.0
- *
  */
 public class RecentTracesList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java
index a6da7c2493..025c1513ce 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.core.master.thrift.RecoveryStatus;
 
 /**
- *
  * Generates a recovery status
  *
  * @since 2.0.0
- *
  */
 public class RecoveryStatusInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
index 5947eaf5d0..e6806cd96f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.trace;
 
 /**
- *
  * Generates a list of traces for an ID
  *
  * @since 2.0.0
- *
  */
 public class TraceInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
index 661b451f40..af616c819b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of traces for an ID
  *
  * @since 2.0.0
- *
  */
 public class TraceList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
index 706743bc0c..cbac6bd49b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of traces grouped by type
  *
  * @since 2.0.0
- *
  */
 public class TraceType {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
index f1b4270592..9848657de3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.tracer.thrift.RemoteSpan;
 
 /**
- *
  * Generates a list of traces per type
  *
  * @since 2.0.0
- *
  */
 public class TracesForTypeInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
index c6404b0e0e..4185a4acb4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
@@ -69,11 +69,9 @@
 import org.apache.hadoop.security.UserGroupInformation;
 
 /**
- *
  * Generates a list of traces with the summary, by type, and trace details
  *
  * @since 2.0.0
- *
  */
 @Path("/trace")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java
index add346d6fd..eb69b7fc44 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tservers;
 
 /**
- *
  * Generates a tablets all time results
  *
  * @since 2.0.0
- *
  */
 public class AllTimeTabletResults {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
index 65cfab24d3..985e921ae5 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
@@ -19,11 +19,9 @@
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
- *
  * Generates a bad tserver information
  *
  * @since 2.0.0
- *
  */
 public class BadTabletServerInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServers.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServers.java
index aaa545d8ac..7c7280c264 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServers.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServers.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of bad tservers
  *
  * @since 2.0.0
- *
  */
 public class BadTabletServers {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
index 882b1393d7..b7016c9bd6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
@@ -22,11 +22,9 @@
 import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
 
 /**
- *
  * Generates the current operations for the tablet
  *
  * @since 2.0.0
- *
  */
 public class CurrentOperations {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
index 6d8996f240..3c075bb484 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tservers;
 
 /**
- *
  * Generates the current results of the tablet
  *
  * @since 2.0.0
- *
  */
 public class CurrentTabletResults {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
index 79e4aa126f..63515f3719 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
@@ -19,11 +19,9 @@
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
- *
  * Generates a dead tserver information
  *
  * @since 2.0.0
- *
  */
 public class DeadServerInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerList.java
index e472671183..89b02d297a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerList.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerList.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of dead tservers
  *
  * @since 2.0.0
- *
  */
 public class DeadServerList {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
index 7c08434172..ce7ce97da6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
@@ -19,11 +19,9 @@
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
- *
  * Generates a tserver shutting down
  *
  * @since 2.0.0
- *
  */
 public class ServerShuttingDownInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java
index f5db4b2f70..375340608b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tservers;
 
 /**
- *
  * Stores the server stats
  *
  * @since 2.0.0
- *
  */
 public class ServerStat {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java
index 94e61b4375..db52add769 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Stores maximum and minimum numbers for server stats in a list
  *
  * @since 2.0.0
- *
  */
 public class ServerStats {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServersShuttingDown.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServersShuttingDown.java
index 61f37b8f8c..1334ae497a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServersShuttingDown.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServersShuttingDown.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of servers shutting down
  *
  * @since 2.0.0
- *
  */
 public class ServersShuttingDown {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java
index 7cdaf42b66..585b326c8d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java
@@ -20,11 +20,9 @@
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 
 /**
- *
  * To use for XML Resource
  *
  * @since 2.0.0
- *
  */
 public class TabletServer {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
index ca5c97c745..83edd5a07a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tservers;
 
 /**
- *
  * Generates tserver detail as JSON object
  *
  * @since 2.0.0
- *
  */
 public class TabletServerDetailInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
index 7c49c891c6..72144630eb 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
@@ -31,11 +31,9 @@
 import org.apache.accumulo.server.util.TableInfoUtil;
 
 /**
- *
  * Generates tserver information
  *
  * @since 2.0.0
- *
  */
 public class TabletServerInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java
index cedcb1b90a..a82364a83f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.tservers;
 
 /**
- *
  * Generates a tserver recovery information
  *
  * @since 2.0.0
- *
  */
 public class TabletServerRecoveryInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index d3c0987e9a..bb5eef3a80 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -61,11 +61,9 @@
 import org.apache.accumulo.server.util.ActionStatsUpdator;
 
 /**
- *
  * Generates tserver lists as JSON objects
  *
  * @since 2.0.0
- *
  */
 @Path("/tservers")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java
index 7ccc27896b..39ab2f57e7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java
@@ -19,11 +19,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a summary for the tserver
  *
  * @since 2.0.0
- *
  */
 public class TabletServerSummary {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerWithTableInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerWithTableInformation.java
index 3e656ec3b3..bcb7c8ee1e 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerWithTableInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerWithTableInformation.java
@@ -19,11 +19,9 @@
 import org.apache.accumulo.monitor.rest.tables.TableInformation;
 
 /**
- *
  * Generates a tserver with table information
  *
  * @since 2.0.0
- *
  */
 public class TabletServerWithTableInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
index 6783e29f7b..d526c89fec 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
@@ -22,11 +22,9 @@
 import org.apache.accumulo.monitor.rest.master.MasterInformation;
 
 /**
- *
  * Generates a list of servers, bad servers, and dead servers
  *
  * @since 2.0.0
- *
  */
 public class TabletServers {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java
index eb66f574c6..92b226d0fd 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of tservers recoveries
  *
  * @since 2.0.0
- *
  */
 public class TabletServersRecovery {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZKInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZKInformation.java
index f35dd90221..c27a4413a9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZKInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZKInformation.java
@@ -20,11 +20,9 @@
 import java.util.List;
 
 /**
- *
  * Generates a list of Zookeeper server information
  *
  * @since 2.0.0
- *
  */
 public class ZKInformation {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZooKeeper.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZooKeeper.java
index c55514377b..6b60d0ead1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZooKeeper.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZooKeeper.java
@@ -17,11 +17,9 @@
 package org.apache.accumulo.monitor.rest.zk;
 
 /**
- *
  * Generates a new zookeeper information as a JSON object
  *
  * @since 2.0.0
- *
  */
 public class ZooKeeper {
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
index 28225cb106..911b26b66f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
@@ -25,11 +25,9 @@
 import org.apache.accumulo.monitor.ZooKeeperStatus.ZooKeeperState;
 
 /**
- *
  * Generates a new ZooKeeper information as a JSON object
  *
  * @since 2.0.0
- *
  */
 @Path("/zk")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index fb21f2a76b..0e7c08df3f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -56,11 +56,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- *
  * Index is responsible of specifying Monitor paths and setting the templates for the HTML code
  *
  * @since 2.0.0
- *
  */
 @Path("/")
 @Produces(MediaType.TEXT_HTML)
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 41921e5bf7..8919c46e92 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -21,14 +21,13 @@
 import java.util.Iterator;
 import java.util.Set;
 
-/*
+/**
  * A token is a word in a command in the shell.  The tree that this builds is used for
  * tab-completion of tables, users, commands and certain other parts of the shell that
  * can be realistically and quickly gathered. Tokens can have multiple commands grouped
  * together and many possible subcommands, although they are stored in a set so duplicates
  * aren't allowed.
  */
-
 public class Token {
   private Set<String> command = new HashSet<>();
   private Set<Token> subcommands = new HashSet<>();
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
index 2e1cd62087..3612368ee6 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
@@ -59,7 +59,6 @@
 
 /**
  * Manage FATE transactions
- *
  */
 public class FateCommand extends Command {
 
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/InterpreterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/InterpreterCommand.java
index f405e195a6..6452557c14 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/InterpreterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/InterpreterCommand.java
@@ -20,9 +20,6 @@
 import org.apache.accumulo.core.util.interpret.ScanInterpreter;
 import org.apache.accumulo.shell.Shell;
 
-/**
- *
- */
 public class InterpreterCommand extends ShellPluginConfigurationCommand {
 
   public InterpreterCommand() {
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 b3132f2a68..a18ceeb7a7 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
@@ -27,9 +27,6 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 
-/**
- *
- */
 public class ListShellIterCommand extends Command {
 
   private Option nameOpt, profileOpt;
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
index 61f8846cd7..6406ab858d 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
@@ -26,9 +26,6 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 
-/**
- *
- */
 public class PingCommand extends Command {
 
   private Option tserverOption, disablePaginationOpt;
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
index 117dea1544..0687b86744 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
@@ -34,7 +34,6 @@
  *
  * The behavior is the same for single and double quoted strings. (i.e. '\'' is the same as "\'")
  */
-
 public class QuotedStringTokenizer implements Iterable<String> {
   private ArrayList<String> tokens;
   private String input;
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteAuthsCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteAuthsCommandTest.java
index 26886c6cb8..b88ccc10d0 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteAuthsCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteAuthsCommandTest.java
@@ -27,9 +27,6 @@
 
 import jline.console.ConsoleReader;
 
-/**
- *
- */
 public class DeleteAuthsCommandTest {
 
   private DeleteAuthsCommand cmd;
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
index 9f067b4f5e..db28e37082 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
@@ -25,9 +25,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- *
- */
 public class DeleteTableCommandTest {
 
   @Test
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
index c8f6d5e437..9f79259e43 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
@@ -26,9 +26,6 @@
 
 import jline.console.ConsoleReader;
 
-/**
- *
- */
 public class DropUserCommandTest {
 
   private DropUserCommand cmd;
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
index f8f9e40fde..0f275c9472 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
@@ -40,7 +40,6 @@
  * Classloader that delegates operations to a VFSClassLoader object. This class also listens for
  * changes in any of the files/directories that are in the classpath and will recreate the delegate
  * object if there is any change in the classpath.
- *
  */
 public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingClassLoader {
 
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index 7347a95d90..7ee586cef9 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -63,7 +63,6 @@
  * AccumuloReloadingVFSClassLoader That loads jars from locations in general.dynamic.classpaths.
  * Used to load jar dynamically.
  * </pre>
- *
  */
 public class AccumuloVFSClassLoader {
 
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
index 95ccdf261a..d7a1094306 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
@@ -21,9 +21,6 @@
 import org.apache.commons.vfs2.FileSystemManager;
 import org.apache.commons.vfs2.impl.VFSClassLoader;
 
-/**
- *
- */
 public class PostDelegatingVFSClassLoader extends VFSClassLoader {
 
   public PostDelegatingVFSClassLoader(FileObject[] files, FileSystemManager manager,
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java
index 9de0422afe..94cb326e8a 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.start.classloader.vfs;
 
-/**
- *
- */
 public interface ReloadingClassLoader {
   ClassLoader getClassLoader();
 }
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
index 123db8b28e..3e3748ded0 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
@@ -33,9 +33,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class UniqueFileReplicator implements VfsComponent, FileReplicator {
 
   private static final char[] TMP_RESERVED_CHARS = {'?', '/', '\\', ' ', '&', '"', '\'', '*', '#',
diff --git a/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java b/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
index 155f985f10..9723368cbf 100644
--- a/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
+++ b/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
@@ -38,7 +38,6 @@
  * If the implementing class also wishes to have a redundant main method, it may be useful to simply
  * implement main as:<br>
  * {@code new MyImplementingClass().execute(args);}
- *
  */
 public interface KeywordExecutable {
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index dcce508f8a..eafe496e84 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -106,9 +106,6 @@
 
 import com.google.common.collect.Iterables;
 
-/**
- *
- */
 public class ConditionalWriterIT extends AccumuloClusterHarness {
   private static final Logger log = LoggerFactory.getLogger(ConditionalWriterIT.class);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
index 9a6fb7e77c..e807dfb17f 100644
--- a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
+++ b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
@@ -46,9 +46,6 @@
 
 import com.google.common.collect.Iterators;
 
-/**
- *
- */
 public class IMMLGBenchmark {
   public static void main(String[] args) throws Exception {
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
index 0a553b7dd7..b28a27a96f 100644
--- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
@@ -53,7 +53,6 @@
  * would be converted to a non-existent absolute path.
  * <p>
  * ACCUMULO-3215
- *
  */
 public class ImportExportIT extends AccumuloClusterHarness {
 
diff --git a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
index c2bb1374be..705c25a2fc 100644
--- a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
@@ -54,9 +54,6 @@
 
 import com.google.common.collect.Iterables;
 
-/**
- *
- */
 public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase {
   private static final Logger log = LoggerFactory
       .getLogger(MissingWalHeaderCompletesRecoveryIT.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index bc13bcf4c1..ad2b0c484c 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@ -85,9 +85,11 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-// Testing default namespace configuration with inheritance requires altering
-// the system state and restoring it back to normal. Punt on this for now and
-// just let it use a minicluster.
+/**
+ * Testing default namespace configuration with inheritance requires altering
+ * the system state and restoring it back to normal. Punt on this for now and
+ * just let it use a minicluster.
+ */
 @Category(MiniClusterOnlyTests.class)
 public class NamespacesIT extends AccumuloClusterHarness {
 
diff --git a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
index f1c159dc8d..c9035cae5a 100644
--- a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
@@ -40,9 +40,6 @@
 import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
-/**
- *
- */
 public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacBase {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
index da9d9749d4..141d73fa8e 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
@@ -57,9 +57,6 @@
 import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
-/**
- *
- */
 public class VolumeChooserIT extends ConfigurableMacBase {
 
   private static final Text EMPTY = new Text();
diff --git a/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java b/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
index bc65a7e79e..e900cd74da 100644
--- a/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
+++ b/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
@@ -24,7 +24,6 @@
 
 /**
  * Ensure that mutations are a reasonable size: we must be able to fit several in memory at a time.
- *
  */
 public class MaxMutationSize implements Constraint {
   static final long MAX_SIZE = Runtime.getRuntime().maxMemory() >> 8;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 405eadeece..4a4da74fbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -40,7 +40,6 @@
  * This test verifies that when a lot of files are bulk imported into a table with one tablet and
  * then splits that not all map files go to the children tablets.
  */
-
 public class BulkSplitOptimizationIT extends AccumuloClusterHarness {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index f5f6f43d96..5442e3fc28 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -57,9 +57,6 @@
 import org.junit.Assume;
 import org.junit.Test;
 
-/**
- *
- */
 public class CloneTestIT extends AccumuloClusterHarness {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index 2aa21133f1..51ab5c47cb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -43,7 +43,6 @@
  * A functional test that exercises hitting the max open file limit on a tablet server. This test
  * assumes there are one or two tablet servers.
  */
-
 public class MaxOpenIT extends AccumuloClusterHarness {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
index c23cf4dceb..b90ab4806e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
@@ -45,7 +45,6 @@
 
 /**
  * Check SSL for the Monitor
- *
  */
 public class MonitorSslIT extends ConfigurableMacBase {
   @BeforeClass
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index bd656c04f6..ba25ba0066 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -37,9 +37,6 @@
 
 import com.google.common.base.Stopwatch;
 
-/**
- *
- */
 public class ScannerIT extends AccumuloClusterHarness {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java
index 5e8034a704..90e7324a90 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java
@@ -24,9 +24,6 @@
 import org.apache.accumulo.core.constraints.Constraint;
 import org.apache.accumulo.core.data.Mutation;
 
-/**
- *
- */
 public class SlowConstraint implements Constraint {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
index 0da54b8ac5..f29c6da627 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
@@ -27,7 +27,6 @@
  * Do a selection of ITs with SSL turned on that cover a range of different connection scenarios.
  * Note that you can run *all* the ITs against SSL-enabled mini clusters with `mvn verify
  * -DuseSslForIT`
- *
  */
 public class SslIT extends ConfigurableMacBase {
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
index bb00b197c2..e0eec0b385 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
@@ -29,7 +29,6 @@
  * Run all the same tests as SslIT, but with client auth turned on.
  *
  * All the methods are overridden just to make it easier to run individual tests from an IDE.
- *
  */
 public class SslWithClientAuthIT extends SslIT {
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java
index 3a79409a0d..a67b0aa2f9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java
@@ -38,9 +38,6 @@
 import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.junit.Test;
 
-/**
- *
- */
 public class TimeoutIT extends AccumuloClusterHarness {
 
   @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
index 2cbfdfd055..fc682669a5 100644
--- a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
+++ b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
@@ -73,7 +73,6 @@
  * The result is a list of IT classes that pass or fail. Those classes that fail will be annotated
  * with the particular test that failed within the class.
  */
-
 public class IntegrationTestMapReduce extends Configured implements Tool {
 
   private static final Logger log = LoggerFactory.getLogger(IntegrationTestMapReduce.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index 0f69f4cd9d..dbe945f666 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@ -88,9 +88,7 @@
  * The purpose of this class is to server as fake tserver that is a data sink like /dev/null.
  * NullTserver modifies the metadata location entries for a table to point to it. This allows thrift
  * performance to be measured by running any client code that writes to a table.
- *
  */
-
 public class NullTserver {
 
   public static class ThriftClientHandler extends ClientServiceHandler
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index 833a95ae08..15968a7ded 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -55,10 +55,7 @@
 /**
  * This little program can be used to write a lot of metadata entries and measure the performance of
  * varying numbers of threads doing metadata lookups using the batch scanner.
- *
- *
  */
-
 public class MetadataBatchScanTest {
 
   private static final Logger log = LoggerFactory.getLogger(MetadataBatchScanTest.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
index 7500361130..1dc2c3a111 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
@@ -20,9 +20,6 @@
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.junit.BeforeClass;
 
-/**
- *
- */
 public class TBinaryProxyIT extends SimpleProxyBase {
 
   @BeforeClass
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
index d8b91c4cc1..049898cd80 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
@@ -20,9 +20,6 @@
 import org.apache.thrift.protocol.TJSONProtocol;
 import org.junit.BeforeClass;
 
-/**
- *
- */
 public class TJsonProtocolProxyIT extends SimpleProxyBase {
 
   @BeforeClass
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
index 2f792f6e60..2f8449df9f 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
@@ -20,9 +20,6 @@
 import org.apache.thrift.protocol.TTupleProtocol;
 import org.junit.BeforeClass;
 
-/**
- *
- */
 public class TTupleProxyIT extends SimpleProxyBase {
 
   @BeforeClass
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
index 1f7320a6c3..d722be66ab 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
@@ -40,9 +40,6 @@
 
 import com.google.common.collect.Iterables;
 
-/**
- *
- */
 public class MultiTserverReplicationIT extends ConfigurableMacBase {
   private static final Logger log = LoggerFactory.getLogger(MultiTserverReplicationIT.class);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationTablesPrinterThread.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationTablesPrinterThread.java
index b222de6152..37a9b3b1a0 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationTablesPrinterThread.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationTablesPrinterThread.java
@@ -22,9 +22,6 @@
 import org.apache.accumulo.core.util.Daemon;
 import org.apache.accumulo.server.replication.PrintReplicationRecords;
 
-/**
- *
- */
 public class ReplicationTablesPrinterThread extends Daemon {
 
   private PrintStream out;
diff --git a/test/src/test/java/org/apache/accumulo/test/fate/zookeeper/ZooLockTest.java b/test/src/test/java/org/apache/accumulo/test/fate/zookeeper/ZooLockTest.java
index 0d40c8aafd..a7582a8c28 100644
--- a/test/src/test/java/org/apache/accumulo/test/fate/zookeeper/ZooLockTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/fate/zookeeper/ZooLockTest.java
@@ -39,9 +39,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-/**
- *
- */
 public class ZooLockTest {
 
   private static final TemporaryFolder folder = new TemporaryFolder(
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ValueReversingIterator.java b/test/src/test/java/org/apache/accumulo/test/functional/ValueReversingIterator.java
index f1f06b7b5b..12705bec3d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ValueReversingIterator.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ValueReversingIterator.java
@@ -30,7 +30,6 @@
 
 /**
  * Iterator used in ScannerContextIT that reverses the bytes of the value
- *
  */
 public class ValueReversingIterator implements SortedKeyValueIterator<Key,Value> {
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services