accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [31/32] accumulo git commit: Merge branch '1.8'
Date Fri, 01 Jul 2016 01:59:28 GMT
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 72d8e745afe998735244a436a89d0549319af0dd
Parents: b69291a b102e76
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jun 30 21:47:24 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jun 30 21:47:24 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 |  2 +-
 .../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   | 22 +++---
 .../lib/partition/RangePartitioner.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        |  4 +-
 .../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      | 10 +--
 .../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/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 +-
 .../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 +--
 .../client/security/SecurityErrorCodeTest.java  |  4 +-
 .../core/conf/ConfigSanityCheckTest.java        |  2 +-
 .../conf/CredentialProviderFactoryShimTest.java |  8 +--
 .../apache/accumulo/core/conf/PropertyTest.java | 12 ++--
 .../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 +-
 .../core/file/BloomFilterLayerLookupTest.java   |  4 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  2 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 38 +++++-----
 .../core/file/rfile/RelativeKeyTest.java        |  6 +-
 .../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 +-
 .../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 +-
 .../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 |  2 +-
 .../server/conf/TableConfigurationTest.java     |  2 +-
 .../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 ++++----
 ...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 | 14 ++--
 .../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      | 10 +--
 .../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/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  | 70 +++++++++---------
 .../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/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 |  4 +-
 .../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 +-
 646 files changed, 2313 insertions(+), 2322 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 63691f4,1e89500..081054d
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@@ -154,8 -155,12 +154,8 @@@ public class RangeInputSplit extends In
      }
  
      if (in.readBoolean()) {
 -      mockInstance = in.readBoolean();
 -    }
 -
 -    if (in.readBoolean()) {
        int numColumns = in.readInt();
-       List<String> columns = new ArrayList<String>(numColumns);
+       List<String> columns = new ArrayList<>(numColumns);
        for (int i = 0; i < numColumns; i++) {
          columns.add(in.readUTF());
        }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index e07ba32,986e071..92ae7a4
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@@ -235,9 -238,9 +235,9 @@@ public class InputConfigurator extends 
    public static List<Range> getRanges(Class<?> implementingClass, Configuration conf) throws IOException {
  
      Collection<String> encodedRanges = conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.RANGES));
-     List<Range> ranges = new ArrayList<Range>();
+     List<Range> ranges = new ArrayList<>();
      for (String rangeString : encodedRanges) {
 -      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes(UTF_8)));
 +      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.getDecoder().decode(rangeString));
        Range range = new Range();
        range.readFields(new DataInputStream(bais));
        ranges.add(range);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index f2a6941,f833b11..bb8a683
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@@ -49,9 -52,17 +49,9 @@@ public class DistributedTrace 
    public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout";
    public static final String TRACER_ZK_PATH = "tracer.zookeeper.path";
  
-   private static final HashSet<SpanReceiver> receivers = new HashSet<SpanReceiver>();
+   private static final HashSet<SpanReceiver> receivers = new HashSet<>();
  
    /**
 -   * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead
 -   */
 -  @Deprecated
 -  public static void enable(Instance instance, ZooReader zoo, String application, String address) throws IOException, KeeperException, InterruptedException {
 -    enable(address, application);
 -  }
 -
 -  /**
     * Enable tracing by setting up SpanReceivers for the current process.
     */
    public static void enable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --cc core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index fbeb69b,bab52f6..d7988ff
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@@ -83,9 -85,10 +83,9 @@@ public class TabletLocatorImplTest 
      return objs;
    }
  
 -  @SuppressWarnings("unchecked")
    static Map<String,Map<KeyExtent,List<Range>>> createExpectedBinnings(Object... data) {
  
-     Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+     Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<>();
  
      for (int i = 0; i < data.length; i += 2) {
        String loc = (String) data[i];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index fbaa1d9,973bbd2..a807660
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@@ -88,9 -90,9 +88,9 @@@ public class TabletStateChangeIterator 
      if (migrations == null)
        return Collections.emptySet();
      try {
-       Set<KeyExtent> result = new HashSet<KeyExtent>();
+       Set<KeyExtent> result = new HashSet<>();
        DataInputBuffer buffer = new DataInputBuffer();
 -      byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8));
 +      byte[] data = Base64.getDecoder().decode(migrations);
        buffer.reset(data, data.length);
        while (buffer.available() > 0) {
          KeyExtent extent = new KeyExtent();
@@@ -134,9 -136,9 +134,9 @@@
      if (merges == null)
        return null;
      try {
-       Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
+       Map<String,MergeInfo> result = new HashMap<>();
        DataInputBuffer buffer = new DataInputBuffer();
 -      byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
 +      byte[] data = Base64.getDecoder().decode(merges);
        buffer.reset(data, data.length);
        while (buffer.available() > 0) {
          MergeInfo mergeInfo = new MergeInfo();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --cc server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index e9ebb45,071e9c0..40753ff
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@@ -115,11 -117,11 +115,11 @@@ public class NamespaceConfigurationTes
  
    @Test
    public void testGetProperties() {
 -    Predicate<String> all = Predicates.alwaysTrue();
 -    Map<String,String> props = new java.util.HashMap<>();
 +    Predicate<String> all = x -> true;
 +    Map<String,String> props = new java.util.HashMap<String,String>();
      parent.getProperties(props, all);
      replay(parent);
-     List<String> children = new java.util.ArrayList<String>();
+     List<String> children = new java.util.ArrayList<>();
      children.add("foo");
      children.add("ding");
      expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZNAMESPACES + "/" + NSID + Constants.ZNAMESPACE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --cc server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index 8366c3d,34d6905..c67dae9
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@@ -99,11 -101,11 +99,11 @@@ public class TableConfigurationTest 
  
    @Test
    public void testGetProperties() {
 -    Predicate<String> all = Predicates.alwaysTrue();
 -    Map<String,String> props = new java.util.HashMap<>();
 +    Predicate<String> all = x -> true;
 +    Map<String,String> props = new java.util.HashMap<String,String>();
      parent.getProperties(props, all);
      replay(parent);
-     List<String> children = new java.util.ArrayList<String>();
+     List<String> children = new java.util.ArrayList<>();
      children.add("foo");
      children.add("ding");
      expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZTABLES + "/" + TID + Constants.ZTABLE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
index 825153c,cb37505..a7ae6a7
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
@@@ -39,17 -41,20 +39,17 @@@ public class NamespacesCommand extends 
  
    @Override
    public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
-     Map<String,String> namespaces = new TreeMap<String,String>(shellState.getConnector().namespaceOperations().namespaceIdMap());
+     Map<String,String> namespaces = new TreeMap<>(shellState.getConnector().namespaceOperations().namespaceIdMap());
  
 -    Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), new Function<Entry<String,String>,String>() {
 -      @Override
 -      public String apply(Map.Entry<String,String> entry) {
 -        String name = entry.getKey();
 -        if (Namespaces.DEFAULT_NAMESPACE.equals(name))
 -          name = DEFAULT_NAMESPACE_DISPLAY_NAME;
 -        String id = entry.getValue();
 -        if (cl.hasOption(namespaceIdOption.getOpt()))
 -          return String.format(TablesCommand.NAME_AND_ID_FORMAT, name, id);
 -        else
 -          return name;
 -      }
 +    Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), entry -> {
 +      String name = entry.getKey();
 +      if (Namespaces.DEFAULT_NAMESPACE.equals(name))
 +        name = DEFAULT_NAMESPACE_DISPLAY_NAME;
 +      String id = entry.getValue();
 +      if (cl.hasOption(namespaceIdOption.getOpt()))
 +        return String.format(TablesCommand.NAME_AND_ID_FORMAT, name, id);
 +      else
 +        return name;
      });
  
      shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
index 59c03e0,fffdf21..6e89298
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
@@@ -64,9 -64,14 +64,9 @@@ public class SetIterCommand extends Com
  
      final int priority = Integer.parseInt(cl.getOptionValue(priorityOpt.getOpt()));
  
-     final Map<String,String> options = new HashMap<String,String>();
+     final Map<String,String> options = new HashMap<>();
      String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
 -    if (cl.hasOption(aggTypeOpt.getOpt())) {
 -      Shell.log.warn("aggregators are deprecated");
 -      @SuppressWarnings("deprecation")
 -      String deprecatedClassName = org.apache.accumulo.core.iterators.AggregatingIterator.class.getName();
 -      classname = deprecatedClassName;
 -    } else if (cl.hasOption(regexTypeOpt.getOpt())) {
 +    if (cl.hasOption(regexTypeOpt.getOpt())) {
        classname = RegExFilter.class.getName();
      } else if (cl.hasOption(ageoffTypeOpt.getOpt())) {
        classname = AgeOffFilter.class.getName();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
index 8bf96e7,397b450..0390c4e
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
@@@ -51,20 -54,28 +51,20 @@@ public class TablesCommand extends Comm
      Map<String,String> tables = shellState.getConnector().tableOperations().tableIdMap();
  
      // filter only specified namespace
 -    tables = Maps.filterKeys(tables, new Predicate<String>() {
 -      @Override
 -      public boolean apply(String tableName) {
 -        return namespace == null || Tables.qualify(tableName).getFirst().equals(namespace);
 -      }
 -    });
 +    tables = Maps.filterKeys(tables, tableName -> namespace == null || Tables.qualify(tableName).getFirst().equals(namespace));
  
      final boolean sortByTableId = cl.hasOption(sortByTableIdOption.getOpt());
-     tables = new TreeMap<String,String>((sortByTableId ? MapUtils.invertMap(tables) : tables));
+     tables = new TreeMap<>((sortByTableId ? MapUtils.invertMap(tables) : tables));
  
 -    Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), new Function<Entry<String,String>,String>() {
 -      @Override
 -      public String apply(Map.Entry<String,String> entry) {
 -        String tableName = String.valueOf(sortByTableId ? entry.getValue() : entry.getKey());
 -        String tableId = String.valueOf(sortByTableId ? entry.getKey() : entry.getValue());
 -        if (namespace != null)
 -          tableName = Tables.qualify(tableName).getSecond();
 -        if (cl.hasOption(tableIdOption.getOpt()))
 -          return String.format(NAME_AND_ID_FORMAT, tableName, tableId);
 -        else
 -          return tableName;
 -      }
 +    Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), entry -> {
 +      String tableName = String.valueOf(sortByTableId ? entry.getValue() : entry.getKey());
 +      String tableId = String.valueOf(sortByTableId ? entry.getKey() : entry.getValue());
 +      if (namespace != null)
 +        tableName = Tables.qualify(tableName).getSecond();
 +      if (cl.hasOption(tableIdOption.getOpt()))
 +        return String.format(NAME_AND_ID_FORMAT, tableName, tableId);
 +      else
 +        return tableName;
      });
  
      shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
----------------------------------------------------------------------


Mime
View raw message