accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch '1.6'
Date Sat, 01 Nov 2014 04:57:44 GMT
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: cfbdef1345388767e81a05a154dac22040ad5283
Parents: 64d1bbe 9b20a9d
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Sat Nov 1 00:54:59 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Sat Nov 1 00:54:59 2014 -0400

----------------------------------------------------------------------
 assemble/bin/bootstrap_config.sh                |  2 +-
 .../org/apache/accumulo/core/Constants.java     |  5 ++-
 .../apache/accumulo/core/cli/ClientOpts.java    |  7 ++--
 .../accumulo/core/client/BatchWriterConfig.java | 11 ++---
 .../accumulo/core/client/ZooKeeperInstance.java | 14 +++----
 .../client/impl/InstanceOperationsImpl.java     |  4 +-
 .../accumulo/core/client/impl/Namespaces.java   |  7 ++--
 .../core/client/impl/ReplicationClient.java     |  4 +-
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../core/client/impl/TableOperationsImpl.java   | 32 +++++++--------
 .../accumulo/core/client/impl/Tables.java       | 10 ++---
 .../accumulo/core/client/impl/Writer.java       |  5 +--
 .../core/client/lexicoder/StringLexicoder.java  |  6 +--
 .../client/security/tokens/PasswordToken.java   |  5 ++-
 .../accumulo/core/conf/ConfigurationDocGen.java |  9 ++--
 .../accumulo/core/data/ArrayByteSequence.java   |  7 ++--
 .../org/apache/accumulo/core/data/Column.java   |  7 ++--
 .../apache/accumulo/core/data/Condition.java    |  8 ++--
 .../org/apache/accumulo/core/data/Value.java    |  4 +-
 .../accumulo/core/file/BloomFilterLayer.java    |  7 ++--
 .../core/iterators/ColumnFamilyCounter.java     |  5 ++-
 .../accumulo/core/iterators/LongCombiner.java   |  7 ++--
 .../accumulo/core/iterators/conf/ColumnSet.java |  7 ++--
 .../core/iterators/user/BigDecimalCombiner.java |  7 ++--
 .../core/iterators/user/GrepIterator.java       |  5 ++-
 .../iterators/user/IntersectingIterator.java    |  7 ++--
 .../core/iterators/user/LargeRowFilter.java     |  5 ++-
 .../core/iterators/user/RegExFilter.java        |  7 ++--
 .../iterators/user/RowDeletingIterator.java     |  5 ++-
 .../iterators/user/SummingArrayCombiner.java    |  7 ++--
 .../iterators/user/TransformingIterator.java    |  7 ++--
 .../core/iterators/user/VisibilityFilter.java   |  5 ++-
 .../core/replication/ReplicationSchema.java     |  6 +--
 .../core/replication/ReplicationTarget.java     |  6 +--
 .../accumulo/core/security/Authorizations.java  | 12 +++---
 .../core/security/ColumnVisibility.java         | 43 ++++++++++----------
 .../accumulo/core/security/Credentials.java     | 12 +++---
 .../core/security/VisibilityConstraint.java     |  5 ++-
 .../core/security/VisibilityParseException.java |  5 ++-
 .../accumulo/core/trace/ZooTraceClient.java     |  5 ++-
 .../apache/accumulo/core/util/ByteArraySet.java |  5 ++-
 .../accumulo/core/util/ByteBufferUtil.java      |  5 ++-
 .../apache/accumulo/core/util/CreateToken.java  |  6 +--
 .../org/apache/accumulo/core/util/Encoding.java |  4 +-
 .../apache/accumulo/core/util/FastFormat.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  5 ++-
 .../apache/accumulo/core/util/MonitorUtil.java  |  4 +-
 .../org/apache/accumulo/core/util/TextUtil.java |  6 +--
 .../core/client/BatchWriterConfigTest.java      |  8 ++--
 .../core/client/ZooKeeperInstanceTest.java      | 10 ++---
 .../core/client/mock/MockNamespacesTest.java    |  4 +-
 .../tokens/CredentialProviderTokenTest.java     |  8 ++--
 .../security/tokens/PasswordTokenTest.java      |  6 +--
 .../accumulo/core/data/ConditionTest.java       | 13 +++---
 .../core/data/ConditionalMutationTest.java      | 10 ++---
 .../apache/accumulo/core/data/ValueTest.java    |  5 ++-
 .../core/iterators/user/RegExFilterTest.java    |  7 ++--
 .../core/security/ColumnVisibilityTest.java     |  6 +--
 .../accumulo/core/security/CredentialsTest.java |  7 ++--
 .../core/security/VisibilityConstraintTest.java |  4 +-
 .../security/crypto/BlockedIOStreamTest.java    | 10 ++---
 .../ShardedTableDistributionFormatterTest.java  |  8 ++--
 .../org/apache/accumulo/fate/AdminUtil.java     |  8 ++--
 .../java/org/apache/accumulo/fate/ZooStore.java | 16 ++++----
 .../zookeeper/DistributedReadWriteLock.java     | 18 ++++----
 .../accumulo/fate/zookeeper/ZooCache.java       |  8 ++--
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  6 +--
 .../accumulo/fate/zookeeper/ZooReservation.java |  9 ++--
 .../accumulo/fate/zookeeper/ZooSession.java     |  6 +--
 .../core/client/mapreduce/RangeInputSplit.java  |  7 ++--
 .../mapreduce/lib/impl/ConfiguratorBase.java    |  5 +--
 .../mapreduce/lib/impl/InputConfigurator.java   | 16 ++++----
 .../mapreduce/lib/impl/OutputConfigurator.java  |  8 ++--
 .../lib/partition/RangePartitioner.java         |  7 ++--
 .../impl/MiniAccumuloClusterImpl.java           |  5 ++-
 .../org/apache/accumulo/proxy/ProxyServer.java  |  7 ++--
 .../apache/accumulo/proxy/TestProxyClient.java  | 15 +++----
 .../java/org/apache/accumulo/proxy/Util.java    |  5 ++-
 .../org/apache/accumulo/server/Accumulo.java    |  5 ++-
 .../accumulo/server/client/HdfsZooInstance.java | 11 ++---
 .../server/conf/ZooCachePropertyAccessor.java   |  5 ++-
 .../accumulo/server/conf/ZooConfiguration.java  |  5 ++-
 .../server/constraints/MetadataConstraints.java | 15 +++----
 .../apache/accumulo/server/init/Initialize.java | 16 ++++----
 .../accumulo/server/master/LiveTServerSet.java  |  4 +-
 .../server/master/state/DeadServerList.java     |  7 ++--
 .../server/master/state/TServerInstance.java    |  8 ++--
 .../master/state/TabletStateChangeIterator.java |  5 ++-
 .../accumulo/server/master/state/ZooStore.java  |  5 ++-
 .../master/state/ZooTabletStateStore.java       | 11 ++---
 .../server/metrics/AbstractMetricsImpl.java     |  5 ++-
 .../accumulo/server/monitor/LogService.java     |  5 ++-
 .../server/replication/ReplicationUtil.java     |  5 ++-
 .../server/security/SecurityOperation.java      |  5 ++-
 .../server/security/SystemCredentials.java      | 11 ++---
 .../security/handler/ZKAuthenticator.java       |  5 ++-
 .../server/security/handler/ZKAuthorizor.java   |  5 ++-
 .../server/security/handler/ZKPermHandler.java  |  5 ++-
 .../accumulo/server/tables/TableManager.java    | 19 +++++----
 .../server/tablets/UniqueNameAllocator.java     | 11 ++---
 .../server/util/AddFilesWithMissingEntries.java |  5 ++-
 .../accumulo/server/util/ChangeSecret.java      |  5 ++-
 .../accumulo/server/util/CleanZookeeper.java    |  8 ++--
 .../accumulo/server/util/DeleteZooInstance.java |  7 ++--
 .../accumulo/server/util/DumpZookeeper.java     |  6 +--
 .../accumulo/server/util/ListInstances.java     |  7 ++--
 .../server/util/MasterMetadataUtil.java         | 13 +++---
 .../accumulo/server/util/MetadataTableUtil.java | 33 +++++++--------
 .../accumulo/server/util/NamespacePropUtil.java |  4 +-
 .../accumulo/server/util/RandomizeVolumes.java  |  4 +-
 .../accumulo/server/util/RestoreZookeeper.java  |  7 ++--
 .../accumulo/server/util/SendLogToChainsaw.java |  9 ++--
 .../accumulo/server/util/SystemPropUtil.java    |  4 +-
 .../accumulo/server/util/TablePropUtil.java     |  4 +-
 .../accumulo/server/util/TabletServerLocks.java |  5 ++-
 .../server/watcher/MonitorLog4jWatcher.java     |  4 +-
 .../server/zookeeper/DistributedWorkQueue.java  |  7 ++--
 .../accumulo/server/zookeeper/ZooQueueLock.java |  9 ++--
 .../server/zookeeper/ZooReaderWriter.java       |  4 +-
 .../zookeeper/ZooReaderWriterFactory.java       |  4 +-
 .../server/conf/NamespaceConfigurationTest.java | 31 +++++++-------
 .../conf/ServerConfigurationFactoryTest.java    |  5 +--
 .../server/conf/TableConfigurationTest.java     | 10 ++---
 .../conf/ZooCachePropertyAccessorTest.java      |  4 +-
 .../java/org/apache/accumulo/master/Master.java | 15 +++----
 .../master/recovery/RecoveryManager.java        |  5 ++-
 .../MasterReplicationCoordinator.java           |  5 ++-
 .../accumulo/master/state/SetGoalState.java     |  4 +-
 .../accumulo/master/tableOps/BulkImport.java    |  9 ++--
 .../master/tableOps/CancelCompactions.java      | 10 ++---
 .../accumulo/master/tableOps/CompactRange.java  | 15 +++----
 .../accumulo/master/tableOps/ExportTable.java   |  9 ++--
 .../accumulo/master/tableOps/ImportTable.java   | 17 ++++----
 .../accumulo/master/tableOps/RenameTable.java   |  6 +--
 .../apache/accumulo/master/tableOps/Utils.java  | 15 +++----
 .../master/tserverOps/ShutdownTServer.java      |  4 +-
 .../org/apache/accumulo/monitor/Monitor.java    |  7 ++--
 .../accumulo/monitor/ZooKeeperStatus.java       |  7 ++--
 .../accumulo/monitor/servlets/BasicServlet.java | 11 ++---
 .../monitor/servlets/DefaultServlet.java        |  5 ++-
 .../accumulo/monitor/servlets/ShellServlet.java |  5 ++-
 .../accumulo/monitor/servlets/XMLServlet.java   |  7 ++--
 .../accumulo/monitor/servlets/trace/Basic.java  |  5 ++-
 .../org/apache/accumulo/tracer/TraceServer.java |  9 ++--
 .../tserver/BulkFailedCopyProcessor.java        |  6 +--
 .../apache/accumulo/tserver/TabletServer.java   | 12 +++---
 .../apache/accumulo/tserver/log/DfsLogger.java  | 16 ++++----
 .../accumulo/tserver/logger/LogFileValue.java   | 11 ++---
 .../accumulo/tserver/logger/LogReader.java      |  5 ++-
 .../replication/ReplicationProcessor.java       |  5 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  | 11 ++---
 .../replication/ReplicationProcessorTest.java   |  5 ++-
 .../java/org/apache/accumulo/shell/Shell.java   | 10 +++--
 .../org/apache/accumulo/shell/ShellUtil.java    |  7 ++--
 .../shell/commands/AuthenticateCommand.java     |  5 ++-
 .../shell/commands/ExecfileCommand.java         |  5 ++-
 .../accumulo/shell/commands/HiddenCommand.java  |  5 ++-
 .../accumulo/shell/commands/PasswdCommand.java  |  6 +--
 .../shell/commands/QuotedStringTokenizer.java   |  5 ++-
 .../accumulo/shell/commands/UserCommand.java    |  5 ++-
 .../apache/accumulo/shell/mock/MockShell.java   |  8 ++--
 .../apache/accumulo/shell/ShellUtilTest.java    |  4 +-
 .../shell/format/DeleterFormatterTest.java      | 12 +++---
 .../accumulo/test/BulkImportDirectory.java      |  5 ++-
 .../accumulo/test/NativeMapConcurrencyTest.java |  5 ++-
 .../accumulo/test/NativeMapPerformanceTest.java |  7 ++--
 .../accumulo/test/NativeMapStressTest.java      |  5 ++-
 .../apache/accumulo/test/TestBinaryRows.java    |  7 ++--
 .../org/apache/accumulo/test/TestIngest.java    |  7 ++--
 .../accumulo/test/TestMultiTableIngest.java     |  5 ++-
 .../test/continuous/ContinuousIngest.java       |  9 ++--
 .../test/continuous/ContinuousMoru.java         |  7 ++--
 .../test/continuous/ContinuousQuery.java        |  5 ++-
 .../test/continuous/ContinuousScanner.java      |  5 ++-
 .../test/continuous/ContinuousVerify.java       |  7 ++--
 .../test/continuous/ContinuousWalk.java         | 17 ++++----
 .../accumulo/test/continuous/Histogram.java     |  5 ++-
 .../test/continuous/PrintScanTimeHistogram.java |  5 ++-
 .../accumulo/test/continuous/TimeBinner.java    |  5 ++-
 .../test/continuous/UndefinedAnalyzer.java      |  9 ++--
 .../test/functional/CacheTestReader.java        |  7 ++--
 .../test/functional/CacheTestWriter.java        | 11 ++---
 .../accumulo/test/functional/ZombieTServer.java |  5 ++-
 .../metadata/MetadataBatchScanTest.java         |  7 ++--
 .../apache/accumulo/test/randomwalk/Module.java |  7 ++--
 .../test/randomwalk/bulk/BulkMinusOne.java      |  4 +-
 .../accumulo/test/randomwalk/bulk/Verify.java   |  5 ++-
 .../test/randomwalk/concurrent/BatchWrite.java  |  5 ++-
 .../test/randomwalk/concurrent/BulkImport.java  |  5 ++-
 .../concurrent/ChangeAuthorizations.java        |  7 ++--
 .../randomwalk/concurrent/StopTabletServer.java |  5 ++-
 .../accumulo/test/randomwalk/image/Verify.java  |  5 ++-
 .../accumulo/test/randomwalk/image/Write.java   |  9 ++--
 .../test/randomwalk/multitable/Write.java       |  5 ++-
 .../randomwalk/security/SecurityHelper.java     |  7 ++--
 .../test/randomwalk/security/TableOp.java       |  9 ++--
 .../test/randomwalk/sequential/Write.java       |  5 ++-
 .../test/randomwalk/shard/BulkInsert.java       |  5 ++-
 .../test/randomwalk/shard/ExportIndex.java      |  5 ++-
 .../accumulo/test/scalability/Ingest.java       |  5 ++-
 .../apache/accumulo/test/AuditMessageIT.java    |  6 +--
 .../apache/accumulo/test/LargeSplitRowIT.java   |  7 ++--
 .../org/apache/accumulo/test/NamespacesIT.java  |  8 ++--
 .../java/org/apache/accumulo/test/VolumeIT.java |  6 +--
 .../accumulo/test/functional/AddSplitIT.java    |  5 ++-
 .../test/functional/BadIteratorMincIT.java      |  6 +--
 .../test/functional/BatchScanSplitIT.java       |  7 ++--
 .../test/functional/BatchWriterFlushIT.java     |  5 ++-
 .../accumulo/test/functional/BulkFileIT.java    |  5 ++-
 .../accumulo/test/functional/ConcurrencyIT.java |  7 ++--
 .../accumulo/test/functional/ConstraintIT.java  | 23 ++++++-----
 .../test/functional/CreateAndUseIT.java         |  5 ++-
 .../test/functional/DeleteEverythingIT.java     |  4 +-
 .../test/functional/DeleteRowsSplitIT.java      |  6 +--
 .../accumulo/test/functional/LargeRowIT.java    |  7 ++--
 .../accumulo/test/functional/NativeMapIT.java   | 16 ++++----
 .../test/functional/ScanIteratorIT.java         |  7 ++--
 .../accumulo/test/functional/ScanRangeIT.java   |  5 ++-
 .../test/functional/ScanSessionTimeOutIT.java   |  5 ++-
 .../test/functional/SplitRecoveryIT.java        |  4 +-
 .../accumulo/test/functional/TabletIT.java      |  4 +-
 .../accumulo/test/functional/VisibilityIT.java  | 11 ++---
 .../replication/MultiTserverReplicationIT.java  |  7 ++--
 .../UnusedWalDoesntCloseReplicationStatus.java  |  6 +--
 .../instrument/receivers/ZooSpanClient.java     |  6 +--
 225 files changed, 928 insertions(+), 790 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/Constants.java
index e7162c2,9897262..0229d4e
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@@ -16,7 -16,9 +16,8 @@@
   */
  package org.apache.accumulo.core;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
 -import java.nio.charset.Charset;
  import java.util.Arrays;
  import java.util.Collection;
  import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index e582160,041c9e6..10a5e08
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.cli;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.util.LinkedHashMap;
  import java.util.Map;
  import java.util.Map.Entry;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 23ab39e,24ad86d..842a713
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@@ -16,6 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.client;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;
@@@ -203,12 -180,10 +204,12 @@@ public class BatchWriterConfig implemen
        addField(fields, "maxWriteThreads", maxWriteThreads);
      if (timeout != null)
        addField(fields, "timeout", timeout);
 +    if (durability != Durability.DEFAULT)
 +      addField(fields, "durability", durability);
      String output = StringUtils.join(",", fields);
  
-     byte[] bytes = output.getBytes(StandardCharsets.UTF_8);
-     byte[] len = String.format("%6s#", Integer.toString(bytes.length, 36)).getBytes(StandardCharsets.UTF_8);
+     byte[] bytes = output.getBytes(UTF_8);
+     byte[] len = String.format("%6s#", Integer.toString(bytes.length, 36)).getBytes(UTF_8);
      if (len.length != 7)
        throw new IllegalStateException("encoded length does not match expected value");
      out.write(len);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 3dba358,a9c3292..4e11a14
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -16,10 -16,9 +16,10 @@@
   */
  package org.apache.accumulo.core.client;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
  import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
  import java.util.Collections;
  import java.util.List;
  import java.util.UUID;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
index 1a9af63,6925f18..30c15ed
--- 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
@@@ -16,9 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.List;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 6be1a12,f32940c..3c2bc45
--- 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
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.security.SecurityPermission;
  import java.util.LinkedList;
  import java.util.List;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
index 937dc7c,0000000..901128b
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
@@@ -1,246 -1,0 +1,246 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.core.client.impl;
 +
 +import static com.google.common.base.Preconditions.checkNotNull;
++import static java.nio.charset.StandardCharsets.UTF_8;
 +
- import java.nio.charset.StandardCharsets;
 +import java.util.List;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.replication.thrift.ReplicationCoordinator;
 +import org.apache.accumulo.core.replication.thrift.ReplicationServicer;
 +import org.apache.accumulo.core.util.ThriftUtil;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.fate.zookeeper.ZooReader;
 +import org.apache.thrift.TServiceClient;
 +import org.apache.thrift.transport.TTransportException;
 +import org.apache.zookeeper.KeeperException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.net.HostAndPort;
 +
 +public class ReplicationClient {
 +  private static final Logger log = LoggerFactory.getLogger(ReplicationClient.class);
 +
 +  /**
 +   * @param instance
 +   *          Instance for the peer replicant
 +   * @return Client to the ReplicationCoordinator service
 +   */
 +  public static ReplicationCoordinator.Client getCoordinatorConnectionWithRetry(Instance instance) throws AccumuloException {
 +    checkNotNull(instance);
 +
 +    for (int attempts = 1; attempts <= 10; attempts++) {
 +
 +      ReplicationCoordinator.Client result = getCoordinatorConnection(instance);
 +      if (result != null)
 +        return result;
 +      log.debug("Could not get ReplicationCoordinator connection to {}, will retry", instance.getInstanceName());
 +      try {
 +        Thread.sleep(attempts * 250);
 +      } catch (InterruptedException e) {
 +        throw new AccumuloException(e);
 +      }
 +    }
 +
 +    throw new AccumuloException("Timed out trying to communicate with master from " + instance.getInstanceName());
 +  }
 +
 +  public static ReplicationCoordinator.Client getCoordinatorConnection(Instance instance) {
 +    List<String> locations = instance.getMasterLocations();
 +
 +    if (locations.size() == 0) {
 +      log.debug("No masters for replication to instance {}", instance.getInstanceName());
 +      return null;
 +    }
 +
 +    // This is the master thrift service, we just want the hostname, not the port
 +    String masterThriftService = locations.get(0);
 +    if (masterThriftService.endsWith(":0")) {
 +      log.warn("Master found for {} did not have real location {}", instance.getInstanceName(), masterThriftService);
 +      return null;
 +    }
 +
 +
 +    AccumuloConfiguration conf = ClientConfigurationHelper.getClientRpcConfiguration(instance);
 +
 +    String zkPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_REPLICATION_COORDINATOR_ADDR;
 +    String replCoordinatorAddr;
 +
 +    log.debug("Using ZooKeeper quorum at {} with path {} to find peer Master information", instance.getZooKeepers(), zkPath);
 +
 +    // Get the coordinator port for the master we're trying to connect to
 +    try {
 +      ZooReader reader = new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
-       replCoordinatorAddr = new String(reader.getData(zkPath, null), StandardCharsets.UTF_8);
++      replCoordinatorAddr = new String(reader.getData(zkPath, null), UTF_8);
 +    } catch (KeeperException | InterruptedException e) {
 +      log.error("Could not fetch remote coordinator port", e);
 +      return null;
 +    }
 +
 +    // Throw the hostname and port through HostAndPort to get some normalization
 +    HostAndPort coordinatorAddr = HostAndPort.fromString(replCoordinatorAddr);
 +
 +    log.debug("Connecting to master at {}", coordinatorAddr);
 +
 +    try {
 +      // Master requests can take a long time: don't ever time out
 +      ReplicationCoordinator.Client client = ThriftUtil.getClientNoTimeout(new ReplicationCoordinator.Client.Factory(), coordinatorAddr.toString(),
 +          conf);
 +      return client;
 +    } catch (TTransportException tte) {
 +      log.debug("Failed to connect to master coordinator service ({})", coordinatorAddr, tte);
 +      return null;
 +    }
 +  }
 +
 +  /**
 +   * Attempt a single time to create a ReplicationServicer client to the given host
 +   * 
 +   * @param inst
 +   *          Instance to the peer replicant
 +   * @param server
 +   *          Server to connect to
 +   * @return A ReplicationServicer client to the given host in the given instance
 +   */
 +  public static ReplicationServicer.Client getServicerConnection(Instance inst, String server) throws TTransportException {
 +    checkNotNull(inst);
 +    checkNotNull(server);
 +
 +    try {
 +      return ThriftUtil.getClientNoTimeout(new ReplicationServicer.Client.Factory(), server, ClientConfigurationHelper.getClientRpcConfiguration(inst));
 +    } catch (TTransportException tte) {
 +      log.debug("Failed to connect to servicer ({}), will retry...", server, tte);
 +      throw tte;
 +    }
 +  }
 +
 +  public static void close(ReplicationCoordinator.Iface iface) {
 +    TServiceClient client = (TServiceClient) iface;
 +    if (client != null && client.getInputProtocol() != null && client.getInputProtocol().getTransport() != null) {
 +      ThriftTransportPool.getInstance().returnTransport(client.getInputProtocol().getTransport());
 +    } else {
 +      log.debug("Attempt to close null connection to the remote system", new Exception());
 +    }
 +  }
 +
 +  public static void close(ReplicationServicer.Iface iface) {
 +    TServiceClient client = (TServiceClient) iface;
 +    if (client != null && client.getInputProtocol() != null && client.getInputProtocol().getTransport() != null) {
 +      ThriftTransportPool.getInstance().returnTransport(client.getInputProtocol().getTransport());
 +    } else {
 +      log.debug("Attempt to close null connection to the remote system", new Exception());
 +    }
 +  }
 +
 +  public static <T> T executeCoordinatorWithReturn(Instance instance, ClientExecReturn<T,ReplicationCoordinator.Client> exec) throws AccumuloException,
 +      AccumuloSecurityException {
 +    ReplicationCoordinator.Client client = null;
 +    for (int i = 0; i < 10; i++) {
 +      try {
 +        client = getCoordinatorConnectionWithRetry(instance);
 +        return exec.execute(client);
 +      } catch (TTransportException tte) {
 +        log.debug("ReplicationClient coordinator request failed, retrying ... ", tte);
 +        try {
 +          Thread.sleep(100);
 +        } catch (InterruptedException e) {
 +          throw new AccumuloException(e);
 +        }
 +      } catch (ThriftSecurityException e) {
 +        throw new AccumuloSecurityException(e.user, e.code, e);
 +      } catch (AccumuloException e) {
 +        throw e;
 +      } catch (Exception e) {
 +        throw new AccumuloException(e);
 +      } finally {
 +        if (client != null)
 +          close(client);
 +      }
 +    }
 +
 +    throw new AccumuloException("Could not connect to ReplicationCoordinator at " + instance.getInstanceName());
 +  }
 +
 +  public static void executeCoordinator(Instance instance, ClientExec<ReplicationCoordinator.Client> exec) throws AccumuloException, AccumuloSecurityException {
 +    ReplicationCoordinator.Client client = null;
 +    try {
 +      client = getCoordinatorConnectionWithRetry(instance);
 +      exec.execute(client);
 +    } catch (TTransportException tte) {
 +      log.debug("ReplicationClient coordinator request failed, retrying ... ", tte);
 +      UtilWaitThread.sleep(100);
 +    } catch (ThriftSecurityException e) {
 +      throw new AccumuloSecurityException(e.user, e.code, e);
 +    } catch (AccumuloException e) {
 +      throw e;
 +    } catch (Exception e) {
 +      throw new AccumuloException(e);
 +    } finally {
 +      if (client != null)
 +        close(client);
 +    }
 +  }
 +
 +  public static <T> T executeServicerWithReturn(Instance instance, String tserver, ClientExecReturn<T,ReplicationServicer.Client> exec)
 +      throws AccumuloException, AccumuloSecurityException, TTransportException {
 +    ReplicationServicer.Client client = null;
 +    while (true) {
 +      try {
 +        client = getServicerConnection(instance, tserver);
 +        return exec.execute(client);
 +      } catch (ThriftSecurityException e) {
 +        throw new AccumuloSecurityException(e.user, e.code, e);
 +      } catch (AccumuloException e) {
 +        throw e;
 +      } catch (Exception e) {
 +        throw new AccumuloException(e);
 +      } finally {
 +        if (client != null)
 +          close(client);
 +      }
 +    }
 +  }
 +
 +  public static void executeServicer(Instance instance, String tserver, ClientExec<ReplicationServicer.Client> exec) throws AccumuloException,
 +      AccumuloSecurityException, TTransportException {
 +    ReplicationServicer.Client client = null;
 +    try {
 +      client = getServicerConnection(instance, tserver);
 +      exec.execute(client);
 +      return;
 +    } catch (ThriftSecurityException e) {
 +      throw new AccumuloSecurityException(e.user, e.code, e);
 +    } catch (AccumuloException e) {
 +      throw e;
 +    } catch (Exception e) {
 +      throw new AccumuloException(e);
 +    } finally {
 +      if (client != null)
 +        close(client);
 +    }
 +  }
 +
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index fcbb104,70bdbb0..2d76695
--- 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
@@@ -16,9 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  
  import org.apache.accumulo.core.Constants;
@@@ -130,9 -130,10 +130,9 @@@ public class ServerClient 
      for (String tserver : zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZTSERVERS)) {
        String path = ZooUtil.getRoot(instance) + Constants.ZTSERVERS + "/" + tserver;
        byte[] data = ZooUtil.getLockData(zc, path);
-       if (data != null && !new String(data, StandardCharsets.UTF_8).equals("master"))
+       if (data != null && !new String(data, UTF_8).equals("master"))
 -        servers.add(new ThriftTransportKey(
 -          new ServerServices(new String(data)).getAddressString(Service.TSERV_CLIENT),
 -          rpcTimeout, SslConnectionParams.forClient(ServerConfigurationUtil.getConfiguration(instance))));
 +        servers.add(new ThriftTransportKey(new ServerServices(new String(data)).getAddressString(Service.TSERV_CLIENT), rpcTimeout, SslConnectionParams
 +            .forClient(ClientConfigurationHelper.getClientRpcConfiguration(instance))));
      }
      
      boolean opened = false;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 4e3d9c6,547ccc7..06b9e15
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -16,7 -16,7 +16,8 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
  import java.io.BufferedReader;
  import java.io.IOException;
@@@ -212,10 -208,9 +212,10 @@@ public class TableOperationsImpl extend
     */
    @Override
    public void create(String tableName, boolean limitVersion, TimeType timeType) throws AccumuloException, AccumuloSecurityException, TableExistsException {
 -    ArgumentChecker.notNull(tableName, timeType);
 +    checkArgument(tableName != null, "tableName is null");
 +    checkArgument(timeType != null, "timeType is null");
  
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(timeType.name().getBytes(StandardCharsets.UTF_8)));
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), ByteBuffer.wrap(timeType.name().getBytes(UTF_8)));
  
      Map<String,String> opts;
      if (limitVersion)
@@@ -537,9 -532,9 +537,9 @@@
    @Override
    public void merge(String tableName, Text start, Text end) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
  
 -    ArgumentChecker.notNull(tableName);
 +    checkArgument(tableName != null, "tableName is null");
      ByteBuffer EMPTY = ByteBuffer.allocate(0);
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
          end == null ? EMPTY : TextUtil.getByteBuffer(end));
      Map<String,String> opts = new HashMap<String,String>();
      try {
@@@ -553,9 -548,9 +553,9 @@@
    @Override
    public void deleteRows(String tableName, Text start, Text end) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
  
 -    ArgumentChecker.notNull(tableName);
 +    checkArgument(tableName != null, "tableName is null");
      ByteBuffer EMPTY = ByteBuffer.allocate(0);
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
          end == null ? EMPTY : TextUtil.getByteBuffer(end));
      Map<String,String> opts = new HashMap<String,String>();
      try {
@@@ -677,9 -672,9 +677,9 @@@
     */
    @Override
    public void delete(String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
 -    ArgumentChecker.notNull(tableName);
 +    checkArgument(tableName != null, "tableName is null");
  
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)));
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)));
      Map<String,String> opts = new HashMap<String,String>();
  
      try {
@@@ -1336,9 -1324,9 +1336,9 @@@
    @Override
    public void offline(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
  
 -    ArgumentChecker.notNull(tableName);
 +    checkArgument(tableName != null, "tableName is null");
      String tableId = Tables.getTableId(instance, tableName);
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)));
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
      Map<String,String> opts = new HashMap<String,String>();
  
      try {
@@@ -1368,9 -1356,9 +1368,9 @@@
     */
    @Override
    public void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
 -    ArgumentChecker.notNull(tableName);
 +    checkArgument(tableName != null, "tableName is null");
      String tableId = Tables.getTableId(instance, tableName);
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)));
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
      Map<String,String> opts = new HashMap<String,String>();
  
      try {
@@@ -1535,10 -1521,9 +1535,10 @@@
  
    @Override
    public void exportTable(String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
 -    ArgumentChecker.notNull(tableName, exportDir);
 +    checkArgument(tableName != null, "tableName is null");
 +    checkArgument(exportDir != null, "exportDir is null");
  
-     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(exportDir.getBytes(StandardCharsets.UTF_8)));
+     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), ByteBuffer.wrap(exportDir.getBytes(UTF_8)));
  
      Map<String,String> opts = Collections.emptyMap();
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 0b522ca,4de95c3..c2b8001
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@@ -16,9 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.nio.charset.StandardCharsets;
  import java.security.SecurityPermission;
  import java.util.HashMap;
  import java.util.List;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index e76e2d9,de7bcb2..a38822b
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@@ -16,9 -16,7 +16,8 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
- 
- import java.nio.charset.StandardCharsets;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
  import org.apache.accumulo.core.client.AccumuloException;
  import org.apache.accumulo.core.client.AccumuloSecurityException;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index b5694f2,bf365ef..165248b
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@@ -16,7 -16,7 +16,7 @@@
   */
  package org.apache.accumulo.core.client.lexicoder;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
  /**
   * This lexicoder encodes/decodes a given String to/from bytes without further processing. It can be combined with other encoders like the

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 39cf8a0,4d73979..53a0bcf
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@@ -16,6 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.client.security.tokens;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 51fef69,618ff7e..60d1996
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@@ -16,6 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.conf;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.FileNotFoundException;
  import java.io.IOException;
  import java.io.InputStream;
@@@ -324,9 -311,9 +325,9 @@@ class ConfigurationDocGen 
        int n;
        try {
          while ((n = data.read(buffer)) > 0)
-           doc.print(new String(buffer, 0, n, StandardCharsets.UTF_8));
+           doc.print(new String(buffer, 0, n, UTF_8));
        } catch (IOException e) {
 -        e.printStackTrace();
 +        log.debug("Encountered IOException while reading InputStream in appendResource().", e);
          return;
        } finally {
          try {
@@@ -363,11 -346,11 +364,11 @@@
     */
    public static void main(String[] args) throws FileNotFoundException, UnsupportedEncodingException {
      if (args.length == 2 && args[0].equals("--generate-html")) {
-       new ConfigurationDocGen(new PrintStream(args[1], StandardCharsets.UTF_8.name())).generateHtml();
+       new ConfigurationDocGen(new PrintStream(args[1], UTF_8.name())).generateHtml();
 -    } else if (args.length == 2 && args[0].equals("--generate-latex")) {
 -      new ConfigurationDocGen(new PrintStream(args[1], UTF_8.name())).generateLaTeX();
 +    } else if (args.length == 2 && args[0].equals("--generate-asciidoc")) {
-       new ConfigurationDocGen(new PrintStream(args[1], StandardCharsets.UTF_8.name())).generateAsciidoc();
++      new ConfigurationDocGen(new PrintStream(args[1], UTF_8.name())).generateAsciidoc();
      } else {
 -      throw new IllegalArgumentException("Usage: " + ConfigurationDocGen.class.getName() + " --generate-html <filename> | --generate-latex <filename>");
 +      throw new IllegalArgumentException("Usage: " + ConfigurationDocGen.class.getName() + " --generate-html <filename> | --generate-asciidoc <filename>");
      }
    }
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 2467585,437590f..954fef3
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@@ -16,13 -16,11 +16,14 @@@
   */
  package org.apache.accumulo.core.data;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.Serializable;
  import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
  
 +/**
 + * An implementation of {@link ByteSequence} that uses a backing byte array.
 + */
  public class ArrayByteSequence extends ByteSequence implements Serializable {
    
    private static final long serialVersionUID = 1L;
@@@ -67,25 -47,10 +68,25 @@@
      
    }
    
 +  /**
 +   * Creates a new sequence from the given string. The bytes are determined from
 +   * the string using the default platform encoding.
 +   *
 +   * @param s string to represent as bytes
 +   */
    public ArrayByteSequence(String s) {
-     this(s.getBytes(StandardCharsets.UTF_8));
+     this(s.getBytes(UTF_8));
    }
    
 +  /**
 +   * Creates a new sequence based on a byte buffer. If the byte buffer has an
 +   * array, that array (and the buffer's offset and limit) are used; otherwise,
 +   * a new backing array is created and a relative bulk get is performed to
 +   * transfer the buffer's contents (starting at its current position and
 +   * not beyond its limit).
 +   *
 +   * @param buffer byte buffer
 +   */
    public ArrayByteSequence(ByteBuffer buffer) {
      this.length = buffer.remaining();
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/data/Column.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/Column.java
index 59bb5d0,a29e412..f259912
--- a/core/src/main/java/org/apache/accumulo/core/data/Column.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Column.java
@@@ -16,14 -16,14 +16,13 @@@
   */
  package org.apache.accumulo.core.data;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
  import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
  
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;
  import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
--
  import org.apache.accumulo.core.data.thrift.TColumn;
  import org.apache.hadoop.io.WritableComparable;
  import org.apache.hadoop.io.WritableComparator;
@@@ -204,23 -158,11 +203,23 @@@ public class Column implements Writable
      return columnVisibility;
    }
    
 +  /**
 +   * Gets a string representation of this column. The family, qualifier, and
 +   * visibility are interpreted as strings using the platform default encoding;
 +   * nulls are interpreted as empty strings.
 +   *
 +   * @return string form of column
 +   */
    public String toString() {
-     return new String(columnFamily == null ? new byte[0] : columnFamily, StandardCharsets.UTF_8) + ":" + new String(columnQualifier == null ? new byte[0] : columnQualifier, StandardCharsets.UTF_8) + ":"
-         + new String(columnVisibility == null ? new byte[0] : columnVisibility, StandardCharsets.UTF_8);
+     return new String(columnFamily == null ? new byte[0] : columnFamily, UTF_8) + ":" + new String(columnQualifier == null ? new byte[0] : columnQualifier, UTF_8) + ":"
+         + new String(columnVisibility == null ? new byte[0] : columnVisibility, UTF_8);
    }
    
 +  /**
 +   * Converts this column to Thrift.
 +   *
 +   * @return Thrift column
 +   */
    public TColumn toThrift() {
      return new TColumn(columnFamily == null ? null : ByteBuffer.wrap(columnFamily), columnQualifier == null ? null : ByteBuffer.wrap(columnQualifier),
          columnVisibility == null ? null : ByteBuffer.wrap(columnVisibility));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/data/Condition.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/Condition.java
index 71088c2,e6e31eb..e4b089d
--- a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
@@@ -16,9 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.core.data;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.nio.charset.StandardCharsets;
  import java.util.Arrays;
  import java.util.HashSet;
  
@@@ -42,20 -42,10 +42,20 @@@ public class Condition 
    private static final ByteSequence EMPTY = new ArrayByteSequence(new byte[0]);
    
  
 +  /**
 +   * Creates a new condition. The initial column value and timestamp are null,
 +   * and the initial column visibility is empty. Characters in the column family
 +   * and column qualifier are encoded as bytes in the condition using UTF-8.
 +   *
 +   * @param cf column family
 +   * @param cq column qualifier
 +   * @throws IllegalArgumentException if any argument is null
 +   */
    public Condition(CharSequence cf, CharSequence cq) {
 -    ArgumentChecker.notNull(cf, cq);
 +    checkArgument(cf != null, "cf is null");
 +    checkArgument(cq != null, "cq is null");
-     this.cf = new ArrayByteSequence(cf.toString().getBytes(StandardCharsets.UTF_8));
-     this.cq = new ArrayByteSequence(cq.toString().getBytes(StandardCharsets.UTF_8));
+     this.cf = new ArrayByteSequence(cf.toString().getBytes(UTF_8));
+     this.cq = new ArrayByteSequence(cq.toString().getBytes(UTF_8));
      this.cv = EMPTY;
    }
    
@@@ -146,17 -94,14 +146,17 @@@
    }
  
    /**
 -   * see {@link #setValue(byte[])}
 +   * This method sets the expected value of a column. In order for the condition to pass the column must exist and have this value. If a value is not set, then
 +   * the column must be absent for the condition to pass. The passed-in character sequence is encoded as UTF-8.
 +   * See {@link #setValue(byte[])}.
     * 
 -   * @return returns this
 +   * @param value value
 +   * @return this condition
 +   * @throws IllegalArgumentException if value is null
     */
 -
    public Condition setValue(CharSequence value) {
 -    ArgumentChecker.notNull(value);
 +    checkArgument(value != null, "value is null");
-     this.val = new ArrayByteSequence(value.toString().getBytes(StandardCharsets.UTF_8));
+     this.val = new ArrayByteSequence(value.toString().getBytes(UTF_8));
      return this;
    }
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/data/Value.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/Value.java
index 7679dd3,d256107..48eae02
--- a/core/src/main/java/org/apache/accumulo/core/data/Value.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Value.java
@@@ -17,15 -17,17 +17,15 @@@
   */
  package org.apache.accumulo.core.data;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
  import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
  
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;
  import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
  import java.util.List;
  
 -import com.google.common.base.Preconditions;
 -
  import org.apache.hadoop.io.BytesWritable;
  import org.apache.hadoop.io.WritableComparable;
  import org.apache.hadoop.io.WritableComparator;
@@@ -225,12 -202,12 +225,12 @@@ public class Value implements WritableC
      }
      return false;
    }
 -  
 +
    @Override
    public String toString() {
-     return new String(get(), StandardCharsets.UTF_8);
+     return new String(get(), UTF_8);
    }
 -  
 +
    /**
     * A Comparator optimized for Value.
     */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 1bc54f2,654689c..90506c3
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@@ -18,6 -18,8 +18,8 @@@
  
  package org.apache.accumulo.core.file;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.DataInputStream;
  import java.io.DataOutputStream;
  import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
index 4062c3a,f19a97c..b3607ef
--- a/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.Collection;
  import java.util.Map;
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 3c948c6,bc96e57..3c6c6d2
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@@ -16,6 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.iterators;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
index ad43736,cecd87e..01ed523
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.iterators.conf;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.util.Collection;
  import java.util.HashSet;
  import java.util.Set;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index ccf7d86,1f73e0d..a9cd774
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@@ -16,9 -16,10 +16,10 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
  import java.math.BigDecimal;
- import java.nio.charset.StandardCharsets;
  import java.util.Iterator;
  import java.util.Map;
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
index 2760914,1046480..e859363
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.Arrays;
  import java.util.Map;
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 37157ed,d541454..732a76c
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.Collection;
  import java.util.Collections;
  import java.util.Map;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
index 47b3c77,47f3cfd..4db379b
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
index 9aff04f,5b43838..8d56889
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
@@@ -16,9 -16,10 +16,10 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
  import java.io.UnsupportedEncodingException;
- import java.nio.charset.StandardCharsets;
  import java.util.Map;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
index ee2e1ae,3f317ea..3c24f0e
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.Collection;
  import java.util.HashSet;
  import java.util.Map;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index bcd085e,0b6c183..9bdc883
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@@ -16,6 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
index 17e3c30,bab900e..6b51ac5
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index 4a10511,91f9416..878aa8e
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.iterators.user;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.Map;
  
  import org.apache.accumulo.core.client.IteratorSetting;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
index 6330dca,0000000..491fda5
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
@@@ -1,298 -1,0 +1,298 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.core.replication;
 +
- import java.nio.charset.CharacterCodingException;
- import java.nio.charset.StandardCharsets;
++import static java.nio.charset.StandardCharsets.UTF_8;
 +
++import java.nio.charset.CharacterCodingException;
 +import org.apache.accumulo.core.client.ScannerBase;
 +import org.apache.accumulo.core.client.lexicoder.ULongLexicoder;
 +import org.apache.accumulo.core.data.ArrayByteSequence;
 +import org.apache.accumulo.core.data.ByteSequence;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.io.Text;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.base.Preconditions;
 +
 +/**
 + * 
 + */
 +public class ReplicationSchema {
 +  private static final Logger log = LoggerFactory.getLogger(ReplicationSchema.class);
 +
 +  /**
 +   * Portion of a file that must be replication to the given target: peer and some identifying location on that peer, e.g. remote table ID
 +   * <p>
 +   * <code>hdfs://localhost:8020/accumulo/wal/tserver+port/WAL work:serialized_ReplicationTarget [] -> Status Protobuf</code>
 +   */
 +  public static class WorkSection {
 +    public static final Text NAME = new Text("work");
 +    private static final ByteSequence BYTE_SEQ_NAME = new ArrayByteSequence("work");
 +
 +    public static void getFile(Key k, Text buff) {
 +      Preconditions.checkNotNull(k);
 +      Preconditions.checkNotNull(buff);
 +      Preconditions.checkArgument(BYTE_SEQ_NAME.equals(k.getColumnFamilyData()), "Given replication work key with incorrect colfam");
 +      _getFile(k, buff);
 +    }
 +
 +    public static ReplicationTarget getTarget(Key k) {
 +      return getTarget(k, new Text());
 +    }
 +
 +    public static ReplicationTarget getTarget(Key k, Text buff) {
 +      Preconditions.checkArgument(BYTE_SEQ_NAME.equals(k.getColumnFamilyData()), "Given replication work key with incorrect colfam");
 +      k.getColumnQualifier(buff);
 +
 +      return ReplicationTarget.from(buff);
 +    }
 +
 +    /**
 +     * Limit the scanner to only pull replication work records
 +     */
 +    public static void limit(ScannerBase scanner) {
 +      scanner.fetchColumnFamily(NAME);
 +    }
 +
 +    public static Mutation add(Mutation m, Text serializedTarget, Value v) {
 +      m.put(NAME, serializedTarget, v);
 +      return m;
 +    }
 +  }
 +
 +  /**
 +   * Holds replication markers tracking status for files
 +   * <p>
 +   * <code>hdfs://localhost:8020/accumulo/wal/tserver+port/WAL repl:local_table_id [] -> Status Protobuf</code>
 +   */
 +  public static class StatusSection {
 +    public static final Text NAME = new Text("repl");
 +    private static final ByteSequence BYTE_SEQ_NAME = new ArrayByteSequence("repl");
 +
 +    /**
 +     * Extract the table ID from the key (inefficiently if called repeatedly)
 +     * 
 +     * @param k
 +     *          Key to extract from
 +     * @return The table ID
 +     * @see #getTableId(Key,Text)
 +     */
 +    public static String getTableId(Key k) {
 +      Text buff = new Text();
 +      getTableId(k, buff);
 +      return buff.toString();
 +    }
 +
 +    /**
 +     * Extract the table ID from the key into the given {@link Text}
 +     * 
 +     * @param k
 +     *          Key to extract from
 +     * @param buff
 +     *          Text to place table ID into
 +     */
 +    public static void getTableId(Key k, Text buff) {
 +      Preconditions.checkNotNull(k);
 +      Preconditions.checkNotNull(buff);
 +
 +      k.getColumnQualifier(buff);
 +    }
 +
 +    /**
 +     * Extract the file name from the row suffix into the given {@link Text}
 +     * 
 +     * @param k
 +     *          Key to extract from
 +     * @param buff
 +     *          Text to place file name into
 +     */
 +    public static void getFile(Key k, Text buff) {
 +      Preconditions.checkNotNull(k);
 +      Preconditions.checkNotNull(buff);
 +      Preconditions.checkArgument(BYTE_SEQ_NAME.equals(k.getColumnFamilyData()), "Given replication status key with incorrect colfam");
 +
 +      _getFile(k, buff);
 +    }
 +
 +    /**
 +     * Limit the scanner to only return Status records
 +     */
 +    public static void limit(ScannerBase scanner) {
 +      scanner.fetchColumnFamily(NAME);
 +    }
 +
 +    public static Mutation add(Mutation m, Text tableId, Value v) {
 +      m.put(NAME, tableId, v);
 +      return m;
 +    }
 +  }
 +
 +  /**
 +   * Holds the order in which files needed for replication were closed. The intent is to be able to guarantee that files which were closed earlier were
 +   * replicated first and we don't replay data in the wrong order on our peers
 +   * <p>
 +   * <code>encodedTimeOfClosure\x00hdfs://localhost:8020/accumulo/wal/tserver+port/WAL order:source_table_id [] -> Status Protobuf</code>
 +   */
 +  public static class OrderSection {
 +    public static final Text NAME = new Text("order");
 +    public static final Text ROW_SEPARATOR = new Text(new byte[]{0});
 +    private static final ULongLexicoder longEncoder = new ULongLexicoder();
 +
 +    /**
 +     * Extract the table ID from the given key (inefficiently if called repeatedly)
 +     * 
 +     * @param k
 +     *          OrderSection Key
 +     * @return source table id
 +     */
 +    public static String getTableId(Key k) {
 +      Text buff = new Text();
 +      getTableId(k, buff);
 +      return buff.toString();
 +    }
 +
 +    /**
 +     * Extract the table ID from the given key
 +     * 
 +     * @param k
 +     *          OrderSection key
 +     * @param buff
 +     *          Text to place table ID into
 +     */
 +    public static void getTableId(Key k, Text buff) {
 +      Preconditions.checkNotNull(k);
 +      Preconditions.checkNotNull(buff);
 +
 +      k.getColumnQualifier(buff);
 +    }
 +
 +    /**
 +     * Limit the scanner to only return Order records
 +     */
 +    public static void limit(ScannerBase scanner) {
 +      scanner.fetchColumnFamily(NAME);
 +    }
 +
 +    /**
 +     * Creates the Mutation for the Order section for the given file and time
 +     * 
 +     * @param file
 +     *          Filename
 +     * @param timeInMillis
 +     *          Time in millis that the file was closed
 +     * @return Mutation for the Order section
 +     */
 +    public static Mutation createMutation(String file, long timeInMillis) {
 +      Preconditions.checkNotNull(file);
 +      Preconditions.checkArgument(timeInMillis >= 0, "timeInMillis must be greater than zero");
 +
 +      // Encode the time so it sorts properly
 +      byte[] rowPrefix = longEncoder.encode(timeInMillis);
 +      Text row = new Text(rowPrefix);
 +
 +      // Normalize the file using Path
 +      Path p = new Path(file);
 +      String pathString = p.toUri().toString();
 +
 +      log.trace("Normalized {} into {}", file, pathString);
 +
 +      // Append the file as a suffix to the row
-       row.append((ROW_SEPARATOR + pathString).getBytes(StandardCharsets.UTF_8), 0, pathString.length() + ROW_SEPARATOR.getLength());
++      row.append((ROW_SEPARATOR + pathString).getBytes(UTF_8), 0, pathString.length() + ROW_SEPARATOR.getLength());
 +
 +      // Make the mutation and add the column update
 +      return new Mutation(row);
 +    }
 +
 +    /**
 +     * Add a column update to the given mutation with the provided tableId and value
 +     * 
 +     * @param m
 +     *          Mutation for OrderSection
 +     * @param tableId
 +     *          Source table id
 +     * @param v
 +     *          Serialized Status msg
 +     * @return The original Mutation
 +     */
 +    public static Mutation add(Mutation m, Text tableId, Value v) {
 +      m.put(NAME, tableId, v);
 +      return m;
 +    }
 +
 +    public static long getTimeClosed(Key k) {
 +      return getTimeClosed(k, new Text());
 +    }
 +
 +    public static long getTimeClosed(Key k, Text buff) {
 +      k.getRow(buff);
 +      int offset = 0;
 +      // find the last offset
 +      while (true) {
 +        int nextOffset = buff.find(ROW_SEPARATOR.toString(), offset + 1);
 +        if (-1 == nextOffset) {
 +          break;
 +        }
 +        offset = nextOffset;
 +      }
 +
 +      if (-1 == offset) {
 +        throw new IllegalArgumentException("Row does not contain expected separator for OrderSection");
 +      }
 +
 +      byte[] encodedLong = new byte[offset];
 +      System.arraycopy(buff.getBytes(), 0, encodedLong, 0, offset);
 +      return longEncoder.decode(encodedLong);
 +    }
 +
 +    public static String getFile(Key k) {
 +      Text buff = new Text();
 +      return getFile(k, buff);
 +    }
 +
 +    public static String getFile(Key k, Text buff) {
 +      k.getRow(buff);
 +      int offset = 0;
 +      // find the last offset
 +      while (true) {
 +        int nextOffset = buff.find(ROW_SEPARATOR.toString(), offset + 1);
 +        if (-1 == nextOffset) {
 +          break;
 +        }
 +        offset = nextOffset;
 +      }
 +
 +      if (-1 == offset) {
 +        throw new IllegalArgumentException("Row does not contain expected separator for OrderSection");
 +      }
 +
 +      try {
 +        return Text.decode(buff.getBytes(), offset + 1, buff.getLength() - (offset + 1));
 +      } catch (CharacterCodingException e) {
 +        throw new IllegalArgumentException("Could not decode file path", e);
 +      }
 +    }
 +  }
 +
 +  private static void _getFile(Key k, Text buff) {
 +    k.getRow(buff);
 +  }
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTarget.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/ReplicationTarget.java
index f882a8d,0000000..9c57ad9
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTarget.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationTarget.java
@@@ -1,188 -1,0 +1,188 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.core.replication;
 +
++import static java.nio.charset.StandardCharsets.UTF_8;
++
 +import java.io.DataInput;
 +import java.io.DataOutput;
 +import java.io.IOException;
- import java.nio.charset.StandardCharsets;
- 
 +import org.apache.hadoop.io.DataInputBuffer;
 +import org.apache.hadoop.io.DataOutputBuffer;
 +import org.apache.hadoop.io.Text;
 +import org.apache.hadoop.io.Writable;
 +import org.apache.hadoop.io.WritableUtils;
 +
 +/**
 + * Container for where some work needs to be replicated
 + */
 +public class ReplicationTarget implements Writable {
 +
 +  private String peerName;
 +  private String remoteIdentifier;
 +  private String sourceTableId;
 +
 +  public ReplicationTarget() { }
 +
 +  public ReplicationTarget(String peerName, String remoteIdentifier, String sourceTableId) {
 +    this.peerName = peerName;
 +    this.remoteIdentifier = remoteIdentifier;
 +    this.sourceTableId = sourceTableId;
 +  }
 +
 +  public String getPeerName() {
 +    return peerName;
 +  }
 +
 +  public void setPeerName(String peerName) {
 +    this.peerName = peerName;
 +  }
 +
 +  public String getRemoteIdentifier() {
 +    return remoteIdentifier;
 +  }
 +
 +  public void setRemoteIdentifier(String remoteIdentifier) {
 +    this.remoteIdentifier = remoteIdentifier;
 +  }
 +
 +  public String getSourceTableId() {
 +    return sourceTableId;
 +  }
 +
 +  public void setSourceTableId(String sourceTableId) {
 +    this.sourceTableId = sourceTableId;
 +  }
 +
 +  @Override
 +  public void write(DataOutput out) throws IOException {
 +    if (null == peerName) {
 +      out.writeBoolean(false);
 +    } else {
 +      out.writeBoolean(true);
 +      WritableUtils.writeString(out, peerName);
 +    }
 +
 +    if (null == remoteIdentifier) {
 +      out.writeBoolean(false);
 +    } else {
 +      out.writeBoolean(true);
 +      WritableUtils.writeString(out, remoteIdentifier);
 +    }
 +
 +    if (null == sourceTableId) {
 +      out.writeBoolean(false);
 +    } else {
 +      out.writeBoolean(true);
 +      WritableUtils.writeString(out, sourceTableId);
 +    }
 +  }
 +
 +  @Override
 +  public void readFields(DataInput in) throws IOException {
 +    if (in.readBoolean()) {
 +      this.peerName = WritableUtils.readString(in);
 +    }
 +    if (in.readBoolean()) {
 +      this.remoteIdentifier = WritableUtils.readString(in);
 +    }
 +    if (in.readBoolean()) {
 +      this.sourceTableId = WritableUtils.readString(in);
 +    }
 +  }
 +
 +  @Override
 +  public String toString() {
 +    StringBuilder sb = new StringBuilder(64);
 +    sb.append("Remote Name: ").append(peerName).append(" Remote identifier: ").append(remoteIdentifier).append(" Source Table ID: ").append(sourceTableId);
 +    return sb.toString();
 +  }
 +
 +  @Override
 +  public int hashCode() {
 +    return peerName.hashCode() ^ remoteIdentifier.hashCode() ^ sourceTableId.hashCode();
 +  }
 +
 +  @Override
 +  public boolean equals(Object o) {
 +    if (o instanceof ReplicationTarget) {
 +      ReplicationTarget other = (ReplicationTarget) o;
 +
 +      return peerName.equals(other.peerName) && remoteIdentifier.equals(other.remoteIdentifier) && sourceTableId.equals(other.sourceTableId);
 +    }
 +
 +    return false;
 +  }
 +
 +  /**
 +   * Deserialize a ReplicationTarget
 +   * @param t Serialized copy
 +   * @return the deserialized version
 +   */
 +  public static ReplicationTarget from(Text t) {
 +    ReplicationTarget target = new ReplicationTarget();
 +    DataInputBuffer buffer = new DataInputBuffer();
 +    buffer.reset(t.getBytes(), t.getLength());
 +
 +    try {
 +      target.readFields(buffer);
 +    } catch (IOException e) {
 +      throw new RuntimeException(e);
 +    }
 +
 +    return target;
 +  }
 +
 +  /**
 +   * Deserialize a ReplicationTarget
 +   * @param s Serialized copy
 +   * @return the deserialized version
 +   */
 +  public static ReplicationTarget from(String s) {
 +    ReplicationTarget target = new ReplicationTarget();
 +    DataInputBuffer buffer = new DataInputBuffer();
-     buffer.reset(s.getBytes(StandardCharsets.UTF_8), s.length());
++    buffer.reset(s.getBytes(UTF_8), s.length());
 +
 +    try {
 +      target.readFields(buffer);
 +    } catch (IOException e) {
 +      throw new RuntimeException(e);
 +    }
 +
 +    return target;
 +  }
 +
 +  /**
 +   * Convenience method to serialize a ReplicationTarget to {@link Text} using the {@link Writable} methods without caring about
 +   * performance penalties due to excessive object creation
 +   * @return The serialized representation of the object
 +   */
 +  public Text toText() {
 +    DataOutputBuffer buffer = new DataOutputBuffer();
 +
 +    try {
 +      this.write(buffer);
 +    } catch (IOException e) {
 +      throw new RuntimeException(e);
 +    }
 +
 +    Text t = new Text();
 +    // Throw it in a text for the mutation
 +    t.set(buffer.getData(), 0, buffer.getLength());
 +    return t;
 +  }
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 54ddcd9,7073d11..b6ce5b7
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@@ -16,7 -16,7 +16,8 @@@
   */
  package org.apache.accumulo.core.security;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static com.google.common.base.Preconditions.checkArgument;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
  import java.io.Serializable;
  import java.nio.ByteBuffer;
@@@ -145,9 -145,9 +145,9 @@@ public class Authorizations implements 
     */
    public Authorizations(byte[] authorizations) {
  
 -    ArgumentChecker.notNull(authorizations);
 +    checkArgument(authorizations != null, "authorizations is null");
  
-     String authsString = new String(authorizations, StandardCharsets.UTF_8);
+     String authsString = new String(authorizations, UTF_8);
      if (authsString.startsWith(HEADER)) {
        // it's the new format
        authsString = authsString.substring(HEADER.length());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 152e067,e8f4e97..3e930f5
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.security;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.Serializable;
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/Credentials.java
index 7981ccf,0ecc31d..525a958
--- a/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
@@@ -16,9 -16,10 +16,9 @@@
   */
  package org.apache.accumulo.core.security;
  
- import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
  
+ import java.nio.ByteBuffer;
 -
  import org.apache.accumulo.core.client.AccumuloSecurityException;
  import org.apache.accumulo.core.client.Connector;
  import org.apache.accumulo.core.client.Instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
index 1d29119,4f91dac..c4fe5ac
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.security;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.util.Collections;
  import java.util.HashSet;
  import java.util.List;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
index 1d54ae4,178de91..ca24884
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.security;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.text.ParseException;
  
  /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
index 4c8b837,4c2f5c9..9586eaa
--- a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.trace;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.IOException;
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Map;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
index fc3c114,b1047d9..4b7db82
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
@@@ -16,7 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.core.util;
  
- import java.nio.charset.StandardCharsets;
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
index 1a34628,8771832..dbf04dc
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
@@@ -16,8 -16,9 +16,9 @@@
   */
  package org.apache.accumulo.core.util;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
index b70eef0,26a8c73..cfac8fe
--- a/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
@@@ -16,12 -16,13 +16,12 @@@
   */
  package org.apache.accumulo.core.util;
  
 -import static com.google.common.base.Charsets.UTF_8;
++import static java.nio.charset.StandardCharsets.UTF_8;
+ 
  import java.io.File;
  import java.io.FileOutputStream;
  import java.io.IOException;
  import java.io.PrintStream;
- import java.nio.charset.StandardCharsets;
--
  import jline.console.ConsoleReader;
  
  import org.apache.accumulo.core.cli.ClientOpts.Password;


Mime
View raw message