accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [30/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability
Date Fri, 01 Jul 2016 01:59:27 GMT
ACCUMULO-4357 Remove unneeded code for readability

* Remove extra semicolons
* Remove redundant interface declarations
* Remove unnecessary generics parameters when diamond would suffice


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

Branch: refs/heads/master
Commit: b102e7605035cc7eb128bd0a9ee95b2417389bc9
Parents: 5660464
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jun 30 21:32:12 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jun 30 21:32:12 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  2 +-
 .../accumulo/core/client/BatchWriterConfig.java |  2 +-
 .../core/client/ClientConfiguration.java        |  6 +-
 .../core/client/ClientSideIteratorScanner.java  |  4 +-
 .../accumulo/core/client/IsolatedScanner.java   |  2 +-
 .../accumulo/core/client/IteratorSetting.java   |  4 +-
 .../core/client/MutationsRejectedException.java |  6 +-
 .../accumulo/core/client/RowIterator.java       |  2 +-
 .../accumulo/core/client/TimedOutException.java |  2 +-
 .../core/client/admin/ActiveCompaction.java     |  4 +-
 .../client/admin/NewTableConfiguration.java     |  4 +-
 .../core/client/impl/ActiveCompactionImpl.java  |  2 +-
 .../core/client/impl/ActiveScanImpl.java        |  4 +-
 .../core/client/impl/CompressedIterators.java   | 10 +--
 .../core/client/impl/ConditionalWriterImpl.java | 40 +++++------
 .../client/impl/InstanceOperationsImpl.java     |  8 +--
 .../client/impl/MultiTableBatchWriterImpl.java  |  2 +-
 .../client/impl/NamespaceOperationsHelper.java  | 14 ++--
 .../client/impl/NamespaceOperationsImpl.java    |  6 +-
 .../accumulo/core/client/impl/Namespaces.java   |  6 +-
 .../core/client/impl/OfflineIterator.java       | 15 ++--
 .../core/client/impl/RootTabletLocator.java     |  2 +-
 .../core/client/impl/ScannerIterator.java       |  2 +-
 .../core/client/impl/ScannerOptions.java        | 20 +++---
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../core/client/impl/TableOperationsHelper.java | 14 ++--
 .../core/client/impl/TableOperationsImpl.java   | 58 +++++++--------
 .../accumulo/core/client/impl/Tables.java       |  8 +--
 .../core/client/impl/TabletLocator.java         | 10 +--
 .../core/client/impl/TabletLocatorImpl.java     | 28 ++++----
 .../client/impl/TabletServerBatchReader.java    |  2 +-
 .../impl/TabletServerBatchReaderIterator.java   | 52 +++++++-------
 .../client/impl/TabletServerBatchWriter.java    | 34 ++++-----
 .../core/client/impl/ThriftScanner.java         |  6 +-
 .../core/client/impl/ThriftTransportPool.java   | 24 +++----
 .../accumulo/core/client/impl/Translator.java   |  6 +-
 .../client/lexicoder/BigIntegerLexicoder.java   | 10 +--
 .../core/client/lexicoder/BytesLexicoder.java   |  2 +-
 .../core/client/lexicoder/DateLexicoder.java    |  6 +-
 .../core/client/lexicoder/DoubleLexicoder.java  |  2 +-
 .../core/client/lexicoder/IntegerLexicoder.java |  2 +-
 .../core/client/lexicoder/ListLexicoder.java    |  4 +-
 .../core/client/lexicoder/PairLexicoder.java    | 11 ++-
 .../core/client/lexicoder/ReverseLexicoder.java |  6 +-
 .../core/client/lexicoder/StringLexicoder.java  |  6 +-
 .../core/client/lexicoder/TextLexicoder.java    |  2 +-
 .../client/lexicoder/UIntegerLexicoder.java     |  2 +-
 .../core/client/lexicoder/ULongLexicoder.java   |  2 +-
 .../core/client/lexicoder/UUIDLexicoder.java    |  2 +-
 .../core/client/lexicoder/impl/ByteUtils.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java | 14 ++--
 .../client/mapred/AccumuloOutputFormat.java     |  6 +-
 .../client/mapred/AccumuloRowInputFormat.java   |  2 +-
 .../client/mapreduce/AbstractInputFormat.java   | 14 ++--
 .../client/mapreduce/AccumuloOutputFormat.java  |  6 +-
 .../mapreduce/AccumuloRowInputFormat.java       |  2 +-
 .../core/client/mapreduce/InputTableConfig.java |  8 +--
 .../core/client/mapreduce/RangeInputSplit.java  |  6 +-
 .../client/mapreduce/impl/BatchInputSplit.java  |  2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   | 24 +++----
 .../lib/partition/RangePartitioner.java         |  2 +-
 .../accumulo/core/client/mock/MockAccumulo.java |  8 +--
 .../core/client/mock/MockBatchScanner.java      |  2 +-
 .../accumulo/core/client/mock/MockInstance.java |  2 +-
 .../client/mock/MockInstanceOperations.java     |  6 +-
 .../client/mock/MockMultiTableBatchWriter.java  |  2 +-
 .../core/client/mock/MockNamespace.java         |  6 +-
 .../client/mock/MockNamespaceOperations.java    |  4 +-
 .../core/client/mock/MockScannerBase.java       | 11 ++-
 .../accumulo/core/client/mock/MockTable.java    | 10 +--
 .../core/client/mock/MockTableOperations.java   | 12 ++--
 .../client/mock/impl/MockTabletLocator.java     |  2 +-
 .../core/client/rfile/RFileScannerBuilder.java  |  2 +-
 .../accumulo/core/client/rfile/RFileWriter.java |  6 +-
 .../core/client/rfile/RFileWriterBuilder.java   |  2 +-
 .../security/tokens/AuthenticationToken.java    |  2 +-
 .../tokens/CredentialProviderToken.java         |  2 +-
 .../client/security/tokens/PasswordToken.java   |  2 +-
 .../core/conf/AccumuloConfiguration.java        |  6 +-
 .../accumulo/core/conf/ConfigurationDocGen.java |  4 +-
 .../conf/CredentialProviderFactoryShim.java     |  4 +-
 .../core/conf/DefaultConfiguration.java         |  2 +-
 .../core/conf/ObservableConfiguration.java      |  2 +-
 .../org/apache/accumulo/core/conf/Property.java |  8 +--
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../constraints/DefaultKeySizeConstraint.java   |  4 +-
 .../accumulo/core/constraints/Violations.java   |  4 +-
 .../core/constraints/VisibilityConstraint.java  |  2 +-
 .../apache/accumulo/core/data/Condition.java    |  4 +-
 .../accumulo/core/data/ConditionalMutation.java |  4 +-
 .../org/apache/accumulo/core/data/Mutation.java |  8 +--
 .../org/apache/accumulo/core/data/Range.java    |  4 +-
 .../accumulo/core/data/impl/KeyExtent.java      | 12 ++--
 .../accumulo/core/file/BloomFilterLayer.java    |  6 +-
 .../accumulo/core/file/FileOperations.java      |  2 +-
 .../core/file/blockfile/cache/CachedBlock.java  |  2 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |  6 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  6 +-
 .../accumulo/core/file/rfile/BlockIndex.java    |  2 +-
 .../accumulo/core/file/rfile/CreateEmpty.java   |  2 +-
 .../core/file/rfile/MultiLevelIndex.java        |  8 +--
 .../accumulo/core/file/rfile/PrintInfo.java     |  2 +-
 .../apache/accumulo/core/file/rfile/RFile.java  | 32 ++++-----
 .../accumulo/core/file/rfile/SplitLarge.java    |  2 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java | 10 +--
 .../core/file/rfile/bcfile/Compression.java     |  2 +-
 .../core/iterators/AggregatingIterator.java     |  3 +-
 .../core/iterators/FirstEntryInRowIterator.java |  2 +-
 .../accumulo/core/iterators/IteratorUtil.java   | 22 +++---
 .../accumulo/core/iterators/LongCombiner.java   |  6 +-
 .../core/iterators/OptionDescriber.java         | 12 ++--
 .../accumulo/core/iterators/OrIterator.java     |  6 +-
 .../core/iterators/TypedValueCombiner.java      |  2 +-
 .../accumulo/core/iterators/conf/ColumnSet.java |  8 +--
 .../iterators/conf/ColumnToClassMapping.java    |  4 +-
 .../system/ColumnFamilySkippingIterator.java    |  4 +-
 .../iterators/system/ColumnQualifierFilter.java |  6 +-
 .../core/iterators/system/HeapIterator.java     |  2 +-
 .../iterators/system/LocalityGroupIterator.java |  2 +-
 .../core/iterators/system/MultiIterator.java    |  2 +-
 .../system/SourceSwitchingIterator.java         |  2 +-
 .../iterators/system/SynchronizedIterator.java  |  2 +-
 .../core/iterators/user/BigDecimalCombiner.java |  3 +-
 .../core/iterators/user/CfCqSliceFilter.java    |  9 ++-
 .../core/iterators/user/CfCqSliceOpts.java      |  2 +-
 .../core/iterators/user/LargeRowFilter.java     |  8 +--
 .../iterators/user/RowDeletingIterator.java     |  4 +-
 .../iterators/user/RowEncodingIterator.java     |  6 +-
 .../iterators/user/SummingArrayCombiner.java    | 10 +--
 .../iterators/user/TransformingIterator.java    |  8 +--
 .../core/iterators/user/VisibilityFilter.java   |  3 +-
 .../user/WholeColumnFamilyIterator.java         |  6 +-
 .../core/iterators/user/WholeRowIterator.java   |  2 +-
 .../core/metadata/MetadataLocationObtainer.java | 20 +++---
 .../apache/accumulo/core/rpc/ThriftUtil.java    |  2 +-
 .../sample/impl/SamplerConfigurationImpl.java   |  6 +-
 .../accumulo/core/security/Authorizations.java  | 10 +--
 .../core/security/ColumnVisibility.java         |  4 +-
 .../core/security/NamespacePermission.java      |  2 +-
 .../core/security/SystemPermission.java         |  4 +-
 .../accumulo/core/security/TablePermission.java |  2 +-
 .../core/security/VisibilityEvaluator.java      |  2 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java |  2 +-
 .../security/crypto/CryptoModuleFactory.java    |  4 +-
 .../security/crypto/DefaultCryptoModule.java    |  2 +-
 .../accumulo/core/trace/DistributedTrace.java   |  2 +-
 .../accumulo/core/trace/wrappers/TraceWrap.java |  4 +-
 .../apache/accumulo/core/util/ByteArraySet.java |  2 +-
 .../accumulo/core/util/ByteBufferUtil.java      |  4 +-
 .../accumulo/core/util/LocalityGroupUtil.java   | 12 ++--
 .../apache/accumulo/core/util/MapCounter.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  4 +-
 .../org/apache/accumulo/core/util/Pair.java     |  4 +-
 .../accumulo/core/util/ServerServices.java      |  2 +-
 .../apache/accumulo/core/util/StopWatch.java    |  4 +-
 .../ShardedTableDistributionFormatter.java      |  2 +-
 .../util/format/StatisticsDisplayFormatter.java | 12 ++--
 .../core/util/interpret/HexScanInterpreter.java |  2 +-
 .../core/client/IteratorSettingTest.java        |  2 +-
 .../accumulo/core/client/RowIteratorTest.java   |  6 +-
 .../core/client/ZooKeeperInstanceTest.java      |  2 +-
 .../core/client/impl/ClientContextTest.java     |  2 +-
 .../client/impl/TableOperationsHelperTest.java  |  6 +-
 .../core/client/impl/TabletLocatorImplTest.java | 58 +++++++--------
 .../core/client/lexicoder/LexicoderTest.java    |  6 +-
 .../client/lexicoder/ListLexicoderTest.java     | 28 ++++----
 .../client/lexicoder/PairLexicoderTest.java     | 17 +++--
 .../client/lexicoder/ReverseLexicoderTest.java  | 16 ++---
 .../client/lexicoder/UUIDLexicoderTest.java     |  2 +-
 .../AccumuloMultiTableInputFormatTest.java      |  6 +-
 .../core/client/mapred/RangeInputSplitTest.java |  8 +--
 .../mapreduce/AccumuloInputFormatTest.java      | 10 +--
 .../AccumuloMultiTableInputFormatTest.java      |  4 +-
 .../client/mapreduce/InputTableConfigTest.java  |  8 +--
 .../client/mapreduce/RangeInputSplitTest.java   |  8 +--
 .../mapreduce/impl/BatchInputSplitTest.java     |  8 +--
 .../core/client/mock/MockConnectorTest.java     |  2 +-
 .../core/client/mock/MockNamespacesTest.java    |  2 +-
 .../client/mock/MockTableOperationsTest.java    |  4 +-
 .../client/security/SecurityErrorCodeTest.java  |  4 +-
 .../core/conf/ConfigSanityCheckTest.java        |  2 +-
 .../conf/CredentialProviderFactoryShimTest.java |  8 +--
 .../core/conf/DefaultConfigurationTest.java     |  2 +-
 .../apache/accumulo/core/conf/PropertyTest.java | 12 ++--
 .../core/conf/SiteConfigurationTest.java        |  2 +-
 .../accumulo/core/data/KeyExtentTest.java       | 20 +++---
 .../org/apache/accumulo/core/data/KeyTest.java  |  2 +-
 .../apache/accumulo/core/data/OldMutation.java  |  4 +-
 .../apache/accumulo/core/data/RangeTest.java    |  4 +-
 .../apache/accumulo/core/data/ValueTest.java    |  2 +-
 .../core/file/BloomFilterLayerLookupTest.java   |  4 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  2 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 38 +++++-----
 .../core/file/rfile/RelativeKeyTest.java        |  6 +-
 .../core/iterators/AggregatingIteratorTest.java | 36 +++++-----
 .../iterators/FirstEntryInRowIteratorTest.java  |  4 +-
 .../core/iterators/FirstEntryInRowTest.java     |  8 +--
 .../core/iterators/IteratorUtilTest.java        | 18 ++---
 .../ColumnFamilySkippingIteratorTest.java       | 24 +++----
 .../core/iterators/system/ColumnFilterTest.java |  6 +-
 .../iterators/system/DeletingIteratorTest.java  | 14 ++--
 .../iterators/system/MultiIteratorTest.java     | 38 +++++-----
 .../system/SourceSwitchingIteratorTest.java     | 22 +++---
 .../system/TimeSettingIteratorTest.java         |  4 +-
 .../iterators/system/VisibilityFilterTest.java  |  2 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  4 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  4 +-
 .../core/iterators/user/CombinerTest.java       | 46 ++++++------
 .../core/iterators/user/FilterTest.java         | 34 ++++-----
 .../core/iterators/user/GrepIteratorTest.java   |  6 +-
 .../iterators/user/IndexedDocIteratorTest.java  | 14 ++--
 .../user/IntersectingIteratorTest.java          |  8 +--
 .../core/iterators/user/LargeRowFilterTest.java | 34 ++++-----
 .../core/iterators/user/RegExFilterTest.java    |  6 +-
 .../iterators/user/RowDeletingIteratorTest.java | 10 +--
 .../iterators/user/RowEncodingIteratorTest.java | 22 +++---
 .../core/iterators/user/RowFilterTest.java      | 24 +++----
 .../core/iterators/user/TestCfCqSlice.java      | 12 ++--
 .../user/TransformingIteratorTest.java          | 26 +++----
 .../iterators/user/VersioningIteratorTest.java  | 16 ++---
 .../iterators/user/VisibilityFilterTest.java    |  8 +--
 .../user/WholeColumnFamilyIteratorTest.java     | 22 +++---
 .../iterators/user/WholeRowIteratorTest.java    | 22 +++---
 .../core/util/LocalityGroupUtilTest.java        |  4 +-
 .../apache/accumulo/core/util/MergeTest.java    |  6 +-
 .../org/apache/accumulo/core/util/PairTest.java | 20 +++---
 .../accumulo/core/util/PartitionerTest.java     |  2 +-
 .../util/format/DateStringFormatterTest.java    |  2 +-
 .../core/util/format/DefaultFormatterTest.java  |  2 +-
 .../core/util/format/HexFormatterTest.java      |  2 +-
 .../ShardedTableDistributionFormatterTest.java  |  2 +-
 .../format/StatisticsDisplayFormatterTest.java  |  2 +-
 .../simple/client/RandomBatchScanner.java       |  4 +-
 .../simple/client/RandomBatchWriter.java        |  6 +-
 .../simple/client/ReadWriteExample.java         |  2 +-
 .../constraints/AlphaNumKeyConstraint.java      |  2 +-
 .../examples/simple/dirlist/Ingest.java         |  2 +-
 .../examples/simple/dirlist/QueryUtil.java      |  4 +-
 .../simple/filedata/ChunkInputFormat.java       |  4 +-
 .../simple/filedata/ChunkInputStream.java       |  2 +-
 .../simple/filedata/FileDataIngest.java         |  2 +-
 .../examples/simple/filedata/FileDataQuery.java |  4 +-
 .../examples/simple/filedata/KeyUtil.java       |  2 +-
 .../simple/filedata/VisibilityCombiner.java     |  2 +-
 .../simple/isolation/InterferenceTest.java      |  2 +-
 .../examples/simple/mapreduce/NGramIngest.java  |  2 +-
 .../examples/simple/mapreduce/RowHash.java      |  2 +-
 .../examples/simple/mapreduce/TableToFile.java  |  6 +-
 .../simple/mapreduce/TeraSortIngest.java        |  2 +-
 .../simple/mapreduce/bulk/SetupTable.java       |  4 +-
 .../examples/simple/reservations/ARS.java       |  4 +-
 .../examples/simple/shard/ContinuousQuery.java  |  4 +-
 .../accumulo/examples/simple/shard/Index.java   |  4 +-
 .../accumulo/examples/simple/shard/Query.java   |  4 +-
 .../examples/simple/shell/DebugCommand.java     |  2 +-
 .../simple/filedata/ChunkCombinerTest.java      | 30 ++++----
 .../simple/filedata/ChunkInputStreamTest.java   | 28 ++++----
 .../org/apache/accumulo/fate/AdminUtil.java     |  8 +--
 .../org/apache/accumulo/fate/AgeOffStore.java   |  4 +-
 .../org/apache/accumulo/fate/ReadOnlyStore.java |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java | 12 ++--
 .../zookeeper/DistributedReadWriteLock.java     |  2 +-
 .../fate/zookeeper/TransactionWatcher.java      |  2 +-
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 +-
 .../fate/zookeeper/ZooCacheFactory.java         |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  6 +-
 .../accumulo/fate/zookeeper/ZooQueueLock.java   |  2 +-
 .../accumulo/fate/zookeeper/ZooSession.java     |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java |  6 +-
 .../apache/accumulo/fate/AgeOffStoreTest.java   | 42 +++++------
 .../apache/accumulo/fate/ReadOnlyStoreTest.java |  2 +-
 .../org/apache/accumulo/fate/SimpleStore.java   |  6 +-
 .../zookeeper/DistributedReadWriteLockTest.java |  4 +-
 .../fate/zookeeper/TransactionWatcherTest.java  | 10 +--
 .../maven/plugin/AbstractAccumuloMojo.java      |  2 +-
 .../standalone/StandaloneClusterControl.java    |  2 +-
 .../minicluster/MiniAccumuloRunner.java         |  2 +-
 .../impl/MiniAccumuloClusterControl.java        |  2 +-
 .../impl/MiniAccumuloClusterImpl.java           | 22 +++---
 .../impl/MiniAccumuloConfigImpl.java            | 22 +++---
 .../minicluster/MiniAccumuloClusterTest.java    |  4 +-
 .../impl/MiniAccumuloConfigImplTest.java        |  2 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |  2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  | 50 ++++++-------
 .../apache/accumulo/proxy/ProxyServerTest.java  |  4 +-
 .../org/apache/accumulo/server/Accumulo.java    |  6 +-
 .../server/GarbageCollectionLogger.java         |  2 +-
 .../apache/accumulo/server/ServerConstants.java |  8 +--
 .../accumulo/server/client/BulkImporter.java    | 46 ++++++------
 .../server/client/ClientServiceHandler.java     |  8 +--
 .../server/conf/NamespaceConfiguration.java     |  2 +-
 .../server/conf/ServerConfigurationFactory.java |  6 +-
 .../server/conf/TableConfiguration.java         |  2 +-
 .../server/conf/ZooConfigurationFactory.java    |  2 +-
 .../server/constraints/MetadataConstraints.java | 10 +--
 .../server/fs/PerTableVolumeChooser.java        |  2 +-
 .../server/fs/PreferredVolumeChooser.java       |  8 +--
 .../accumulo/server/fs/VolumeManagerImpl.java   |  4 +-
 .../apache/accumulo/server/fs/VolumeUtil.java   | 16 ++---
 .../apache/accumulo/server/init/Initialize.java | 13 ++--
 .../iterators/MetadataBulkLoadFilter.java       |  2 +-
 .../accumulo/server/master/LiveTServerSet.java  | 20 +++---
 .../master/balancer/ChaoticLoadBalancer.java    |  8 +--
 .../master/balancer/DefaultLoadBalancer.java    | 12 ++--
 .../server/master/balancer/GroupBalancer.java   | 10 +--
 .../balancer/HostRegexTableLoadBalancer.java    | 14 ++--
 .../master/balancer/TableLoadBalancer.java      | 10 +--
 .../server/master/balancer/TabletBalancer.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  2 +-
 .../master/state/MetaDataTableScanner.java      |  2 +-
 .../server/master/state/TabletServerState.java  |  4 +-
 .../master/state/TabletStateChangeIterator.java | 12 ++--
 .../master/state/ZooTabletStateStore.java       |  2 +-
 .../master/tableOps/UserCompactionConfig.java   |  2 +-
 .../server/metrics/AbstractMetricsImpl.java     |  2 +-
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/problems/ProblemReports.java         |  4 +-
 .../server/replication/StatusCombiner.java      |  2 +-
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  2 +-
 .../server/rpc/TCredentialsUpdatingWrapper.java |  2 +-
 .../accumulo/server/rpc/TServerUtils.java       |  4 +-
 .../server/rpc/UGIAssumingProcessor.java        |  4 +-
 .../security/AuditedSecurityOperation.java      |  4 +-
 .../AuthenticationTokenSecretManager.java       |  4 +-
 .../security/handler/InsecureAuthenticator.java |  2 +-
 .../security/handler/ZKAuthenticator.java       |  4 +-
 .../server/security/handler/ZKAuthorizor.java   |  4 +-
 .../server/security/handler/ZKPermHandler.java  | 12 ++--
 .../server/security/handler/ZKSecurityTool.java |  6 +-
 .../tabletserver/LargestFirstMemoryManager.java |  8 +--
 .../org/apache/accumulo/server/util/Admin.java  | 14 ++--
 .../accumulo/server/util/ChangeSecret.java      |  4 +-
 .../server/util/CheckForMetadataProblems.java   |  4 +-
 .../accumulo/server/util/DeleteZooInstance.java |  4 +-
 .../accumulo/server/util/FileSystemMonitor.java |  6 +-
 .../apache/accumulo/server/util/FileUtil.java   | 20 +++---
 .../accumulo/server/util/ListInstances.java     |  4 +-
 .../accumulo/server/util/ListVolumesUsed.java   |  6 +-
 .../accumulo/server/util/LocalityCheck.java     |  6 +-
 .../accumulo/server/util/LoginProperties.java   |  2 +-
 .../server/util/MasterMetadataUtil.java         |  8 +--
 .../accumulo/server/util/MetadataTableUtil.java | 26 +++----
 .../util/RemoveEntriesForMissingFiles.java      |  4 +-
 .../server/util/ReplicationTableUtil.java       |  2 +-
 .../accumulo/server/util/RestoreZookeeper.java  |  2 +-
 .../accumulo/server/util/TableDiskUsage.java    | 32 ++++-----
 .../accumulo/server/util/TableInfoUtil.java     |  2 +-
 .../accumulo/server/util/TabletIterator.java    |  2 +-
 .../server/util/VerifyTabletAssignments.java    | 10 +--
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/server/ServerConstantsTest.java    |  2 +-
 .../server/client/BulkImporterTest.java         |  2 +-
 .../server/conf/NamespaceConfigurationTest.java |  4 +-
 .../server/conf/TableConfigurationTest.java     |  4 +-
 .../conf/ZooCachePropertyAccessorTest.java      | 12 ++--
 .../apache/accumulo/server/fs/FileRefTest.java  |  2 +-
 .../accumulo/server/fs/VolumeUtilTest.java      | 48 ++++++-------
 .../iterators/MetadataBulkLoadFilterTest.java   |  6 +-
 .../balancer/ChaoticLoadBalancerTest.java       | 18 ++---
 .../balancer/DefaultLoadBalancerTest.java       | 28 ++++----
 .../master/balancer/GroupBalancerTest.java      |  2 +-
 ...gexTableLoadBalancerReconfigurationTest.java |  4 +-
 .../HostRegexTableLoadBalancerTest.java         |  6 +-
 .../master/balancer/TableLoadBalancerTest.java  | 10 +--
 .../master/state/TabletLocationStateTest.java   | 12 ++--
 .../problems/ProblemReportingIteratorTest.java  |  2 +-
 .../accumulo/server/rpc/RpcWrapperTest.java     | 11 ++-
 ...redentialsUpdatingInvocationHandlerTest.java | 26 +++----
 .../security/handler/ZKAuthenticatorTest.java   |  4 +-
 .../server/tablets/LogicalTimeTest.java         |  4 +-
 .../accumulo/server/tablets/MillisTimeTest.java |  4 +-
 .../accumulo/server/util/DefaultMapTest.java    |  2 +-
 .../server/util/FileSystemMonitorTest.java      |  2 +-
 .../accumulo/server/util/FileUtilTest.java      | 12 ++--
 .../server/util/ReplicationTableUtilTest.java   |  2 +-
 .../accumulo/server/util/TServerUtilsTest.java  |  2 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  8 +--
 .../accumulo/gc/SimpleGarbageCollector.java     |  4 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  6 +-
 .../accumulo/gc/GarbageCollectionTest.java      | 18 ++---
 .../accumulo/master/FateServiceHandler.java     | 36 +++++-----
 .../java/org/apache/accumulo/master/Master.java | 44 ++++++------
 .../master/MasterClientServiceHandler.java      |  6 +-
 .../accumulo/master/TabletGroupWatcher.java     | 24 +++----
 .../master/recovery/RecoveryManager.java        |  6 +-
 .../accumulo/master/state/TableStats.java       |  4 +-
 .../master/tableOps/CompactionDriver.java       |  2 +-
 .../accumulo/master/tableOps/CopyFailed.java    |  8 +--
 .../accumulo/master/tableOps/LoadFiles.java     |  8 +--
 .../master/tableOps/PopulateMetadataTable.java  |  2 +-
 .../accumulo/master/tableOps/TraceRepo.java     |  2 +-
 .../master/tableOps/WriteExportFiles.java       |  2 +-
 .../apache/accumulo/master/util/FateAdmin.java  | 10 +--
 .../apache/accumulo/master/DefaultMapTest.java  |  2 +-
 .../master/state/RootTabletStateStoreTest.java  | 10 +--
 .../org/apache/accumulo/monitor/Monitor.java    | 56 +++++++--------
 .../accumulo/monitor/ZooKeeperStatus.java       |  4 +-
 .../monitor/servlets/GcStatusServlet.java       |  2 +-
 .../accumulo/monitor/servlets/JSONServlet.java  | 10 +--
 .../monitor/servlets/MasterServlet.java         |  8 +--
 .../monitor/servlets/ProblemServlet.java        |  2 +-
 .../monitor/servlets/ReplicationServlet.java    |  2 +-
 .../accumulo/monitor/servlets/ShellServlet.java |  2 +-
 .../monitor/servlets/TServersServlet.java       |  8 +--
 .../monitor/servlets/TablesServlet.java         |  8 +--
 .../accumulo/monitor/servlets/VisServlet.java   |  2 +-
 .../accumulo/monitor/servlets/XMLServlet.java   |  2 +-
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/Summary.java         |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  8 +--
 .../apache/accumulo/monitor/util/TableRow.java  |  4 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java |  2 +-
 .../accumulo/monitor/ZooKeeperStatusTest.java   |  4 +-
 .../accumulo/tracer/AsyncSpanReceiver.java      |  6 +-
 .../org/apache/accumulo/tracer/SpanTree.java    |  8 +--
 .../org/apache/accumulo/tracer/TraceDump.java   |  4 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  2 +-
 .../apache/accumulo/tracer/ZooTraceClient.java  |  4 +-
 .../org/apache/accumulo/tracer/TracerTest.java  |  2 +-
 .../accumulo/tserver/CompactionQueue.java       |  2 +-
 .../tserver/ConditionalMutationSet.java         |  4 +-
 .../apache/accumulo/tserver/FileManager.java    | 34 ++++-----
 .../apache/accumulo/tserver/InMemoryMap.java    |  8 +--
 .../org/apache/accumulo/tserver/NativeMap.java  | 10 +--
 .../org/apache/accumulo/tserver/RowLocks.java   | 10 +--
 .../tserver/TabletIteratorEnvironment.java      |  4 +-
 .../apache/accumulo/tserver/TabletServer.java   | 75 ++++++++++----------
 .../tserver/TabletServerResourceManager.java    |  8 +--
 .../apache/accumulo/tserver/WriteTracker.java   |  4 +-
 .../tserver/compaction/CompactionPlan.java      |  8 +--
 .../compaction/DefaultCompactionStrategy.java   | 10 +--
 .../compaction/SizeLimitCompactionStrategy.java |  2 +-
 .../tserver/constraints/ConstraintChecker.java  |  2 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  | 14 ++--
 .../apache/accumulo/tserver/log/LogSorter.java  |  6 +-
 .../accumulo/tserver/log/SortedLogRecovery.java |  4 +-
 .../tserver/log/TabletServerLogger.java         |  6 +-
 .../accumulo/tserver/logger/LogFileValue.java   |  2 +-
 .../accumulo/tserver/logger/LogReader.java      |  4 +-
 .../replication/AccumuloReplicaSystem.java      |  2 +-
 .../accumulo/tserver/scan/LookupTask.java       | 10 +--
 .../apache/accumulo/tserver/scan/ScanTask.java  |  4 +-
 .../tserver/session/MultiScanSession.java       |  2 +-
 .../tserver/session/SessionManager.java         | 16 ++---
 .../accumulo/tserver/session/UpdateSession.java |  8 +--
 .../accumulo/tserver/tablet/CompactionInfo.java |  6 +-
 .../tserver/tablet/CompactionWatcher.java       |  6 +-
 .../accumulo/tserver/tablet/Compactor.java      |  8 +--
 .../tserver/tablet/CountingIterator.java        |  2 +-
 .../tserver/tablet/DatafileManager.java         | 26 +++----
 .../accumulo/tserver/tablet/RootFiles.java      |  2 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |  2 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  | 74 +++++++++----------
 .../accumulo/tserver/tablet/TabletMemory.java   |  2 +-
 .../accumulo/tserver/AssignmentWatcherTest.java |  2 +-
 .../tserver/CheckTabletMetadataTest.java        | 10 +--
 .../accumulo/tserver/CountingIteratorTest.java  |  2 +-
 .../accumulo/tserver/InMemoryMapTest.java       |  4 +-
 .../DefaultCompactionStrategyTest.java          | 10 +--
 .../SizeLimitCompactionStrategyTest.java        |  6 +-
 .../constraints/ConstraintCheckerTest.java      |  2 +-
 .../accumulo/tserver/log/DfsLoggerTest.java     |  2 +-
 .../tserver/log/SortedLogRecoveryTest.java      | 44 ++++++------
 .../accumulo/tserver/tablet/RootFilesTest.java  | 10 +--
 .../java/org/apache/accumulo/shell/Shell.java   | 22 +++---
 .../apache/accumulo/shell/ShellOptionsJC.java   |  6 +-
 .../java/org/apache/accumulo/shell/Token.java   |  8 +--
 .../commands/ActiveCompactionIterator.java      |  8 +--
 .../shell/commands/ActiveScanIterator.java      |  2 +-
 .../shell/commands/AddSplitsCommand.java        |  2 +-
 .../shell/commands/CloneTableCommand.java       |  4 +-
 .../accumulo/shell/commands/ConfigCommand.java  | 12 ++--
 .../shell/commands/CreateTableCommand.java      |  4 +-
 .../accumulo/shell/commands/DUCommand.java      |  2 +-
 .../shell/commands/DeleteAuthsCommand.java      |  2 +-
 .../shell/commands/ExtensionCommand.java        |  6 +-
 .../accumulo/shell/commands/FateCommand.java    |  6 +-
 .../shell/commands/GetAuthsCommand.java         |  2 +-
 .../accumulo/shell/commands/HelpCommand.java    |  2 +-
 .../accumulo/shell/commands/InsertCommand.java  |  2 +-
 .../shell/commands/ListBulkCommand.java         |  2 +-
 .../shell/commands/ListCompactionsCommand.java  |  2 +-
 .../shell/commands/ListIterCommand.java         |  4 +-
 .../shell/commands/ListScansCommand.java        |  2 +-
 .../shell/commands/NamespacesCommand.java       |  2 +-
 .../accumulo/shell/commands/PingCommand.java    |  2 +-
 .../shell/commands/QuotedStringTokenizer.java   |  2 +-
 .../accumulo/shell/commands/ScriptCommand.java  |  4 +-
 .../shell/commands/SetGroupsCommand.java        |  4 +-
 .../accumulo/shell/commands/SetIterCommand.java |  6 +-
 .../shell/commands/SetScanIterCommand.java      |  4 +-
 .../shell/commands/SetShellIterCommand.java     |  4 +-
 .../accumulo/shell/commands/TableOperation.java |  2 +-
 .../accumulo/shell/commands/TablesCommand.java  |  2 +-
 .../accumulo/shell/ShellSetInstanceTest.java    |  2 +-
 .../shell/commands/DeleteTableCommandTest.java  |  4 +-
 .../shell/format/DeleterFormatterTest.java      |  9 +--
 .../start/classloader/AccumuloClassLoader.java  |  6 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java    |  4 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  6 +-
 .../start/classloader/vfs/ContextManager.java   |  4 +-
 .../AccumuloClusterPropertyConfiguration.java   |  2 +-
 .../accumulo/test/AssignmentThreadsIT.java      |  2 +-
 .../apache/accumulo/test/AuditMessageIT.java    |  4 +-
 .../test/BadDeleteMarkersCreatedIT.java         |  2 +-
 .../apache/accumulo/test/BalanceFasterIT.java   |  4 +-
 .../org/apache/accumulo/test/BalanceIT.java     |  2 +-
 .../test/BalanceWithOfflineTableIT.java         |  2 +-
 .../accumulo/test/BatchWriterIterator.java      |  2 +-
 .../accumulo/test/BulkImportDirectory.java      |  2 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |  2 +-
 .../accumulo/test/ClientSideIteratorIT.java     |  6 +-
 .../java/org/apache/accumulo/test/CloneIT.java  | 10 +--
 .../accumulo/test/ConditionalWriterIT.java      | 36 +++++-----
 .../test/ConfigurableMajorCompactionIT.java     |  2 +-
 .../test/CreateTableWithNewTableConfigIT.java   |  2 +-
 .../apache/accumulo/test/FairVolumeChooser.java |  2 +-
 .../accumulo/test/FaultyConditionalWriter.java  |  4 +-
 .../org/apache/accumulo/test/FindMaxIT.java     |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java |  2 +-
 .../apache/accumulo/test/IMMLGBenchmark.java    |  8 +--
 .../org/apache/accumulo/test/InMemoryMapIT.java |  8 +--
 .../accumulo/test/InterruptibleScannersIT.java  |  2 +-
 .../apache/accumulo/test/LargeSplitRowIT.java   |  4 +-
 .../org/apache/accumulo/test/LocatorIT.java     |  2 +-
 .../org/apache/accumulo/test/ManySplitIT.java   |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |  6 +-
 .../org/apache/accumulo/test/MetaSplitIT.java   |  8 +--
 .../accumulo/test/MultiTableBatchWriterIT.java  | 16 ++---
 .../accumulo/test/NativeMapPerformanceTest.java |  2 +-
 .../accumulo/test/NativeMapStressTest.java      |  8 +--
 .../accumulo/test/QueryMetadataTable.java       |  4 +-
 .../test/RewriteTabletDirectoriesIT.java        |  2 +-
 .../java/org/apache/accumulo/test/SampleIT.java |  6 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  6 +-
 .../accumulo/test/SplitCancelsMajCIT.java       |  4 +-
 .../test/TableConfigurationUpdateIT.java        |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java |  4 +-
 .../apache/accumulo/test/TestBinaryRows.java    |  2 +-
 .../org/apache/accumulo/test/TestIngest.java    |  2 +-
 .../accumulo/test/TestMultiTableIngest.java     |  2 +-
 .../apache/accumulo/test/TestRandomDeletes.java |  4 +-
 .../accumulo/test/TextMemoryUsageTest.java      |  2 +-
 .../accumulo/test/TransportCachingIT.java       |  2 +-
 .../accumulo/test/UserCompactionStrategyIT.java |  4 +-
 .../accumulo/test/VerifySerialRecoveryIT.java   |  2 +-
 .../apache/accumulo/test/VolumeChooserIT.java   |  6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 14 ++--
 .../apache/accumulo/test/WaitForBalanceIT.java  |  4 +-
 .../test/continuous/ContinuousBatchWalker.java  | 12 ++--
 .../test/continuous/ContinuousIngest.java       |  2 +-
 .../continuous/ContinuousStatsCollector.java    |  2 +-
 .../test/continuous/ContinuousVerify.java       |  2 +-
 .../test/continuous/ContinuousWalk.java         |  4 +-
 .../accumulo/test/continuous/Histogram.java     | 12 ++--
 .../test/continuous/PrintScanTimeHistogram.java |  4 +-
 .../accumulo/test/continuous/TimeBinner.java    | 10 +--
 .../test/continuous/UndefinedAnalyzer.java      | 14 ++--
 .../test/examples/simple/dirlist/CountIT.java   | 10 +--
 .../simple/filedata/ChunkInputFormatIT.java     |  4 +-
 .../simple/filedata/ChunkInputStreamIT.java     |  8 +--
 .../accumulo/test/functional/AddSplitIT.java    |  6 +-
 .../functional/BalanceAfterCommsFailureIT.java  |  6 +-
 .../BalanceInPresenceOfOfflineTableIT.java      |  2 +-
 .../test/functional/BatchScanSplitIT.java       |  6 +-
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  2 +-
 .../accumulo/test/functional/BloomFilterIT.java |  4 +-
 .../accumulo/test/functional/BulkFileIT.java    |  2 +-
 .../test/functional/CacheTestReader.java        |  2 +-
 .../test/functional/CacheTestWriter.java        |  4 +-
 .../test/functional/ChaoticBalancerIT.java      |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   | 20 +++---
 .../functional/ConfigurableCompactionIT.java    |  2 +-
 .../accumulo/test/functional/ConstraintIT.java  |  2 +-
 .../test/functional/CreateAndUseIT.java         |  4 +-
 .../accumulo/test/functional/DeleteRowsIT.java  |  4 +-
 .../test/functional/DeleteRowsSplitIT.java      |  6 +-
 .../functional/DeleteTableDuringSplitIT.java    |  6 +-
 .../accumulo/test/functional/DurabilityIT.java  |  2 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/FunctionalTestUtils.java    |  4 +-
 .../test/functional/HalfDeadTServerIT.java      |  2 +-
 .../accumulo/test/functional/LargeRowIT.java    |  2 +-
 .../accumulo/test/functional/LogicalTimeIT.java |  2 +-
 .../accumulo/test/functional/MaxOpenIT.java     |  2 +-
 .../accumulo/test/functional/MergeIT.java       | 12 ++--
 .../accumulo/test/functional/MetadataIT.java    |  8 +--
 .../test/functional/MetadataMaxFilesIT.java     |  2 +-
 .../accumulo/test/functional/NativeMapIT.java   |  6 +-
 .../accumulo/test/functional/PermissionsIT.java | 10 +--
 .../accumulo/test/functional/ReadWriteIT.java   |  6 +-
 .../accumulo/test/functional/RowDeleteIT.java   |  2 +-
 .../accumulo/test/functional/ScanIdIT.java      |  6 +-
 .../test/functional/ScanIteratorIT.java         |  6 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  2 +-
 .../test/functional/SessionBlockVerifyIT.java   |  2 +-
 .../accumulo/test/functional/ShutdownIT.java    |  2 +-
 .../functional/SimpleBalancerFairnessIT.java    |  2 +-
 .../test/functional/SplitRecoveryIT.java        | 12 ++--
 .../accumulo/test/functional/TabletIT.java      |  2 +-
 .../functional/TabletStateChangeIteratorIT.java |  6 +-
 .../accumulo/test/functional/VisibilityIT.java  | 18 ++---
 .../accumulo/test/functional/WALSunnyDayIT.java |  2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  2 +-
 .../accumulo/test/functional/ZombieTServer.java |  5 +-
 .../accumulo/test/functional/ZooCacheIT.java    |  4 +-
 .../test/functional/ZookeeperRestartIT.java     |  2 +-
 .../test/mapred/AccumuloInputFormatIT.java      |  2 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java |  2 +-
 .../test/mapred/AccumuloRowInputFormatIT.java   |  6 +-
 .../test/mapreduce/AccumuloInputFormatIT.java   | 10 +--
 .../AccumuloMultiTableInputFormatIT.java        |  2 +-
 .../mapreduce/AccumuloRowInputFormatIT.java     |  6 +-
 .../test/performance/RollWALPerformanceIT.java  |  2 +-
 .../metadata/MetadataBatchScanTest.java         |  8 +--
 .../performance/scan/CollectTabletStats.java    | 24 +++----
 .../test/performance/thrift/NullTserver.java    |  6 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java  |  4 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 28 ++++----
 .../accumulo/test/proxy/TestProxyClient.java    |  4 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java | 20 +++---
 .../test/proxy/TestProxySecurityOperations.java |  4 +-
 .../test/proxy/TestProxyTableOperations.java    | 12 ++--
 .../accumulo/test/randomwalk/Framework.java     |  2 +-
 .../apache/accumulo/test/randomwalk/Module.java | 18 ++---
 .../apache/accumulo/test/randomwalk/State.java  |  2 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |  8 +--
 .../accumulo/test/randomwalk/bulk/Split.java    |  2 +-
 .../test/randomwalk/concurrent/AddSplits.java   |  4 +-
 .../test/randomwalk/concurrent/BatchScan.java   |  2 +-
 .../test/randomwalk/concurrent/BulkImport.java  |  2 +-
 .../concurrent/ChangeAuthorizations.java        |  2 +-
 .../concurrent/ChangePermissions.java           | 12 ++--
 .../concurrent/ConcurrentFixture.java           |  2 +-
 .../test/randomwalk/concurrent/DeleteRange.java |  2 +-
 .../randomwalk/concurrent/IsolatedScan.java     |  2 +-
 .../test/randomwalk/concurrent/Merge.java       |  2 +-
 .../test/randomwalk/concurrent/Setup.java       |  6 +-
 .../randomwalk/concurrent/StopTabletServer.java |  4 +-
 .../test/randomwalk/conditional/Init.java       |  4 +-
 .../test/randomwalk/conditional/Split.java      |  2 +-
 .../test/randomwalk/image/ImageFixture.java     |  8 +--
 .../test/randomwalk/image/ScanMeta.java         |  6 +-
 .../accumulo/test/randomwalk/image/TableOp.java |  2 +-
 .../test/randomwalk/multitable/CopyTable.java   |  2 +-
 .../test/randomwalk/multitable/CreateTable.java |  2 +-
 .../test/randomwalk/security/TableOp.java       |  2 +-
 .../randomwalk/security/WalkingSecurity.java    |  4 +-
 .../test/randomwalk/sequential/BatchVerify.java |  4 +-
 .../test/randomwalk/shard/CompactFilter.java    |  6 +-
 .../test/randomwalk/shard/DeleteSomeDocs.java   |  2 +-
 .../test/randomwalk/shard/DeleteWord.java       |  2 +-
 .../test/randomwalk/shard/ExportIndex.java      |  8 +--
 .../accumulo/test/randomwalk/shard/Grep.java    |  4 +-
 .../accumulo/test/randomwalk/shard/Insert.java  |  2 +-
 .../accumulo/test/randomwalk/shard/Merge.java   |  2 +-
 .../accumulo/test/randomwalk/shard/Search.java  |  2 +-
 .../test/randomwalk/shard/ShardFixture.java     |  2 +-
 .../test/replication/CyclicReplicationIT.java   |  2 +-
 ...bageCollectorCommunicatesWithTServersIT.java |  6 +-
 .../replication/MultiInstanceReplicationIT.java |  2 +-
 .../test/replication/StatusCombinerMacIT.java   |  2 +-
 .../UnorderedWorkAssignerReplicationIT.java     |  2 +-
 .../test/replication/merkle/MerkleTree.java     |  6 +-
 .../test/replication/merkle/MerkleTreeNode.java |  2 +-
 .../replication/merkle/cli/ComputeRootHash.java |  2 +-
 .../replication/merkle/cli/GenerateHashes.java  |  4 +-
 .../accumulo/test/scalability/ScaleTest.java    |  2 +-
 .../apache/accumulo/test/util/CertUtils.java    |  2 +-
 .../accumulo/test/iterator/RegExTest.java       |  2 +-
 671 files changed, 2399 insertions(+), 2410 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 71ee6d1..c07c4cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -122,7 +122,7 @@ public class ClientOpts extends Help {
 
   @DynamicParameter(names = "-l",
       description = "login properties in the format key=value. Reuse -l for each property (prompt for properties if this option is missing")
-  public Map<String,String> loginProps = new LinkedHashMap<String,String>();
+  public Map<String,String> loginProps = new LinkedHashMap<>();
 
   public AuthenticationToken getToken() {
     if (null != tokenClassName) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 3421f76..521e0ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -196,7 +196,7 @@ public class BatchWriterConfig implements Writable {
   @Override
   public void write(DataOutput out) throws IOException {
     // write this out in a human-readable way
-    ArrayList<String> fields = new ArrayList<String>();
+    ArrayList<String> fields = new ArrayList<>();
     if (maxMemory != null)
       addField(fields, "maxMemory", maxMemory);
     if (maxLatency != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index d5bf920..1b9b380 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -145,7 +145,7 @@ public class ClientConfiguration extends CompositeConfiguration {
           return prop;
       return null;
     }
-  };
+  }
 
   public ClientConfiguration(String configFile) throws ConfigurationException {
     this(new PropertiesConfiguration(), configFile);
@@ -215,7 +215,7 @@ public class ClientConfiguration extends CompositeConfiguration {
 
   private static ClientConfiguration loadFromSearchPath(List<String> paths) {
     try {
-      List<Configuration> configs = new LinkedList<Configuration>();
+      List<Configuration> configs = new LinkedList<>();
       for (String path : paths) {
         File conf = new File(path);
         if (conf.isFile() && conf.canRead()) {
@@ -272,7 +272,7 @@ public class ClientConfiguration extends CompositeConfiguration {
       // ~/.accumulo/config
       // $ACCUMULO_CONF_DIR/client.conf -OR- $ACCUMULO_HOME/conf/client.conf (depending on whether $ACCUMULO_CONF_DIR is set)
       // /etc/accumulo/client.conf
-      clientConfPaths = new LinkedList<String>();
+      clientConfPaths = new LinkedList<>();
       clientConfPaths.add(System.getProperty("user.home") + File.separator + USER_ACCUMULO_DIR_NAME + File.separator + USER_CONF_FILENAME);
       if (System.getenv("ACCUMULO_CONF_DIR") != null) {
         clientConfPaths.add(System.getenv("ACCUMULO_CONF_DIR") + File.separator + GLOBAL_CONF_FILENAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
index 9f9449a..d4622c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
@@ -251,7 +251,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
 
     smi.samplerConfig = getSamplerConfiguration();
 
-    final TreeMap<Integer,IterInfo> tm = new TreeMap<Integer,IterInfo>();
+    final TreeMap<Integer,IterInfo> tm = new TreeMap<>();
 
     for (IterInfo iterInfo : serverSideIteratorList) {
       tm.put(iterInfo.getPriority(), iterInfo);
@@ -265,7 +265,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
       throw new RuntimeException(e);
     }
 
-    final Set<ByteSequence> colfs = new TreeSet<ByteSequence>();
+    final Set<ByteSequence> colfs = new TreeSet<>();
     for (Column c : this.getFetchedColumns()) {
       colfs.add(new ArrayByteSequence(c.getColumnFamily()));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------
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 0479f3b..90e8637 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
@@ -194,7 +194,7 @@ public class IsolatedScanner extends ScannerOptions implements Scanner {
 
   public static class MemoryRowBuffer implements RowBuffer {
 
-    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<Entry<Key,Value>>();
+    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<>();
 
     @Override
     public void add(Entry<Key,Value> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index e7bbbdf..a6d9a09 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -140,7 +140,7 @@ public class IteratorSetting implements Writable {
     setPriority(priority);
     setName(name);
     setIteratorClass(iteratorClass);
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     addOptions(properties);
   }
 
@@ -209,7 +209,7 @@ public class IteratorSetting implements Writable {
    * @since 1.5.0
    */
   public IteratorSetting(DataInput din) throws IOException {
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     this.readFields(din);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------
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 e8f675b..676957a 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
@@ -47,7 +47,7 @@ public class MutationsRejectedException extends AccumuloException {
   private int unknownErrors;
 
   private static <K,V,L> Map<L,V> transformKeys(Map<K,V> map, Function<K,L> keyFunction) {
-    HashMap<L,V> ret = new HashMap<L,V>();
+    HashMap<L,V> ret = new HashMap<>();
     for (Entry<K,V> entry : map.entrySet()) {
       ret.put(keyFunction.apply(entry.getKey()), entry.getValue());
     }
@@ -125,7 +125,7 @@ public class MutationsRejectedException extends AccumuloException {
   }
 
   private static String format(Map<TabletId,Set<SecurityErrorCode>> hashMap, Instance instance) {
-    Map<String,Set<SecurityErrorCode>> result = new HashMap<String,Set<SecurityErrorCode>>();
+    Map<String,Set<SecurityErrorCode>> result = new HashMap<>();
 
     for (Entry<TabletId,Set<SecurityErrorCode>> entry : hashMap.entrySet()) {
       String tableInfo = Tables.getPrintableTableInfoFromId(instance, entry.getKey().getTableId().toString());
@@ -153,7 +153,7 @@ public class MutationsRejectedException extends AccumuloException {
    */
   @Deprecated
   public List<org.apache.accumulo.core.data.KeyExtent> getAuthorizationFailures() {
-    return new ArrayList<org.apache.accumulo.core.data.KeyExtent>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
+    return new ArrayList<>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
index 190b0b2..c8dab71 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
@@ -107,7 +107,7 @@ public class RowIterator implements Iterator<Iterator<Entry<Key,Value>>> {
    * Create an iterator from an (ordered) sequence of KeyValue pairs.
    */
   public RowIterator(Iterator<Entry<Key,Value>> iterator) {
-    this.iter = new PeekingIterator<Entry<Key,Value>>(iterator);
+    this.iter = new PeekingIterator<>(iterator);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
index 5ec9c59..e5bba3e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
@@ -34,7 +34,7 @@ public class TimedOutException extends RuntimeException {
       return set.toString();
     }
 
-    return new ArrayList<String>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
+    return new ArrayList<>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
   }
 
   public TimedOutException(Set<String> timedoutServers) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
----------------------------------------------------------------------
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 89d30b1..5228391 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
@@ -45,7 +45,7 @@ public abstract class ActiveCompaction {
      * compaction that merges all of a tablets files into one file
      */
     FULL
-  };
+  }
 
   public static enum CompactionReason {
     /**
@@ -68,7 +68,7 @@ public abstract class ActiveCompaction {
      * Compaction initiated to close a unload a tablet
      */
     CLOSE
-  };
+  }
 
   /**
    *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
index e7dc898..4694e1e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
@@ -41,7 +41,7 @@ public class NewTableConfiguration {
 
   private boolean limitVersion = true;
 
-  private Map<String,String> properties = new HashMap<String,String>();
+  private Map<String,String> properties = new HashMap<>();
   private SamplerConfiguration samplerConfiguration;
 
   /**
@@ -90,7 +90,7 @@ public class NewTableConfiguration {
     checkArgument(prop != null, "properties is null");
     SamplerConfigurationImpl.checkDisjoint(prop, samplerConfiguration);
 
-    this.properties = new HashMap<String,String>(prop);
+    this.properties = new HashMap<>(prop);
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------
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 838baa9..bdd5d51 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
@@ -104,7 +104,7 @@ public class ActiveCompactionImpl extends ActiveCompaction {
 
   @Override
   public List<IteratorSetting> getIterators() {
-    ArrayList<IteratorSetting> ret = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> ret = new ArrayList<>();
 
     for (IterInfo ii : tac.getSsiList()) {
       IteratorSetting settings = new IteratorSetting(ii.getPriority(), ii.getIterName(), ii.getClassName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
index 7015303..9021190 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
@@ -67,12 +67,12 @@ public class ActiveScanImpl extends ActiveScan {
     this.extent = new KeyExtent(activeScan.extent);
     this.authorizations = new Authorizations(activeScan.authorizations);
 
-    this.columns = new ArrayList<Column>(activeScan.columns.size());
+    this.columns = new ArrayList<>(activeScan.columns.size());
 
     for (TColumn tcolumn : activeScan.columns)
       this.columns.add(new Column(tcolumn));
 
-    this.ssiList = new ArrayList<String>();
+    this.ssiList = new ArrayList<>();
     for (IterInfo ii : activeScan.ssiList) {
       this.ssiList.add(ii.iterName + "=" + ii.priority + "," + ii.className);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 96d58a7..c227b40 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -32,13 +32,13 @@ public class CompressedIterators {
   private List<String> symbolTable;
 
   public static class IterConfig {
-    public List<IterInfo> ssiList = new ArrayList<IterInfo>();
-    public Map<String,Map<String,String>> ssio = new HashMap<String,Map<String,String>>();
+    public List<IterInfo> ssiList = new ArrayList<>();
+    public Map<String,Map<String,String>> ssio = new HashMap<>();
   }
 
   public CompressedIterators() {
-    symbolMap = new HashMap<String,Integer>();
-    symbolTable = new ArrayList<String>();
+    symbolMap = new HashMap<>();
+    symbolTable = new ArrayList<>();
   }
 
   public CompressedIterators(List<String> symbols) {
@@ -96,7 +96,7 @@ public class CompressedIterators {
 
       int numOpts = in.readVInt();
 
-      HashMap<String,String> opts = new HashMap<String,String>();
+      HashMap<String,String> opts = new HashMap<>();
 
       for (int j = 0; j < numOpts; j++) {
         String key = symbolTable.get(in.readVInt());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 1c1aaf3..98a15ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -119,12 +119,12 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private final String classLoaderContext;
 
   private static class ServerQueue {
-    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<TabletServerMutations<QCMutation>>();
+    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<>();
     boolean taskQueued = false;
   }
 
   private Map<String,ServerQueue> serverQueues;
-  private DelayQueue<QCMutation> failedMutations = new DelayQueue<QCMutation>();
+  private DelayQueue<QCMutation> failedMutations = new DelayQueue<>();
   private ScheduledThreadPoolExecutor threadPool;
 
   private class RQIterator implements Iterator<Result> {
@@ -262,7 +262,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       long time = System.currentTimeMillis();
 
-      ArrayList<QCMutation> mutations2 = new ArrayList<ConditionalWriterImpl.QCMutation>(mutations.size());
+      ArrayList<QCMutation> mutations2 = new ArrayList<>(mutations.size());
 
       for (QCMutation qcm : mutations) {
         qcm.resetDelay();
@@ -290,8 +290,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queue(List<QCMutation> mutations) {
-    List<QCMutation> failures = new ArrayList<QCMutation>();
-    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<String,TabletLocator.TabletServerMutations<QCMutation>>();
+    List<QCMutation> failures = new ArrayList<>();
+    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<>();
 
     try {
       locator.binMutations(context, mutations, binnedMutations, failures);
@@ -355,7 +355,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private TabletServerMutations<QCMutation> dequeue(String location) {
     BlockingQueue<TabletServerMutations<QCMutation>> queue = getServerQueue(location).queue;
 
-    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<TabletLocator.TabletServerMutations<QCMutation>>();
+    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<>();
     queue.drainTo(mutations);
 
     if (mutations.size() == 0)
@@ -371,7 +371,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
         for (Entry<KeyExtent,List<QCMutation>> entry : mutations.get(i).getMutations().entrySet()) {
           List<QCMutation> list = tsm.getMutations().get(entry.getKey());
           if (list == null) {
-            list = new ArrayList<QCMutation>();
+            list = new ArrayList<>();
             tsm.getMutations().put(entry.getKey(), list);
           }
 
@@ -389,7 +389,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     this.ve = new VisibilityEvaluator(config.getAuthorizations());
     this.threadPool = new ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new NamingThreadFactory(this.getClass().getSimpleName()));
     this.locator = new SyncingTabletLocator(context, tableId);
-    this.serverQueues = new HashMap<String,ServerQueue>();
+    this.serverQueues = new HashMap<>();
     this.tableId = tableId;
     this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);
     this.durability = config.getDurability();
@@ -399,7 +399,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       @Override
       public void run() {
-        List<QCMutation> mutations = new ArrayList<QCMutation>();
+        List<QCMutation> mutations = new ArrayList<>();
         failedMutations.drainTo(mutations);
         if (mutations.size() > 0)
           queue(mutations);
@@ -414,9 +414,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
   @Override
   public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
 
-    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<Result>();
+    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<>();
 
-    List<QCMutation> mutationList = new ArrayList<QCMutation>();
+    List<QCMutation> mutationList = new ArrayList<>();
 
     int count = 0;
 
@@ -491,7 +491,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     }
   }
 
-  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<HostAndPort,SessionID>();
+  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<>();
 
   private SessionID reserveSessionID(HostAndPort location, TabletClientService.Iface client, TInfo tinfo) throws ThriftSecurityException, TException {
     // avoid cost of repeatedly making RPC to create sessions, reuse sessions
@@ -548,7 +548,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   List<SessionID> getActiveSessions() {
-    ArrayList<SessionID> activeSessions = new ArrayList<SessionID>();
+    ArrayList<SessionID> activeSessions = new ArrayList<>();
     for (SessionID sid : cachedSessionIDs.values())
       if (sid.isActive())
         activeSessions.add(sid);
@@ -569,13 +569,13 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     TInfo tinfo = Tracer.traceInfo();
 
-    Map<Long,CMK> cmidToCm = new HashMap<Long,CMK>();
+    Map<Long,CMK> cmidToCm = new HashMap<>();
     MutableLong cmid = new MutableLong(0);
 
     SessionID sessionId = null;
 
     try {
-      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<TKeyExtent,List<TConditionalMutation>>();
+      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<>();
 
       CompressedIterators compressedIters = new CompressedIterators();
       convertMutations(mutations, cmidToCm, cmid, tmutations, compressedIters);
@@ -594,9 +594,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
         }
       }
 
-      HashSet<KeyExtent> extentsToInvalidate = new HashSet<KeyExtent>();
+      HashSet<KeyExtent> extentsToInvalidate = new HashSet<>();
 
-      ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+      ArrayList<QCMutation> ignored = new ArrayList<>();
 
       for (TCMResult tcmResult : tresults) {
         if (tcmResult.status == TCMStatus.IGNORED) {
@@ -637,7 +637,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queueRetry(Map<Long,CMK> cmidToCm, HostAndPort location) {
-    ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+    ArrayList<QCMutation> ignored = new ArrayList<>();
     for (CMK cmk : cmidToCm.values())
       ignored.add(cmk.cm);
     queueRetry(ignored, location);
@@ -739,7 +739,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     for (Entry<KeyExtent,List<QCMutation>> entry : mutations.getMutations().entrySet()) {
       TKeyExtent tke = entry.getKey().toThrift();
-      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<TConditionalMutation>();
+      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<>();
 
       List<QCMutation> condMutations = entry.getValue();
 
@@ -792,7 +792,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private static final ConditionComparator CONDITION_COMPARATOR = new ConditionComparator();
 
   private List<TCondition> convertConditions(ConditionalMutation cm, CompressedIterators compressedIters) {
-    List<TCondition> conditions = new ArrayList<TCondition>(cm.getConditions().size());
+    List<TCondition> conditions = new ArrayList<>(cm.getConditions().size());
 
     // sort conditions inorder to get better lookup performance. Sort on client side so tserver does not have to do it.
     Condition[] ca = cm.getConditions().toArray(new Condition[cm.getConditions().size()]);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
index 32a7ec0..d716650 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
@@ -110,11 +110,11 @@ public class InstanceOperationsImpl implements InstanceOperations {
     Instance instance = context.getInstance();
     ZooCache cache = new ZooCacheFactory().getZooCache(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
     String path = ZooUtil.getRoot(instance) + Constants.ZTSERVERS;
-    List<String> results = new ArrayList<String>();
+    List<String> results = new ArrayList<>();
     for (String candidate : cache.getChildren(path)) {
       List<String> children = cache.getChildren(path + "/" + candidate);
       if (children != null && children.size() > 0) {
-        List<String> copy = new ArrayList<String>(children);
+        List<String> copy = new ArrayList<>(children);
         Collections.sort(copy);
         byte[] data = cache.get(path + "/" + candidate + "/" + copy.get(0));
         if (data != null && !"master".equals(new String(data, UTF_8))) {
@@ -132,7 +132,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveScan> as = new ArrayList<ActiveScan>();
+      List<ActiveScan> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan : client.getActiveScans(Tracer.traceInfo(), context.rpcCreds())) {
         try {
           as.add(new ActiveScanImpl(context.getInstance(), activeScan));
@@ -170,7 +170,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveCompaction> as = new ArrayList<ActiveCompaction>();
+      List<ActiveCompaction> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction activeCompaction : client.getActiveCompactions(Tracer.traceInfo(), context.rpcCreds())) {
         as.add(new ActiveCompactionImpl(context.getInstance(), activeCompaction));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 6f700a3..15d1c34 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -118,7 +118,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
     checkArgument(cacheTimeUnit != null, "cacheTimeUnit is null");
     this.context = context;
     this.bw = new TabletServerBatchWriter(context, config);
-    tableWriters = new ConcurrentHashMap<String,BatchWriter>();
+    tableWriters = new ConcurrentHashMap<>();
     this.closed = new AtomicBoolean(false);
     this.cacheLastState = new AtomicLong(0);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
index 2dac1fa..9b3a358 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
@@ -66,7 +66,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,String> copy = new TreeMap<String,String>();
+    Map<String,String> copy = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       copy.put(property.getKey(), property.getValue());
     }
@@ -86,7 +86,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       throw new NamespaceNotFoundException(null, namespace, null);
     int priority = -1;
     String classname = null;
-    Map<String,String> settings = new HashMap<String,String>();
+    Map<String,String> settings = new HashMap<>();
 
     String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), name);
     String opt = root + ".opt.";
@@ -112,7 +112,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
   public Map<String,EnumSet<IteratorScope>> listIterators(String namespace) throws AccumuloSecurityException, AccumuloException, NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,EnumSet<IteratorScope>> result = new TreeMap<String,EnumSet<IteratorScope>>();
+    Map<String,EnumSet<IteratorScope>> result = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       String name = property.getKey();
       String[] parts = name.split("\\.");
@@ -137,7 +137,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       String scopeStr = String.format("%s%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase());
       String nameStr = String.format("%s.%s", scopeStr, setting.getName());
       String optStr = String.format("%s.opt.", nameStr);
-      Map<String,String> optionConflicts = new TreeMap<String,String>();
+      Map<String,String> optionConflicts = new TreeMap<>();
       for (Entry<String,String> property : this.getProperties(namespace)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
@@ -165,8 +165,8 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public int addConstraint(String namespace, String constraintClassName) throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException {
-    TreeSet<Integer> constraintNumbers = new TreeSet<Integer>();
-    TreeMap<String,Integer> constraintClasses = new TreeMap<String,Integer>();
+    TreeSet<Integer> constraintNumbers = new TreeSet<>();
+    TreeMap<String,Integer> constraintClasses = new TreeMap<>();
     int i;
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
@@ -196,7 +196,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public Map<String,Integer> listConstraints(String namespace) throws AccumuloException, NamespaceNotFoundException, AccumuloSecurityException {
-    Map<String,Integer> constraints = new TreeMap<String,Integer>();
+    Map<String,Integer> constraints = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
         if (constraints.containsKey(property.getValue()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index ae5fc81..0716122 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -76,7 +76,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       timer = new OpTimer().start();
     }
 
-    TreeSet<String> namespaces = new TreeSet<String>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
+    TreeSet<String> namespaces = new TreeSet<>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
 
     if (timer != null) {
       timer.stop();
@@ -137,7 +137,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
     }
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts, namespace);
@@ -153,7 +153,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       NamespaceExistsException {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)), ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts, oldNamespaceName);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 433b020..39d5822 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -93,7 +93,7 @@ public class Namespaces {
 
     List<String> namespaceIds = zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES);
 
-    TreeMap<String,String> namespaceMap = new TreeMap<String,String>();
+    TreeMap<String,String> namespaceMap = new TreeMap<>();
 
     for (String id : namespaceIds) {
       byte[] path = zc.get(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES + "/" + id + Constants.ZNAMESPACE_NAME);
@@ -137,7 +137,7 @@ public class Namespaces {
 
   public static List<String> getTableIds(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (Entry<String,String> nameToId : Tables.getNameToIdMap(instance).entrySet())
       if (namespace.equals(Tables.qualify(nameToId.getKey()).getFirst()))
         names.add(nameToId.getValue());
@@ -146,7 +146,7 @@ public class Namespaces {
 
   public static List<String> getTableNames(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (String name : Tables.getNameToIdMap(instance).keySet())
       if (namespace.equals(Tables.qualify(name).getFirst()))
         names.add(name);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
index 54fe4ff..9f51704 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.client.sample.SamplerConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.PartialKey;
@@ -105,7 +104,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       return false;
     }
 
-    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
 
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
@@ -120,7 +119,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
       if (topLevelIterators.isEmpty())
         return iter;
-      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
       allIters.add(iter);
       return new MultiIterator(allIters, false);
     }
@@ -165,7 +164,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
 
     this.tableId = table.toString();
     this.authorizations = authorizations;
-    this.readers = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.readers = new ArrayList<>();
 
     try {
       conn = instance.getConnector(credentials.getPrincipal(), credentials.getToken());
@@ -233,7 +232,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       nextRange = new Range(currentExtent.getMetadataEntry(), false, null, false);
     }
 
-    List<String> relFiles = new ArrayList<String>();
+    List<String> relFiles = new ArrayList<>();
 
     Pair<KeyExtent,String> eloc = getTabletFiles(nextRange, relFiles);
 
@@ -264,7 +263,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     @SuppressWarnings("deprecation")
     String tablesDir = config.get(Property.INSTANCE_DFS_DIR) + Constants.HDFS_TABLES_DIR;
 
-    List<String> absFiles = new ArrayList<String>();
+    List<String> absFiles = new ArrayList<>();
     for (String relPath : relFiles) {
       if (relPath.contains(":")) {
         absFiles.add(relPath);
@@ -313,7 +312,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       }
 
     }
-    return new Pair<KeyExtent,String>(extent, location);
+    return new Pair<>(extent, location);
   }
 
   private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
@@ -359,7 +358,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     ColumnVisibility cv = new ColumnVisibility(acuTableConf.get(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY));
     defaultSecurityLabel = cv.getExpression();
 
-    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<Column>(options.fetchedColumns), authorizations,
+    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<>(options.fetchedColumns), authorizations,
         defaultSecurityLabel);
 
     return iterEnv.getTopLevelIterator(IteratorUtil.loadIterators(IteratorScope.scan, visFilter, extent, acuTableConf, options.serverSideIteratorList,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
index 4df2e08..9fdbb25 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
@@ -61,7 +61,7 @@ public class RootTabletLocator extends TabletLocator {
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     TabletLocation rootTabletLocation = getRootTabletLocation(context);
     if (rootTabletLocation != null) {
-      TabletServerMutations<T> tsm = new TabletServerMutations<T>(rootTabletLocation.tablet_session);
+      TabletServerMutations<T> tsm = new TabletServerMutations<>(rootTabletLocation.tablet_session);
       for (T mutation : mutations) {
         tsm.addMutation(RootTable.EXTENT, mutation);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
index 18b90e0..ae55cc0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
@@ -111,7 +111,7 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
 
     this.options = new ScannerOptions(options);
 
-    synchQ = new ArrayBlockingQueue<Object>(1);
+    synchQ = new ArrayBlockingQueue<>(1);
 
     if (this.options.fetchedColumns.size() > 0) {
       range = range.bound(this.options.fetchedColumns.first(), this.options.fetchedColumns.last());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
index c3a1a63..a986d87 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
@@ -47,7 +47,7 @@ public class ScannerOptions implements ScannerBase {
   protected List<IterInfo> serverSideIteratorList = Collections.emptyList();
   protected Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
 
-  protected SortedSet<Column> fetchedColumns = new TreeSet<Column>();
+  protected SortedSet<Column> fetchedColumns = new TreeSet<>();
 
   protected long timeOut = Long.MAX_VALUE;
 
@@ -69,7 +69,7 @@ public class ScannerOptions implements ScannerBase {
   public synchronized void addScanIterator(IteratorSetting si) {
     checkArgument(si != null, "si is null");
     if (serverSideIteratorList.size() == 0)
-      serverSideIteratorList = new ArrayList<IterInfo>();
+      serverSideIteratorList = new ArrayList<>();
 
     for (IterInfo ii : serverSideIteratorList) {
       if (ii.iterName.equals(si.getName()))
@@ -81,12 +81,12 @@ public class ScannerOptions implements ScannerBase {
     serverSideIteratorList.add(new IterInfo(si.getPriority(), si.getIteratorClass(), si.getName()));
 
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(si.getName());
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(si.getName(), opts);
     }
     opts.putAll(si.getOptions());
@@ -115,12 +115,12 @@ public class ScannerOptions implements ScannerBase {
     checkArgument(key != null, "key is null");
     checkArgument(value != null, "value is null");
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(iteratorName);
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(iteratorName, opts);
     }
     opts.put(key, value);
@@ -167,14 +167,14 @@ public class ScannerOptions implements ScannerBase {
     synchronized (dst) {
       synchronized (src) {
         dst.regexIterName = src.regexIterName;
-        dst.fetchedColumns = new TreeSet<Column>(src.fetchedColumns);
-        dst.serverSideIteratorList = new ArrayList<IterInfo>(src.serverSideIteratorList);
+        dst.fetchedColumns = new TreeSet<>(src.fetchedColumns);
+        dst.serverSideIteratorList = new ArrayList<>(src.serverSideIteratorList);
         dst.classLoaderContext = src.classLoaderContext;
 
-        dst.serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+        dst.serverSideIteratorOptions = new HashMap<>();
         Set<Entry<String,Map<String,String>>> es = src.serverSideIteratorOptions.entrySet();
         for (Entry<String,Map<String,String>> entry : es)
-          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<String,String>(entry.getValue()));
+          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<>(entry.getValue()));
 
         dst.samplerConfig = src.samplerConfig;
         dst.batchTimeOut = src.batchTimeOut;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index 680d23a..501b4df 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
@@ -123,7 +123,7 @@ public class ServerClient {
       throws TTransportException {
     checkArgument(context != null, "context is null");
     // create list of servers
-    ArrayList<ThriftTransportKey> servers = new ArrayList<ThriftTransportKey>();
+    ArrayList<ThriftTransportKey> servers = new ArrayList<>();
 
     // add tservers
     Instance instance = context.getInstance();
@@ -144,7 +144,7 @@ public class ServerClient {
       ClientService.Client client = ThriftUtil.createClient(new ClientService.Client.Factory(), pair.getSecond());
       opened = true;
       warnedAboutTServersBeingDown = false;
-      return new Pair<String,ClientService.Client>(pair.getFirst(), client);
+      return new Pair<>(pair.getFirst(), client);
     } finally {
       if (!opened) {
         if (!warnedAboutTServersBeingDown) {


Mime
View raw message