accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch master updated: Cleaned up comments (#481)
Date Wed, 09 May 2018 20:15:53 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new dde9135  Cleaned up comments (#481)
dde9135 is described below

commit dde9135a22a994c71feafa0a30109d772c984914
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed May 9 16:15:49 2018 -0400

    Cleaned up comments (#481)
---
 .../java/org/apache/accumulo/core/client/AccumuloException.java   | 1 -
 .../apache/accumulo/core/client/AccumuloSecurityException.java    | 1 -
 .../main/java/org/apache/accumulo/core/client/BatchDeleter.java   | 2 --
 .../org/apache/accumulo/core/client/ConditionalWriterConfig.java  | 1 -
 core/src/main/java/org/apache/accumulo/core/client/Instance.java  | 1 -
 .../java/org/apache/accumulo/core/client/IsolatedScanner.java     | 2 --
 .../org/apache/accumulo/core/client/MultiTableBatchWriter.java    | 1 -
 .../apache/accumulo/core/client/MutationsRejectedException.java   | 1 -
 .../org/apache/accumulo/core/client/NamespaceExistsException.java | 1 -
 .../apache/accumulo/core/client/NamespaceNotFoundException.java   | 1 -
 .../apache/accumulo/core/client/SampleNotPresentException.java    | 1 -
 .../main/java/org/apache/accumulo/core/client/ScannerBase.java    | 1 -
 .../org/apache/accumulo/core/client/TableDeletedException.java    | 2 --
 .../org/apache/accumulo/core/client/TableNotFoundException.java   | 1 -
 .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java   | 2 --
 .../org/apache/accumulo/core/client/admin/ActiveCompaction.java   | 1 -
 .../java/org/apache/accumulo/core/client/admin/ActiveScan.java    | 1 -
 .../org/apache/accumulo/core/client/admin/CompactionConfig.java   | 1 -
 .../org/apache/accumulo/core/client/admin/InstanceOperations.java | 3 ---
 .../org/apache/accumulo/core/client/admin/TableOperations.java    | 2 --
 .../apache/accumulo/core/client/impl/AccumuloServerException.java | 2 --
 .../apache/accumulo/core/client/impl/ActiveCompactionImpl.java    | 1 -
 .../apache/accumulo/core/client/impl/BaseIteratorEnvironment.java | 1 -
 .../apache/accumulo/core/client/impl/TabletServerBatchWriter.java | 3 +--
 .../apache/accumulo/core/client/impl/ZookeeperLockChecker.java    | 3 ---
 .../org/apache/accumulo/core/client/lexicoder/PairLexicoder.java  | 1 -
 .../apache/accumulo/core/client/lexicoder/ReverseLexicoder.java   | 1 -
 .../apache/accumulo/core/client/lexicoder/StringLexicoder.java    | 1 -
 .../org/apache/accumulo/core/client/lexicoder/TextLexicoder.java  | 1 -
 .../apache/accumulo/core/client/sample/AbstractHashSampler.java   | 1 -
 .../org/apache/accumulo/core/client/sample/RowColumnSampler.java  | 1 -
 .../java/org/apache/accumulo/core/client/sample/RowSampler.java   | 1 -
 .../apache/accumulo/core/client/sample/SamplerConfiguration.java  | 1 -
 .../apache/accumulo/core/client/security/SecurityErrorCode.java   | 3 ---
 .../accumulo/core/client/security/tokens/AuthenticationToken.java | 1 -
 .../accumulo/core/client/security/tokens/DelegationToken.java     | 1 -
 .../accumulo/core/client/security/tokens/PasswordToken.java       | 1 -
 .../org/apache/accumulo/core/client/summary/CounterSummary.java   | 1 -
 .../src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java | 1 -
 core/src/main/java/org/apache/accumulo/core/data/Key.java         | 1 -
 .../main/java/org/apache/accumulo/core/data/impl/KeyExtent.java   | 2 --
 .../main/java/org/apache/accumulo/core/file/BloomFilterLayer.java | 1 -
 .../org/apache/accumulo/core/file/blockfile/ABlockReader.java     | 7 ++-----
 .../org/apache/accumulo/core/file/blockfile/ABlockWriter.java     | 7 ++-----
 .../org/apache/accumulo/core/file/blockfile/BlockFileReader.java  | 3 ---
 .../org/apache/accumulo/core/file/blockfile/BlockFileWriter.java  | 3 ---
 .../accumulo/core/file/blockfile/impl/CachableBlockFile.java      | 1 -
 .../java/org/apache/accumulo/core/file/keyfunctor/KeyFunctor.java | 1 -
 .../main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java | 3 ---
 .../main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java | 1 -
 .../org/apache/accumulo/core/iterators/AggregatingIterator.java   | 1 -
 .../src/main/java/org/apache/accumulo/core/iterators/DevNull.java | 2 --
 .../java/org/apache/accumulo/core/iterators/OptionDescriber.java  | 1 -
 .../main/java/org/apache/accumulo/core/iterators/OrIterator.java  | 1 -
 .../apache/accumulo/core/iterators/SortedKeyValueIterator.java    | 1 -
 .../org/apache/accumulo/core/iterators/SortedMapIterator.java     | 2 --
 .../accumulo/core/iterators/system/LocalityGroupIterator.java     | 3 ---
 .../org/apache/accumulo/core/iterators/system/MultiIterator.java  | 4 ----
 .../org/apache/accumulo/core/iterators/system/StatsIterator.java  | 3 ---
 .../apache/accumulo/core/iterators/user/RowDeletingIterator.java  | 2 --
 .../java/org/apache/accumulo/core/iterators/user/RowFilter.java   | 1 -
 .../accumulo/core/iterators/user/WholeColumnFamilyIterator.java   | 1 -
 .../org/apache/accumulo/core/iterators/user/WholeRowIterator.java | 1 -
 .../main/java/org/apache/accumulo/core/metadata/RootTable.java    | 3 ---
 .../accumulo/core/replication/AccumuloReplicationReplayer.java    | 3 ---
 .../apache/accumulo/core/replication/ReplicationConstants.java    | 3 ---
 .../org/apache/accumulo/core/replication/ReplicationSchema.java   | 3 ---
 .../core/replication/ReplicationTableOfflineException.java        | 3 ---
 .../apache/accumulo/core/security/crypto/BlockedOutputStream.java | 4 ++--
 .../org/apache/accumulo/core/security/crypto/CryptoModule.java    | 1 -
 .../apache/accumulo/core/security/crypto/DefaultCryptoModule.java | 1 -
 .../accumulo/core/security/crypto/RFileCipherOutputStream.java    | 2 --
 .../core/security/crypto/SecretKeyEncryptionStrategy.java         | 3 ---
 .../java/org/apache/accumulo/core/summary/SummarySerializer.java  | 2 --
 .../java/org/apache/accumulo/core/trace/DistributedTrace.java     | 1 -
 core/src/main/java/org/apache/accumulo/core/trace/Trace.java      | 1 -
 .../java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java   | 1 -
 core/src/main/java/org/apache/accumulo/core/util/CleanUp.java     | 3 ---
 .../main/java/org/apache/accumulo/core/util/ComparablePair.java   | 3 ---
 core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java | 2 --
 .../accumulo/core/util/interpret/DefaultScanInterpreter.java      | 3 ---
 .../org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java  | 4 +++-
 core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java      | 1 -
 core/src/main/java/org/apache/accumulo/fate/Fate.java             | 3 ---
 core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java     | 1 -
 core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java    | 1 -
 core/src/main/java/org/apache/accumulo/fate/Repo.java             | 1 -
 .../apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java  | 6 ++++--
 .../org/apache/accumulo/core/client/BatchWriterConfigTest.java    | 3 ---
 .../org/apache/accumulo/core/client/impl/ScannerImplTest.java     | 3 ---
 .../accumulo/core/client/lexicoder/BigIntegerLexicoderTest.java   | 3 ---
 .../accumulo/core/client/lexicoder/DoubleLexicoderTest.java       | 3 ---
 .../apache/accumulo/core/client/lexicoder/FloatLexicoderTest.java | 3 ---
 .../apache/accumulo/core/client/lexicoder/PairLexicoderTest.java  | 3 ---
 .../accumulo/core/client/security/SecurityErrorCodeTest.java      | 3 ---
 .../accumulo/core/client/security/tokens/PasswordTokenTest.java   | 3 ---
 .../accumulo/core/conf/CredentialProviderFactoryShimTest.java     | 3 ---
 .../java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java  | 3 ---
 .../org/apache/accumulo/core/file/rfile/RFileMetricsTest.java     | 3 ---
 .../core/replication/ReplicationConfigurationUtilTest.java        | 3 ---
 .../apache/accumulo/core/replication/ReplicationTargetTest.java   | 3 ---
 .../apache/accumulo/core/security/AuthenticationTokenTest.java    | 3 ---
 .../src/test/java/org/apache/accumulo/core/util/TextUtilTest.java | 1 -
 core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java  | 3 ---
 .../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java  | 1 -
 .../accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.java      | 1 -
 .../main/java/org/apache/accumulo/cluster/AccumuloCluster.java    | 1 -
 .../src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java | 1 -
 .../org/apache/accumulo/minicluster/MiniAccumuloInstance.java     | 1 -
 .../src/main/java/org/apache/accumulo/minicluster/ServerType.java | 1 -
 .../accumulo/minicluster/impl/MiniAccumuloClusterControl.java     | 3 ---
 .../apache/accumulo/minicluster/impl/CleanShutdownMacTest.java    | 3 ---
 .../java/org/apache/accumulo/server/client/HdfsZooInstance.java   | 1 -
 .../src/main/java/org/apache/accumulo/server/fs/ViewFSUtils.java  | 3 ---
 .../apache/accumulo/server/iterators/MetadataBulkLoadFilter.java  | 1 -
 .../main/java/org/apache/accumulo/server/log/WalStateManager.java | 1 -
 .../org/apache/accumulo/server/master/balancer/GroupBalancer.java | 1 -
 .../accumulo/server/master/balancer/RegexGroupBalancer.java       | 1 -
 .../org/apache/accumulo/server/master/recovery/RecoveryPath.java  | 3 ---
 .../org/apache/accumulo/server/master/state/DistributedStore.java | 2 +-
 .../apache/accumulo/server/master/state/SuspendingTServer.java    | 4 +++-
 .../org/apache/accumulo/server/master/state/TServerInstance.java  | 1 -
 .../org/apache/accumulo/server/master/state/TabletStateStore.java | 1 -
 .../src/main/java/org/apache/accumulo/server/metrics/Metrics.java | 3 ---
 .../org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java | 3 ---
 .../java/org/apache/accumulo/server/metrics/MetricsFactory.java   | 3 ---
 .../org/apache/accumulo/server/metrics/MetricsSystemHelper.java   | 3 ---
 .../org/apache/accumulo/server/metrics/ThriftMetricsKeys.java     | 3 ---
 .../main/java/org/apache/accumulo/server/monitor/LogService.java  | 2 --
 .../replication/DistributedWorkQueueWorkAssignerHelper.java       | 3 ---
 .../accumulo/server/replication/PrintReplicationRecords.java      | 3 ---
 .../apache/accumulo/server/replication/ReplicaSystemFactory.java  | 3 ---
 .../apache/accumulo/server/replication/ReplicaSystemHelper.java   | 3 ---
 .../apache/accumulo/server/security/AuditedSecurityOperation.java | 3 ---
 .../java/org/apache/accumulo/server/security/SecurityUtil.java    | 3 ---
 .../apache/accumulo/server/security/handler/Authenticator.java    | 1 -
 .../org/apache/accumulo/server/tablets/UniqueNameAllocator.java   | 2 --
 .../org/apache/accumulo/server/tabletserver/MemoryManager.java    | 4 ----
 .../java/org/apache/accumulo/server/util/ActionStatsUpdator.java  | 3 ---
 .../java/org/apache/accumulo/server/util/MasterMetadataUtil.java  | 3 ---
 .../apache/accumulo/server/util/RemoveEntriesForMissingFiles.java | 1 -
 .../main/java/org/apache/accumulo/server/util/TableInfoUtil.java  | 3 ---
 .../org/apache/accumulo/server/util/time/BaseRelativeTime.java    | 1 -
 .../java/org/apache/accumulo/server/util/time/ProvidesTime.java   | 1 -
 .../java/org/apache/accumulo/server/util/time/SimpleTimer.java    | 1 -
 .../java/org/apache/accumulo/server/util/time/SystemTime.java     | 1 -
 .../test/java/org/apache/accumulo/server/ServerConstantsTest.java | 3 ---
 .../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java  | 3 ---
 .../src/test/java/org/apache/accumulo/server/fs/FileTypeTest.java | 3 ---
 .../test/java/org/apache/accumulo/server/fs/ViewFSUtilsTest.java  | 3 ---
 .../java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java | 3 ---
 .../test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java   | 3 ---
 .../accumulo/server/iterators/MetadataBulkLoadFilterTest.java     | 3 ---
 .../accumulo/server/replication/ZooKeeperInitializationTest.java  | 3 ---
 .../org/apache/accumulo/server/replication/proto/StatusTest.java  | 3 ---
 .../test/java/org/apache/accumulo/server/util/FileUtilTest.java   | 3 ---
 .../java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java   | 3 ---
 .../java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java | 3 ---
 .../test/java/org/apache/accumulo/gc/GarbageCollectionTest.java   | 3 ---
 .../main/java/org/apache/accumulo/master/FateServiceHandler.java  | 3 ---
 .../org/apache/accumulo/master/metrics/MasterMetricsFactory.java  | 3 ---
 .../accumulo/master/metrics/Metrics2ReplicationMetrics.java       | 3 ---
 .../apache/accumulo/master/metrics/ReplicationMetricsMBean.java   | 3 ---
 .../main/java/org/apache/accumulo/master/tableOps/TraceRepo.java  | 3 ---
 .../org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java  | 3 +--
 .../apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java  | 3 +--
 .../replication/DistributedWorkQueueWorkAssignerHelperTest.java   | 3 ---
 .../master/replication/MasterReplicationCoordinatorTest.java      | 3 ---
 .../java/org/apache/accumulo/master/tableOps/ImportTableTest.java | 3 ---
 .../java/org/apache/accumulo/monitor/rest/SummaryInformation.java | 2 --
 .../src/main/java/org/apache/accumulo/monitor/rest/Totals.java    | 2 --
 .../main/java/org/apache/accumulo/monitor/rest/XMLResource.java   | 2 --
 .../org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java  | 1 -
 .../accumulo/monitor/rest/bulkImports/BulkImportInformation.java  | 1 -
 .../accumulo/monitor/rest/bulkImports/BulkImportResource.java     | 1 -
 .../rest/bulkImports/TabletServerBulkImportInformation.java       | 2 --
 .../org/apache/accumulo/monitor/rest/gc/GarbageCollection.java    | 2 --
 .../apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java    | 2 --
 .../apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java | 2 --
 .../apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java   | 2 --
 .../apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java  | 2 --
 .../org/apache/accumulo/monitor/rest/logs/DeadLoggerList.java     | 2 --
 .../main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java | 2 --
 .../java/org/apache/accumulo/monitor/rest/logs/LogResource.java   | 2 --
 .../apache/accumulo/monitor/rest/master/MasterInformation.java    | 2 --
 .../org/apache/accumulo/monitor/rest/master/MasterResource.java   | 2 --
 .../org/apache/accumulo/monitor/rest/problems/ProblemDetail.java  | 2 --
 .../accumulo/monitor/rest/problems/ProblemDetailInformation.java  | 2 --
 .../org/apache/accumulo/monitor/rest/problems/ProblemSummary.java | 2 --
 .../accumulo/monitor/rest/problems/ProblemSummaryInformation.java | 2 --
 .../apache/accumulo/monitor/rest/problems/ProblemsResource.java   | 2 --
 .../accumulo/monitor/rest/replication/ReplicationInformation.java | 2 --
 .../accumulo/monitor/rest/replication/ReplicationResource.java    | 2 --
 .../org/apache/accumulo/monitor/rest/scans/ScanInformation.java   | 2 --
 .../main/java/org/apache/accumulo/monitor/rest/scans/Scans.java   | 2 --
 .../org/apache/accumulo/monitor/rest/scans/ScansResource.java     | 2 --
 .../accumulo/monitor/rest/statistics/StatisticsResource.java      | 2 --
 .../apache/accumulo/monitor/rest/status/StatusInformation.java    | 2 --
 .../org/apache/accumulo/monitor/rest/status/StatusResource.java   | 2 --
 .../org/apache/accumulo/monitor/rest/tables/CompactionsList.java  | 2 --
 .../org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java | 2 --
 .../org/apache/accumulo/monitor/rest/tables/TableInformation.java | 2 --
 .../apache/accumulo/monitor/rest/tables/TableInformationList.java | 2 --
 .../org/apache/accumulo/monitor/rest/tables/TableNamespace.java   | 2 --
 .../java/org/apache/accumulo/monitor/rest/tables/TablesList.java  | 2 --
 .../org/apache/accumulo/monitor/rest/tables/TablesResource.java   | 2 --
 .../org/apache/accumulo/monitor/rest/trace/AddlInformation.java   | 2 --
 .../apache/accumulo/monitor/rest/trace/AnnotationInformation.java | 2 --
 .../org/apache/accumulo/monitor/rest/trace/DataInformation.java   | 2 --
 .../accumulo/monitor/rest/trace/RecentTracesInformation.java      | 2 --
 .../org/apache/accumulo/monitor/rest/trace/RecentTracesList.java  | 2 --
 .../accumulo/monitor/rest/trace/RecoveryStatusInformation.java    | 2 --
 .../org/apache/accumulo/monitor/rest/trace/TraceInformation.java  | 2 --
 .../java/org/apache/accumulo/monitor/rest/trace/TraceList.java    | 2 --
 .../java/org/apache/accumulo/monitor/rest/trace/TraceType.java    | 2 --
 .../accumulo/monitor/rest/trace/TracesForTypeInformation.java     | 2 --
 .../org/apache/accumulo/monitor/rest/trace/TracesResource.java    | 2 --
 .../accumulo/monitor/rest/tservers/AllTimeTabletResults.java      | 2 --
 .../monitor/rest/tservers/BadTabletServerInformation.java         | 2 --
 .../apache/accumulo/monitor/rest/tservers/BadTabletServers.java   | 2 --
 .../apache/accumulo/monitor/rest/tservers/CurrentOperations.java  | 2 --
 .../accumulo/monitor/rest/tservers/CurrentTabletResults.java      | 2 --
 .../accumulo/monitor/rest/tservers/DeadServerInformation.java     | 2 --
 .../org/apache/accumulo/monitor/rest/tservers/DeadServerList.java | 2 --
 .../monitor/rest/tservers/ServerShuttingDownInformation.java      | 2 --
 .../org/apache/accumulo/monitor/rest/tservers/ServerStat.java     | 2 --
 .../org/apache/accumulo/monitor/rest/tservers/ServerStats.java    | 2 --
 .../accumulo/monitor/rest/tservers/ServersShuttingDown.java       | 2 --
 .../org/apache/accumulo/monitor/rest/tservers/TabletServer.java   | 2 --
 .../monitor/rest/tservers/TabletServerDetailInformation.java      | 2 --
 .../accumulo/monitor/rest/tservers/TabletServerInformation.java   | 2 --
 .../monitor/rest/tservers/TabletServerRecoveryInformation.java    | 2 --
 .../accumulo/monitor/rest/tservers/TabletServerResource.java      | 2 --
 .../accumulo/monitor/rest/tservers/TabletServerSummary.java       | 2 --
 .../monitor/rest/tservers/TabletServerWithTableInformation.java   | 2 --
 .../org/apache/accumulo/monitor/rest/tservers/TabletServers.java  | 2 --
 .../accumulo/monitor/rest/tservers/TabletServersRecovery.java     | 2 --
 .../java/org/apache/accumulo/monitor/rest/zk/ZKInformation.java   | 2 --
 .../main/java/org/apache/accumulo/monitor/rest/zk/ZooKeeper.java  | 2 --
 .../org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java    | 2 --
 .../src/main/java/org/apache/accumulo/monitor/view/WebViews.java  | 2 --
 shell/src/main/java/org/apache/accumulo/shell/Token.java          | 3 +--
 .../main/java/org/apache/accumulo/shell/commands/FateCommand.java | 1 -
 .../org/apache/accumulo/shell/commands/InterpreterCommand.java    | 3 ---
 .../org/apache/accumulo/shell/commands/ListShellIterCommand.java  | 3 ---
 .../main/java/org/apache/accumulo/shell/commands/PingCommand.java | 3 ---
 .../org/apache/accumulo/shell/commands/QuotedStringTokenizer.java | 1 -
 .../apache/accumulo/shell/commands/DeleteAuthsCommandTest.java    | 3 ---
 .../apache/accumulo/shell/commands/DeleteTableCommandTest.java    | 3 ---
 .../org/apache/accumulo/shell/commands/DropUserCommandTest.java   | 3 ---
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoader.java    | 1 -
 .../accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java    | 1 -
 .../start/classloader/vfs/PostDelegatingVFSClassLoader.java       | 3 ---
 .../accumulo/start/classloader/vfs/ReloadingClassLoader.java      | 3 ---
 .../accumulo/start/classloader/vfs/UniqueFileReplicator.java      | 3 ---
 .../java/org/apache/accumulo/start/spi/KeywordExecutable.java     | 1 -
 .../main/java/org/apache/accumulo/test/ConditionalWriterIT.java   | 3 ---
 test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java   | 3 ---
 test/src/main/java/org/apache/accumulo/test/ImportExportIT.java   | 1 -
 .../apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java | 3 ---
 test/src/main/java/org/apache/accumulo/test/NamespacesIT.java     | 8 +++++---
 .../apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java   | 3 ---
 test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java  | 3 ---
 .../org/apache/accumulo/test/constraints/MaxMutationSize.java     | 1 -
 .../apache/accumulo/test/functional/BulkSplitOptimizationIT.java  | 1 -
 .../java/org/apache/accumulo/test/functional/CloneTestIT.java     | 3 ---
 .../main/java/org/apache/accumulo/test/functional/MaxOpenIT.java  | 1 -
 .../java/org/apache/accumulo/test/functional/MonitorSslIT.java    | 1 -
 .../main/java/org/apache/accumulo/test/functional/ScannerIT.java  | 3 ---
 .../java/org/apache/accumulo/test/functional/SlowConstraint.java  | 3 ---
 test/src/main/java/org/apache/accumulo/test/functional/SslIT.java | 1 -
 .../org/apache/accumulo/test/functional/SslWithClientAuthIT.java  | 1 -
 .../main/java/org/apache/accumulo/test/functional/TimeoutIT.java  | 3 ---
 .../org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java   | 1 -
 .../java/org/apache/accumulo/test/performance/NullTserver.java    | 2 --
 .../accumulo/test/performance/metadata/MetadataBatchScanTest.java | 3 ---
 .../main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java  | 3 ---
 .../java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java | 3 ---
 .../main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java   | 3 ---
 .../accumulo/test/replication/MultiTserverReplicationIT.java      | 3 ---
 .../accumulo/test/replication/ReplicationTablesPrinterThread.java | 3 ---
 .../java/org/apache/accumulo/test/fate/zookeeper/ZooLockTest.java | 3 ---
 .../apache/accumulo/test/functional/ValueReversingIterator.java   | 1 -
 283 files changed, 26 insertions(+), 584 deletions(-)

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 97bfebd..cd2f7d3 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 @@ package org.apache.accumulo.core.client;
 
 /**
  * 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 f9bcc89..e64c806 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 @@ import org.apache.commons.lang.StringUtils;
 /**
  * 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 0e3856e..093b5f6 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 @@ import org.apache.accumulo.core.data.Range;
 
 /**
  * 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 e6099dd..db630b3 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 java.util.concurrent.TimeUnit;
 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 3bc0ff4..f389202 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 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 /**
  * 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 d4120ee..f823680 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 @@ import org.apache.hadoop.io.Text;
  * 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 399eda8..8ea675d 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 @@ package org.apache.accumulo.core.client;
  * 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 e3a767f..178e7cb 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 @@ import org.apache.accumulo.core.data.TabletId;
 
 /**
  * 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 aa31717..16e685b 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 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException
 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 a12ba45..e148fed 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 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException
 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 187cfc0..8d06923 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 @@ package org.apache.accumulo.core.client;
  *
  * @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 503d307..6fdc13a 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 @@ import org.apache.hadoop.io.Text;
 
 /**
  * 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 a506270..644f752 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 @@ package org.apache.accumulo.core.client;
  *
  * 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 6eff0b2..5473b8e 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 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException
 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 d7e97cf..3b0392a 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 @@ import org.slf4j.LoggerFactory;
  *
  * 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 d5233b9..16d086d 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.client.TableNotFoundException;
 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 9510895..93697ee 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 @@ import org.apache.accumulo.core.security.Authorizations;
 
 /**
  * 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 766867f..3b13b74 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 @@ import org.apache.hadoop.io.Text;
  *
  * @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 c5331b2..6773f12 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 java.util.Map;
 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 1596ea2..8694343 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 @@ import org.apache.hadoop.io.Text;
 
 /**
  * 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 ad9fff7..37177fc 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 @@ import org.apache.thrift.TApplicationException;
 
 /**
  * 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 72b1455..ccd055e 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.impl.TabletIdImpl;
 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 b0f390b..ddcb066 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 @@ import org.apache.accumulo.core.security.Authorizations;
  * {@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 1be64ea..8d3eb8d 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 org.slf4j.LoggerFactory;
 
 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 @@ import com.google.common.base.Joiner;
  *   + 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 b90478e..19df080 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.ZooCacheFactory;
 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 e5db4b9..c6eef7a 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 @@ import org.apache.accumulo.core.util.ComparablePair;
  *
  * @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 c526acb..1745a7b 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 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @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 6c28175..0313b6b 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 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @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 5c7a70b..888321c 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 @@ import org.apache.hadoop.io.Text;
  *
  * @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 ad78149..d046ebf 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 @@ import com.google.common.hash.Hashing;
  *
  * @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 82cd577..c2f8f66 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 @@ import com.google.common.collect.ImmutableSet;
  *
  * @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 5c202f0..50e8788 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 @@ import org.apache.accumulo.core.data.Key;
  *
  * @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 e774ec5..607daa2 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 @@ import java.util.Map.Entry;
  *
  * @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 b4027b2..efa75e5 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 dcb1dff..4cf86fe 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 javax.security.auth.Destroyable;
 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 28c68e0..c52e15b 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 @@ import org.apache.accumulo.core.client.admin.SecurityOperations;
  *
  * @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 912a8ce..a3b3ee3 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 @@ import org.apache.hadoop.io.WritableUtils;
 /**
  * @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 c36c18e..adae2fe 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 @@ import com.google.common.annotations.VisibleForTesting;
  *
  * @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 37610cb..ba607ce 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 @@ import java.util.Arrays;
 
 /**
  * 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 5b7929e..ea9d1ea 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 @@ import org.apache.hadoop.io.WritableUtils;
  * 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 4899556..d4833d5 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 @@ import org.apache.hadoop.io.WritableComparable;
 
 /**
  * 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 4c503f9..7d1e999 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 @@ import org.slf4j.LoggerFactory;
 /**
  * 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 b3807ec..dd256d8 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 java.util.function.Supplier;
 
 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 f7a734b..7e3242a 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 @@ package org.apache.accumulo.core.file.blockfile;
 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 b290cc8..26dc126 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 @@ package org.apache.accumulo.core.file.blockfile;
 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 f4e8c51..ab72c35 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 @@ package org.apache.accumulo.core.file.blockfile;
 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 3a4a26d..aaec9f3 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 @@ import com.google.common.base.Preconditions;
  * 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 5c35f65..0de6e1a 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 @@ import org.apache.accumulo.core.data.Range;
 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 812bb7d..fa302b4 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.ClassSize;
 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 c860076..c3663cd 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 @@ import com.beust.jcommander.Parameter;
 
 /**
  * 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 a36930c..9316825 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 @@ import org.slf4j.LoggerFactory;
  *
  * @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 68a6cac..e105b48 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 @@ import org.apache.accumulo.core.data.Value;
  * 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 dc897a5..a2b22cf 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 @@ import java.util.Map;
  * 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 c8a05c8..5134919 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 @@ import org.slf4j.LoggerFactory;
  * 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 580efd4..de3b204 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 @@ import org.apache.hadoop.io.WritableComparable;
  * 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 40ab1f4..1bdf009 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 @@ import org.apache.accumulo.core.iterators.system.InterruptibleIterator;
  * 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 d955585..382e77b 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 org.apache.commons.lang.mutable.MutableLong;
 
 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 ac780c7..14e6f89 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 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
 /**
  * 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 306906c..0ae4d3c 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.IteratorEnvironment;
 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 2d65263..dcf76f1 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 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
  * 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 3884b3e..67a20db 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 @@ import org.apache.hadoop.io.Text;
  * 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 37dcb76..cdc6f09 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.accumulo.core.iterators.SortedKeyValueIterator;
 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 d04fb79..5680d34 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.data.Value;
 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 4ba941d..7fcc8b8 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.Namespace;
 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 4520286..93468ca 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.KeyValues;
 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 3f96eca..82a806d 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 6d84a6d..eaeeb24 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.apache.hadoop.io.Text;
 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 3cc56e0..c248c32 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 @@ package org.apache.accumulo.core.replication;
 
 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 532516c..3161284 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.IOException;
 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 56eace6..323a5fd 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 @@ import javax.crypto.CipherOutputStream;
  *
  * 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 9db8d11..d209307 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 @@ import org.slf4j.LoggerFactory;
  * 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 edc23fb..270a02e 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.Cipher;
 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 8dfdee1..547c47f 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 @@ package org.apache.accumulo.core.security.crypto;
 
 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 b42debc..d84f910 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 @@ import com.google.common.collect.ImmutableMap;
  * 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 6153728..d65f32b 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 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 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 fd2d901..e6aded7 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 @@ import org.apache.htrace.wrappers.TraceRunnable;
 
 /**
  * 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 0ef0753..755ad04 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 @@ import java.lang.reflect.Proxy;
  *
  * 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 1cee6e4..def3520 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.apache.accumulo.fate.zookeeper.ZooSession;
 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 f493a8d..1f3b0b9 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 aec7ccb..43417f9 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 @@ import com.google.common.base.Strings;
  * 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 761756f..44f9381 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 @@ package org.apache.accumulo.core.util.interpret;
 
 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 ac746c8..d42ad50 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 e78b6ff..399fc63 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 @@ import org.slf4j.LoggerFactory;
  * 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 8da069f..6e13bd5 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 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 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 cf368ee..a123ebf 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 @@ package org.apache.accumulo.fate;
  *
  * 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 d304608..57312c8 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 @@ import java.util.List;
  *
  * 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 0dcfd7f..1e127e2 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 @@ import java.io.Serializable;
 
 /**
  * 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 0c26a65..7b350be 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.apache.commons.lang.NotImplementedException;
 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 5c02311..052dfeb 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 java.util.concurrent.TimeUnit;
 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 7bbff8f..0dfdd5a 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.Assert;
 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 1efeef7..205ceeb 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 java.util.Arrays;
 
 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 5bb0a50..83690b2 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 java.util.Arrays;
 
 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 c3487dc..da6682e 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 java.util.Arrays;
 
 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 8ce0ec6..9281d4d 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 java.util.Arrays;
 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 5c42876..6cdfa29 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 java.util.HashSet;
 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 2d8a603..026b631 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 javax.security.auth.DestroyFailedException;
 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 f57cf1b..94df562 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.junit.Test;
 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 0032ff0..2ec6ab9 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.apache.accumulo.core.file.rfile.MultiLevelIndex.IndexEntry;
 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 482e161..fe3d98f 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 org.junit.rules.TemporaryFolder;
 
 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 5051c44..8f52fdd 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.Assert;
 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 a28c04e..d1e66fe 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.apache.hadoop.io.Text;
 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 9cc2256..f332d49 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.NullToken;
 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 926afd7..be27d9a 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 @@ import junit.framework.TestCase;
 
 /**
  * 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 552103c..6ad8098 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.apache.accumulo.fate.ReadOnlyTStore.TStatus;
 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 1241c36..f611662 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 @@ import junit.framework.TestCase;
 
 /**
  * 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 f25555e..7d90ac9 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 @@ import org.slf4j.LoggerFactory;
  *   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 a66d69b..4a99a74 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 @@ import org.apache.hadoop.fs.Path;
  *
  * @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 fa3fc16..d52f91f 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 @@ package org.apache.accumulo.minicluster;
 /**
  * @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 b76daf0..2a5a772 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.accumulo.core.conf.Property;
 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 a20699a..19c36c8 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 @@ package org.apache.accumulo.minicluster;
 /**
  * @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 25babd7..bf10434 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 org.slf4j.LoggerFactory;
 
 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 937aca6..14abb00 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.Rule;
 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 b9ec2ae..65e8d60 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 @@ import com.google.common.base.Joiner;
 /**
  * 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 df542da..31e6984 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.conf.Configuration;
 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 c8b9706..80ffacc 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 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 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 15eb5a2..da74826 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 @@ import org.slf4j.LoggerFactory;
  * <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 171ec0d..2eaeefb 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 @@ import com.google.common.collect.Multimap;
  * 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 e340910..6e85a21 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 @@ import org.apache.hadoop.io.Text;
  * 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 cc9ac3e..3cdd569 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;
 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 3276945..275c9d2 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 @@ package org.apache.accumulo.server.master.state;
 
 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 ccdef29..43ac710 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.Mutation;
 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 c1b620a..82311dd 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 @@ import org.apache.hadoop.io.Text;
  * 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 aea0d0f..b08191c 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 @@ import org.apache.hadoop.fs.Path;
  *
  * 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 f451266..aafea71 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 dc1c0cb..7908ec3 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.impl.MsInfo;
 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 aadf830..fc5ddb2 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.AccumuloConfiguration;
 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 bd6bcca..7671c12 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.lib.DefaultMetricsSystem;
 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 f527657..f83499e 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 70017d0..2fa5417 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 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Hijack log4j and capture log events for display.
- *
  */
 public class LogService extends org.apache.log4j.AppenderSkeleton {
 
@@ -49,7 +48,6 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
 
   /**
    * 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 b4b4913..605829b 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 org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
 
 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 a0e780c..0e7914e 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 org.slf4j.LoggerFactory;
 
 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 1ebed14..9335669 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 org.slf4j.LoggerFactory;
 
 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 e9a6507..404720b 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.apache.hadoop.fs.Path;
 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 183725e..15c2b96 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.apache.hadoop.io.Text;
 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 d46688a..d923ada 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.apache.hadoop.security.UserGroupInformation;
 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 689e647..0150111 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 @@ import org.apache.accumulo.core.security.thrift.TCredentials;
  * 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 1828aa6..4559a0d 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 @@ import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
  * 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 3cb005e..bd09d84 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 @@ import org.apache.accumulo.server.conf.ServerConfiguration;
  * 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 de28ad9..39cc2d6 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 @@ package org.apache.accumulo.server.util;
 
 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 c9a3c63..e2223f1 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.apache.zookeeper.KeeperException;
 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 5b0122c..3d568be 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 @@ import com.beust.jcommander.Parameter;
 
 /**
  * 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 dd1b256..89b8b66 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.MasterMonitorInfo;
 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 7a0517a..6a9dd26 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 @@ package org.apache.accumulo.server.util.time;
  *
  * 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 1042c32..16fe481 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 @@ package org.apache.accumulo.server.util.time;
 
 /**
  * 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 f97b74a..04ce332 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 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 /**
  * 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 b8fe371..e2a75ee 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 @@ package org.apache.accumulo.server.util.time;
 
 /**
  * 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 26822bb..d6da1ba 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.Rule;
 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 3bfd8e5..3e0868a 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.apache.hadoop.fs.Path;
 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 695f686..d9affc0 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.apache.hadoop.fs.Path;
 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 d2fa9ba..3ae98c0 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.apache.hadoop.fs.Path;
 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 e2db2ff..e6484c0 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.Rule;
 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 149e555..7505eb6 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.Rule;
 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 70aa13e..c101f16 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.apache.hadoop.io.Text;
 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 cc79867..76dce4f 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.core.replication.ReplicationConstants;
 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 b2ce5ef..297b9fc 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.apache.accumulo.server.replication.proto.Replication.Status;
 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 e753081..68434ce 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.Test;
 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 5d1a089..04f0c1a 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 org.slf4j.LoggerFactory;
 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 e7a0080..f9abfa1 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.Da
 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 7b0f130..a719378 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.apache.hadoop.io.Text;
 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 0777e13..d4f04b2 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.accumulo.server.util.TablePropUtil;
 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 bbf61a0..978f36c 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.Metrics;
 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 2f5b309..db8db26 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.apache.hadoop.metrics2.lib.MutableStat;
 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 a29e5b4..fb2e703 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 4bbb12b..43131b2 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.Tracer;
 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 368816f..01d6a58 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.apache.hadoop.io.MapFile;
 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 @@ import org.slf4j.LoggerFactory;
  * 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 29839f8..db7f1f1 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.apache.hadoop.fs.Path;
 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 @@ import org.slf4j.LoggerFactory;
  * 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 aa30f18..d418054 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.apache.zookeeper.common.PathUtils;
 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 823fcf4..e39654a 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.easymock.EasyMock;
 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 38f13a0..e5aa9f4 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.easymock.EasyMock;
 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 cfffbb4..c2329e6 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.ServersShuttingDown;
 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 ae9d4fc..aa8d1b9 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 8e68bc2..d821707 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.tables.TablesResource;
 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 1ebdc10..7cbc1ed 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 @@ import java.util.List;
  * 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 e056a2c..00688b6 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 @@ import org.apache.accumulo.core.master.thrift.BulkImportState;
  * 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 c5caf6b..40c46e9 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 @@ import org.apache.accumulo.monitor.Monitor;
  * 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 d990c42..35dba1e 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 @@ package org.apache.accumulo.monitor.rest.bulkImports;
 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 188685d..33f9e80 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 @@ package org.apache.accumulo.monitor.rest.gc;
 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 933b119..00bca70 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 @@ package org.apache.accumulo.monitor.rest.gc;
 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 e3e4677..ef612fa 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.core.gc.thrift.GCStatus;
 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 af322aa..97a063f 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 @@ package org.apache.accumulo.monitor.rest.gc;
 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 6950c5e..2273a2f 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 @@ package org.apache.accumulo.monitor.rest.logs;
 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 40cbe53..bbcc7c1 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.ArrayList;
 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 4b025a8..fd56514 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 bb71eb0..68e0ad2 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.accumulo.server.monitor.LogService;
 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 6f132ac..efdcc60 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.DeadServerList;
 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 a9d52a5..0ab0abc 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.monitor.rest.tservers.ServersShuttingDown;
 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 e65c6b2..f9315b7 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.ArrayList;
 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 68bd45d..434eeb9 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.core.client.impl.Table;
 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 05e373e..03bb013 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.ArrayList;
 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 99cdf84..1d0f75f 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.core.client.impl.Table;
 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 9da241f..75b10f8 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.Logger;
 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 916a7dc..8737563 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 ea06023..82d2692 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.Logger;
 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 849e66c..34a3ad5 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 @@ package org.apache.accumulo.monitor.rest.scans;
 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 5c34c29..d2a2660 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.ArrayList;
 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 9eea795..57a9ca0 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;
 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 1b9fbdf..bdbbc3f 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.core.util.Pair;
 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 05e50b0..d603c6d 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 57332c1..7d4f529 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.accumulo.server.monitor.LogService;
 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 60f11e2..3602d68 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 4699c18..df2efe8 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 b781712..3f6b577 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.core.master.thrift.TableInfo;
 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 15dead0..0fead3e 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.ArrayList;
 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 4d6ae2a..57f5425 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.ArrayList;
 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 e835b05..cc2348b 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.ArrayList;
 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 203ac00..af2fdc3 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.commons.lang.StringUtils;
 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 ae53230..fa65608 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.ArrayList;
 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 c0d87f9..80bc4f0 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 77a3ba8..92a8af3 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 e6a7f2d..a0168bf 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 @@ package org.apache.accumulo.monitor.rest.trace;
 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 b0a3816..9ac5c6a 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.ArrayList;
 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 a6da7c2..025c151 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 @@ package org.apache.accumulo.monitor.rest.trace;
 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 5947eaf..e6806cd 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 661b451..af616c8 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.ArrayList;
 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 706743b..cbac6bd 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.ArrayList;
 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 f1b4270..9848657 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 @@ package org.apache.accumulo.monitor.rest.trace;
 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 c6404b0..4185a4a 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.io.Text;
 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 add346d..eb69b7f 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 65cfab2..985e921 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 @@ package org.apache.accumulo.monitor.rest.tservers;
 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 aaa545d..7c7280c 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.ArrayList;
 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 882b139..b7016c9 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.core.client.impl.Table;
 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 6d8996f..3c075bb 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 79e4aa1..63515f3 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 @@ package org.apache.accumulo.monitor.rest.tservers;
 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 e472671..89b02d2 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.ArrayList;
 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 7c08434..ce7ce97 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 @@ package org.apache.accumulo.monitor.rest.tservers;
 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 f5db4b2..3753406 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 94e61b4..db52add 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.ArrayList;
 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 61f37b8..1334ae4 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.ArrayList;
 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 7cdaf42..585b326 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.TableInfo;
 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 ca5c97c..83edd5a 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 7c49c89..7214463 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.monitor.rest.trace.RecoveryStatusInformation;
 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 cedcb1b..a82364a 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 d3c0987..bb5eef3 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.master.state.DeadServerList;
 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 7ccc278..39ab2f5 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 @@ package org.apache.accumulo.monitor.rest.tservers;
 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 3e656ec..bcb7c8e 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 @@ package org.apache.accumulo.monitor.rest.tservers;
 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 6783e29..d526c89 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 java.util.List;
 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 eb66f57..92b226d 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.ArrayList;
 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 f35dd90..c27a441 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.ArrayList;
 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 c555143..6b60d0e 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 28225cb..911b26b 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;
 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 fb21f2a..0e7c08d 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 org.slf4j.LoggerFactory;
 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 41921e5..8919c46 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.HashSet;
 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 2e1cd62..3612368 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 @@ import com.google.gson.JsonSerializer;
 
 /**
  * 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 f405e19..6452557 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.conf.Property;
 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 b3132f2..a18ceeb 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.CommandLine;
 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 61f8846..6406ab8 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.CommandLine;
 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 117dea1..0687b86 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 @@ import org.apache.accumulo.shell.Shell;
  *
  * 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 26886c6..b88ccc1 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 org.junit.Test;
 
 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 9f067b4..db28e37 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.apache.accumulo.core.metadata.RootTable;
 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 c8f6d5e..9f79259 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 org.junit.Test;
 
 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 f8f9e40..0f275c9 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 @@ import org.slf4j.LoggerFactory;
  * 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 7347a95..7ee586c 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 @@ import org.slf4j.LoggerFactory;
  * 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 95ccdf2..d7a1094 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.FileSystemException;
 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 9de0422..94cb326 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 123db8b..3e3748d 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.apache.commons.vfs2.provider.VfsComponentContext;
 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 155f985..9723368 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 @@ import java.util.ServiceLoader;
  * 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 dcce508..eafe496 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 org.slf4j.LoggerFactory;
 
 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 9a6fb7e..e807dfb 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 org.apache.hadoop.io.Text;
 
 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 0a553b7..b28a27a 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 @@ import org.slf4j.LoggerFactory;
  * 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 c2bb137..705c25a 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 org.slf4j.LoggerFactory;
 
 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 bc13bcf..ad2b0c4 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.Before;
 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 f1c159d..c9035ca 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.conf.Configuration;
 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 da9d974..141d73f 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.fs.RawLocalFileSystem;
 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 bc65a7e..e900cd7 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 @@ import org.apache.accumulo.core.data.Mutation;
 
 /**
  * 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 405eade..4a4da74 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 @@ import org.junit.Test;
  * 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 f5f6f43..5442e3f 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.Assert;
 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 2aa2113..51ab5c4 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 @@ import org.junit.Test;
  * 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 c23cf4d..b90ab48 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 @@ import org.junit.Test;
 
 /**
  * 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 bd656c0..ba25ba0 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 org.junit.Test;
 
 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 5e8034a..90e7324 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 java.util.concurrent.TimeUnit;
 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 0da54b8..f29c6da 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 @@ import org.junit.Test;
  * 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 bb00b19..e0eec0b 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 @@ import org.junit.Test;
  * 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 3a79409..a67b0aa 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.core.security.Authorizations;
 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 2cbfdfd..fc68266 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 @@ import org.slf4j.LoggerFactory;
  * 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 0f69f4c..dbe945f 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 @@ import com.beust.jcommander.Parameter;
  * 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 833a95a..15968a7 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 @@ import com.google.common.collect.Iterators;
 /**
  * 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 7500361..1dc2c3a 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.accumulo.harness.SharedMiniClusterBase;
 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 d8b91c4..049898c 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.accumulo.harness.SharedMiniClusterBase;
 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 2f792f6..2f8449d 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.accumulo.harness.SharedMiniClusterBase;
 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 1f7320a..d722be6 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 org.slf4j.LoggerFactory;
 
 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 b222de6..37a9b3b 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.client.Connector;
 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 0d40c8a..a7582a8 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.BeforeClass;
 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 f1f06b7..12705be 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 @@ import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * Iterator used in ScannerContextIT that reverses the bytes of the value
- *
  */
 public class ValueReversingIterator implements SortedKeyValueIterator<Key,Value> {
 

-- 
To stop receiving notification emails like this one, please contact
mwalch@apache.org.

Mime
View raw message