accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [5/5] git commit: ACCUMULO-1545 Replace UTF8 constant with built-in one
Date Wed, 02 Apr 2014 22:54:32 GMT
ACCUMULO-1545 Replace UTF8 constant with built-in one


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

Branch: refs/heads/master
Commit: f8ca8d34d9f1848c843c7f1faecee3fedb99d177
Parents: 44f72a8
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Apr 2 18:45:43 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Apr 2 18:45:43 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index e0e88eb..7d602bb 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -16,12 +16,10 @@
  */
 package org.apache.accumulo.core;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.security.Authorizations;
 
 public class Constants {
-  public static final Charset UTF8 = Charset.forName("UTF-8");
+
   public static final String VERSION = FilteredConstants.VERSION;
 
   // Zookeeper locations
@@ -53,7 +51,7 @@ public class Constants {
   public static final String ZMONITOR_LOCK = ZMONITOR + "/lock";
   public static final String ZMONITOR_HTTP_ADDR = ZMONITOR + "/http_addr";
   public static final String ZMONITOR_LOG4J_ADDR = ZMONITOR + "/log4j_addr";
-  
+
   public static final String ZCONFIG = "/config";
 
   public static final String ZTSERVERS = "/tservers";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 35a9067..d209d3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.cli;
 
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -82,12 +83,12 @@ public class ClientOpts extends Help {
     public byte[] value;
     
     public Password(String dfault) {
-      value = dfault.getBytes(Constants.UTF8);
+      value = dfault.getBytes(StandardCharsets.UTF_8);
     }
     
     @Override
     public String toString() {
-      return new String(value, Constants.UTF8);
+      return new String(value, StandardCharsets.UTF_8);
     }
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 5b149fa..a3572e3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -19,11 +19,11 @@ package org.apache.accumulo.core.client;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.util.StringUtils;
 
@@ -180,8 +180,8 @@ public class BatchWriterConfig implements Writable {
       addField(fields, "timeout", timeout);
     String output = StringUtils.join(",", fields);
     
-    byte[] bytes = output.getBytes(Constants.UTF8);
-    byte[] len = String.format("%6s#", Integer.toString(bytes.length, 36)).getBytes(Constants.UTF8);
+    byte[] bytes = output.getBytes(StandardCharsets.UTF_8);
+    byte[] len = String.format("%6s#", Integer.toString(bytes.length, 36)).getBytes(StandardCharsets.UTF_8);
     if (len.length != 7)
       throw new IllegalStateException("encoded length does not match expected value");
     out.write(len);
@@ -198,13 +198,13 @@ public class BatchWriterConfig implements Writable {
   public void readFields(DataInput in) throws IOException {
     byte[] len = new byte[7];
     in.readFully(len);
-    String strLen = new String(len, Constants.UTF8);
+    String strLen = new String(len, StandardCharsets.UTF_8);
     if (!strLen.endsWith("#"))
       throw new IllegalStateException("length was not encoded correctly");
     byte[] bytes = new byte[Integer.parseInt(strLen.substring(strLen.lastIndexOf(' ') + 1, strLen.length() - 1), 36)];
     in.readFully(bytes);
     
-    String strFields = new String(bytes, Constants.UTF8);
+    String strFields = new String(bytes, StandardCharsets.UTF_8);
     String[] fields = StringUtils.split(strFields, '\\', ',');
     for (String field : fields) {
       String[] keyValue = StringUtils.split(field, '\\', '=');

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index bfcd3b5..e4bc876 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -17,7 +17,9 @@
 package org.apache.accumulo.core.client;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -160,7 +162,7 @@ public class ZooKeeperInstance implements Instance {
         throw new RuntimeException("Instance name " + instanceName
             + " does not exist in zookeeper.  Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.");
       }
-      instanceId = new String(iidb, Constants.UTF8);
+      instanceId = new String(iidb, StandardCharsets.UTF_8);
     }
 
     if (zooCache.get(Constants.ZROOT + "/" + instanceId) == null) {
@@ -178,13 +180,13 @@ public class ZooKeeperInstance implements Instance {
 
     OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up master location in zoocache.");
     byte[] loc = ZooUtil.getLockData(zooCache, masterLocPath);
-    opTimer.stop("Found master at " + (loc == null ? null : new String(loc, Constants.UTF8)) + " in %DURATION%");
+    opTimer.stop("Found master at " + (loc == null ? null : new String(loc, StandardCharsets.UTF_8)) + " in %DURATION%");
 
     if (loc == null) {
       return Collections.emptyList();
     }
 
-    return Collections.singletonList(new String(loc, Constants.UTF8));
+    return Collections.singletonList(new String(loc, StandardCharsets.UTF_8));
   }
 
   @Override
@@ -193,13 +195,13 @@ public class ZooKeeperInstance implements Instance {
 
     OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zookeeper.");
     byte[] loc = zooCache.get(zRootLocPath);
-    opTimer.stop("Found root tablet at " + (loc == null ? null : new String(loc, Constants.UTF8)) + " in %DURATION%");
+    opTimer.stop("Found root tablet at " + (loc == null ? null : new String(loc, StandardCharsets.UTF_8)) + " in %DURATION%");
 
     if (loc == null) {
       return null;
     }
 
-    return new String(loc, Constants.UTF8).split("\\|")[0];
+    return new String(loc, StandardCharsets.UTF_8).split("\\|")[0];
   }
 
   @Override
@@ -264,7 +266,7 @@ public class ZooKeeperInstance implements Instance {
     for (String name : zooCache.getChildren(Constants.ZROOT + Constants.ZINSTANCES)) {
       String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + name;
       byte[] bytes = zooCache.get(instanceNamePath);
-      UUID iid = UUID.fromString(new String(bytes, Constants.UTF8));
+      UUID iid = UUID.fromString(new String(bytes, StandardCharsets.UTF_8));
       if (iid.equals(instanceId)) {
         return name;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
index fafbc7a..df2bb55 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
@@ -17,6 +17,8 @@
 package org.apache.accumulo.core.client.admin;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -122,7 +124,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
         List<String> copy = new ArrayList<String>(children);
         Collections.sort(copy);
         byte[] data = cache.get(path + "/" + candidate + "/" + copy.get(0));
-        if (data != null && !"master".equals(new String(data, Constants.UTF8))) {
+        if (data != null && !"master".equals(new String(data, StandardCharsets.UTF_8))) {
           results.add(candidate);
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index 1ef1fa3..61811cc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@ -17,10 +17,12 @@
 package org.apache.accumulo.core.client.admin;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -215,7 +217,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     checkArgument(timeType != null, "timeType is null");
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), ByteBuffer.wrap(timeType.name().getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(timeType.name().getBytes(StandardCharsets.UTF_8)));
 
     Map<String,String> opts;
     if (limitVersion)
@@ -531,7 +533,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     checkArgument(tableName != null, "tableName is null");
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
     Map<String,String> opts = new HashMap<String,String>();
     try {
@@ -547,7 +549,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     checkArgument(tableName != null, "tableName is null");
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
     Map<String,String> opts = new HashMap<String,String>();
     try {
@@ -672,7 +674,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void delete(String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     checkArgument(tableName != null, "tableName is null");
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
 
     try {
@@ -702,7 +704,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     if (propertiesToSet == null)
       propertiesToSet = Collections.emptyMap();
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes(Constants.UTF8)), ByteBuffer.wrap(newTableName.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(newTableName.getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
     for (Entry<String,String> entry : propertiesToSet.entrySet()) {
       if (entry.getKey().startsWith(CLONE_EXCLUDE_PREFIX))
@@ -737,7 +739,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void rename(String oldTableName, String newTableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException,
       TableExistsException {
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(Constants.UTF8)), ByteBuffer.wrap(newTableName.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(newTableName.getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
     doTableFateOperation(oldTableName, TableNotFoundException.class, FateOperation.TABLE_RENAME, args, opts);
   }
@@ -791,7 +793,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     if (flush)
       _flush(tableId, start, end, true);
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end), ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
 
     Map<String,String> opts = new HashMap<String,String>();
@@ -812,7 +814,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void cancelCompaction(String tableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException {
     String tableId = Tables.getTableId(instance, tableName);
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)));
 
     Map<String,String> opts = new HashMap<String,String>();
     try {
@@ -1184,8 +1186,8 @@ public class TableOperationsImpl extends TableOperationsHelper {
     Path dirPath = checkPath(dir, "Bulk", "");
     Path failPath = checkPath(failureDir, "Bulk", "failure");
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), ByteBuffer.wrap(dirPath.toString().getBytes(Constants.UTF8)),
-        ByteBuffer.wrap(failPath.toString().getBytes(Constants.UTF8)), ByteBuffer.wrap((setTime + "").getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(dirPath.toString().getBytes(StandardCharsets.UTF_8)),
+        ByteBuffer.wrap(failPath.toString().getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap((setTime + "").getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
 
     try {
@@ -1333,7 +1335,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(instance, tableName);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
 
     try {
@@ -1366,7 +1368,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(instance, tableName);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(StandardCharsets.UTF_8)));
     Map<String,String> opts = new HashMap<String,String>();
 
     try {
@@ -1466,7 +1468,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       ZipEntry zipEntry;
       while ((zipEntry = zis.getNextEntry()) != null) {
         if (zipEntry.getName().equals(Constants.EXPORT_TABLE_CONFIG_FILE)) {
-          BufferedReader in = new BufferedReader(new InputStreamReader(zis, Constants.UTF8));
+          BufferedReader in = new BufferedReader(new InputStreamReader(zis, StandardCharsets.UTF_8));
           try {
             String line;
             while ((line = in.readLine()) != null) {
@@ -1512,7 +1514,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       Logger.getLogger(this.getClass()).warn("Failed to check if imported table references external java classes : " + ioe.getMessage());
     }
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), ByteBuffer.wrap(importDir.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(importDir.getBytes(StandardCharsets.UTF_8)));
 
     Map<String,String> opts = Collections.emptyMap();
 
@@ -1530,7 +1532,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     checkArgument(exportDir != null, "exportDir is null");
 
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), ByteBuffer.wrap(exportDir.getBytes(Constants.UTF8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(StandardCharsets.UTF_8)), ByteBuffer.wrap(exportDir.getBytes(StandardCharsets.UTF_8)));
 
     Map<String,String> opts = Collections.emptyMap();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 6b5f966..65eeefc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.client.impl;
 
+import java.nio.charset.StandardCharsets;
 import java.security.SecurityPermission;
 import java.util.LinkedList;
 import java.util.List;
@@ -96,9 +97,9 @@ public class Namespaces {
       byte[] path = zc.get(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES + "/" + id + Constants.ZNAMESPACE_NAME);
       if (path != null) {
         if (nameAsKey)
-          namespaceMap.put(new String(path, Constants.UTF8), id);
+          namespaceMap.put(new String(path, StandardCharsets.UTF_8), id);
         else
-          namespaceMap.put(id, new String(path, Constants.UTF8));
+          namespaceMap.put(id, new String(path, StandardCharsets.UTF_8));
       }
     }
     return namespaceMap;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index ae62ab7..93ba4d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
@@ -17,6 +17,8 @@
 package org.apache.accumulo.core.client.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -139,7 +141,7 @@ 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, Constants.UTF8).equals("master"))
+      if (data != null && !new String(data, StandardCharsets.UTF_8).equals("master"))
         servers.add(new ThriftTransportKey(
           new ServerServices(new String(data)).getAddressString(Service.TSERV_CLIENT),
           rpcTimeout, SslConnectionParams.forClient(ServerConfigurationUtil.getConfiguration(instance))));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------
diff --git 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
index 1dd9ef0..0ac23e7 100644
--- 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
@@ -17,6 +17,8 @@
 package org.apache.accumulo.core.client.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
+import java.nio.charset.StandardCharsets;
 import java.security.SecurityPermission;
 import java.util.HashMap;
 import java.util.List;
@@ -135,7 +137,7 @@ public class Tables {
       if (nId == null) {
         namespaceName = null;
       } else {
-        String namespaceId = new String(nId, Constants.UTF8);
+        String namespaceId = new String(nId, StandardCharsets.UTF_8);
         if (!namespaceId.equals(Namespaces.DEFAULT_NAMESPACE_ID)) {
           try {
             namespaceName = namespaceIdToNameMap.get(namespaceId);
@@ -150,7 +152,7 @@ public class Tables {
         }
       }
       if (tableName != null && namespaceName != null) {
-        String tableNameStr = qualified(new String(tableName, Constants.UTF8), namespaceName);
+        String tableNameStr = qualified(new String(tableName, StandardCharsets.UTF_8), namespaceName);
         if (nameAsKey)
           tableMap.put(tableNameStr, tableId);
         else
@@ -250,7 +252,7 @@ public class Tables {
     if (state == null)
       return TableState.UNKNOWN;
 
-    return TableState.valueOf(new String(state, Constants.UTF8));
+    return TableState.valueOf(new String(state, StandardCharsets.UTF_8));
   }
 
   public static long getCacheResetCount() {
@@ -308,7 +310,7 @@ public class Tables {
       throw new IllegalArgumentException("Table with id " + tableId + " does not exist");
     }
 
-    return new String(n, Constants.UTF8);
+    return new String(n, StandardCharsets.UTF_8);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
----------------------------------------------------------------------
diff --git 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
index 8872059..55c11e0 100644
--- 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
@@ -17,7 +17,9 @@
 package org.apache.accumulo.core.client.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import org.apache.accumulo.core.Constants;
+
+import java.nio.charset.StandardCharsets;
+
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
@@ -93,7 +95,7 @@ public class Writer {
       TabletLocation tabLoc = TabletLocator.getLocator(instance, table).locateTablet(credentials, new Text(m.getRow()), false, true);
       
       if (tabLoc == null) {
-        log.trace("No tablet location found for row " + new String(m.getRow(), Constants.UTF8));
+        log.trace("No tablet location found for row " + new String(m.getRow(), StandardCharsets.UTF_8));
         UtilWaitThread.sleep(500);
         continue;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index a071d07..b5694f2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.Constants;
+import java.nio.charset.StandardCharsets;
 
 /**
  * This lexicoder encodes/decodes a given String to/from bytes without further processing. It can be combined with other encoders like the
@@ -29,12 +29,12 @@ public class StringLexicoder implements Lexicoder<String> {
   
   @Override
   public byte[] encode(String data) {
-    return data.getBytes(Constants.UTF8);
+    return data.getBytes(StandardCharsets.UTF_8);
   }
   
   @Override
   public String decode(byte[] data) {
-    return new String(data, Constants.UTF8);
+    return new String(data, StandardCharsets.UTF_8);
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --git 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
index 85c22fa..76c1373 100644
--- 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
@@ -20,6 +20,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,7 +28,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IteratorSetting;
@@ -195,7 +195,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
 
     if (in.readBoolean()) {
       String strAuths = in.readUTF();
-      auths = new Authorizations(strAuths.getBytes(Constants.UTF8));
+      auths = new Authorizations(strAuths.getBytes(StandardCharsets.UTF_8));
     }
 
     if (in.readBoolean()) {
@@ -209,7 +209,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
       switch (this.tokenSource) {
         case INLINE:
           String tokenClass = in.readUTF();
-          byte[] base64TokenBytes = in.readUTF().getBytes(Constants.UTF8);
+          byte[] base64TokenBytes = in.readUTF().getBytes(StandardCharsets.UTF_8);
           byte[] tokenBytes = Base64.decodeBase64(base64TokenBytes);
 
           this.token = AuthenticationTokenSerializer.deserialize(tokenClass, tokenBytes);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 1569579..0a10871 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -22,11 +22,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Scanner;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.mapreduce.lib.util.DistributedCacheHelper;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configurable;
@@ -89,10 +89,10 @@ public class RangePartitioner extends Partitioner<Text,Writable> implements Conf
         for (Path path : cf) {
           if (path.toUri().getPath().endsWith(cutFileName.substring(cutFileName.lastIndexOf('/')))) {
             TreeSet<Text> cutPoints = new TreeSet<Text>();
-            Scanner in = new Scanner(new BufferedReader(new InputStreamReader(new FileInputStream(path.toString()), Constants.UTF8)));
+            Scanner in = new Scanner(new BufferedReader(new InputStreamReader(new FileInputStream(path.toString()), StandardCharsets.UTF_8)));
             try {
               while (in.hasNextLine())
-                cutPoints.add(new Text(Base64.decodeBase64(in.nextLine().getBytes(Constants.UTF8))));
+                cutPoints.add(new Text(Base64.decodeBase64(in.nextLine().getBytes(StandardCharsets.UTF_8))));
             } finally {
               in.close();
             }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
index fef272e..f4c3e65 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -17,11 +17,12 @@
 package org.apache.accumulo.core.client.mapreduce.lib.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.Instance;
@@ -215,7 +216,7 @@ public class ConfiguratorBase {
     if (token.startsWith(TokenSource.INLINE.prefix())) {
       String[] args = token.substring(TokenSource.INLINE.prefix().length()).split(":", 2);
       if (args.length == 2)
-        return AuthenticationTokenSerializer.deserialize(args[0], Base64.decodeBase64(args[1].getBytes(Constants.UTF8)));
+        return AuthenticationTokenSerializer.deserialize(args[0], Base64.decodeBase64(args[1].getBytes(StandardCharsets.UTF_8)));
     } else if (token.startsWith(TokenSource.FILE.prefix())) {
       String tokenFileName = token.substring(TokenSource.FILE.prefix().length());
       return getTokenFromFile(conf, getPrincipal(implementingClass, conf), tokenFileName);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index 89b5234..c7b3520 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -33,7 +34,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-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.ClientSideIteratorScanner;
@@ -152,7 +152,7 @@ public class InputConfigurator extends ConfiguratorBase {
    */
   public static Authorizations getScanAuthorizations(Class<?> implementingClass, Configuration conf) {
     String authString = conf.get(enumToConfKey(implementingClass, ScanOpts.AUTHORIZATIONS));
-    return authString == null ? Authorizations.EMPTY : new Authorizations(authString.getBytes(Constants.UTF8));
+    return authString == null ? Authorizations.EMPTY : new Authorizations(authString.getBytes(StandardCharsets.UTF_8));
   }
 
   /**
@@ -272,9 +272,9 @@ public class InputConfigurator extends ConfiguratorBase {
       if (column.getFirst() == null)
         throw new IllegalArgumentException("Column family can not be null");
 
-      String col = new String(Base64.encodeBase64(TextUtil.getBytes(column.getFirst())), Constants.UTF8);
+      String col = new String(Base64.encodeBase64(TextUtil.getBytes(column.getFirst())), StandardCharsets.UTF_8);
       if (column.getSecond() != null)
-        col += ":" + new String(Base64.encodeBase64(TextUtil.getBytes(column.getSecond())), Constants.UTF8);
+        col += ":" + new String(Base64.encodeBase64(TextUtil.getBytes(column.getSecond())), StandardCharsets.UTF_8);
       columnStrings.add(col);
     }
 
@@ -314,8 +314,8 @@ public class InputConfigurator extends ConfiguratorBase {
 
     for (String col : serialized) {
       int idx = col.indexOf(":");
-      Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(Constants.UTF8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(Constants.UTF8)));
-      Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(Constants.UTF8)));
+      Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(StandardCharsets.UTF_8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(StandardCharsets.UTF_8)));
+      Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(StandardCharsets.UTF_8)));
       columns.add(new Pair<Text,Text>(cf, cq));
     }
     return columns;
@@ -339,7 +339,7 @@ public class InputConfigurator extends ConfiguratorBase {
     String newIter;
     try {
       cfg.write(new DataOutputStream(baos));
-      newIter = new String(Base64.encodeBase64(baos.toByteArray()), Constants.UTF8);
+      newIter = new String(Base64.encodeBase64(baos.toByteArray()), StandardCharsets.UTF_8);
       baos.close();
     } catch (IOException e) {
       throw new IllegalArgumentException("unable to serialize IteratorSetting");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
index 3654440..81f81a7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.hadoop.conf.Configuration;
@@ -99,7 +99,7 @@ public class OutputConfigurator extends ConfiguratorBase {
     String serialized;
     try {
       bwConfig.write(new DataOutputStream(baos));
-      serialized = new String(baos.toByteArray(), Constants.UTF8);
+      serialized = new String(baos.toByteArray(), StandardCharsets.UTF_8);
       baos.close();
     } catch (IOException e) {
       throw new IllegalArgumentException("unable to serialize " + BatchWriterConfig.class.getName());
@@ -125,7 +125,7 @@ public class OutputConfigurator extends ConfiguratorBase {
       return bwConfig;
     } else {
       try {
-        ByteArrayInputStream bais = new ByteArrayInputStream(serialized.getBytes(Constants.UTF8));
+        ByteArrayInputStream bais = new ByteArrayInputStream(serialized.getBytes(StandardCharsets.UTF_8));
         bwConfig.readFields(new DataInputStream(bais));
         bais.close();
         return bwConfig;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
index 2bc9436..a8061f7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
@@ -20,10 +20,10 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 
 import jline.console.ConsoleReader;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.util.shell.Shell;
 import org.apache.accumulo.core.util.shell.ShellOptionsJC;
 
@@ -77,7 +77,7 @@ public class MockShell extends Shell {
       printInfo();
     
     if (execFile != null) {
-      java.util.Scanner scanner = new java.util.Scanner(execFile, Constants.UTF8.name());
+      java.util.Scanner scanner = new java.util.Scanner(execFile, StandardCharsets.UTF_8.name());
       try {
         while (scanner.hasNextLine() && !hasExited()) {
           execCommand(scanner.nextLine(), true, isVerbose());
@@ -137,6 +137,6 @@ public class MockShell extends Shell {
       sb.append(command).append(NEWLINE);
     }
     
-    return new ByteArrayInputStream(sb.toString().getBytes(Constants.UTF8));
+    return new ByteArrayInputStream(sb.toString().getBytes(StandardCharsets.UTF_8));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 1474435..8119a1a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -21,13 +21,13 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import javax.security.auth.DestroyFailedException;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
@@ -127,7 +127,7 @@ public class PasswordToken implements AuthenticationToken {
   
   private void setPassword(CharBuffer charBuffer) {
     // encode() kicks back a C-string, which is not compatible with the old passwording system
-    ByteBuffer bb = Constants.UTF8.encode(charBuffer);
+    ByteBuffer bb = StandardCharsets.UTF_8.encode(charBuffer);
     // create array using byter buffer length
     this.password = new byte[bb.remaining()];
     bb.get(this.password);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index ca57372..8ed5506 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -19,10 +19,10 @@ package org.apache.accumulo.core.conf;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.TreeMap;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.log4j.Logger;
 
 /**
@@ -308,7 +308,7 @@ class ConfigurationDocGen {
       int n;
       try {
         while ((n = data.read(buffer)) > 0)
-          doc.print(new String(buffer, 0, n, Constants.UTF8));
+          doc.print(new String(buffer, 0, n, StandardCharsets.UTF_8));
       } catch (IOException e) {
         e.printStackTrace();
         return;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index 607300c..b14d924 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@ -19,12 +19,11 @@ package org.apache.accumulo.core.conf;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.Constants;
-
 /**
  * An {@link AccumuloConfiguration} that contains only default values for
  * properties. This class is a singleton.
@@ -79,9 +78,9 @@ public class DefaultConfiguration extends AccumuloConfiguration {
    */
   public static void main(String[] args) throws FileNotFoundException, UnsupportedEncodingException {
     if (args.length == 2 && args[0].equals("--generate-html")) {
-      new ConfigurationDocGen(new PrintStream(args[1], Constants.UTF8.name())).generateHtml();
+      new ConfigurationDocGen(new PrintStream(args[1], StandardCharsets.UTF_8.name())).generateHtml();
     } else if (args.length == 2 && args[0].equals("--generate-latex")) {
-      new ConfigurationDocGen(new PrintStream(args[1], Constants.UTF8.name())).generateLaTeX();
+      new ConfigurationDocGen(new PrintStream(args[1], StandardCharsets.UTF_8.name())).generateLaTeX();
     } else {
       throw new IllegalArgumentException("Usage: " + DefaultConfiguration.class.getName() + " --generate-html <filename> | --generate-latex <filename>");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 9092c5b..2467585 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -18,8 +18,7 @@ package org.apache.accumulo.core.data;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
-
-import org.apache.accumulo.core.Constants;
+import java.nio.charset.StandardCharsets;
 
 /**
  * An implementation of {@link ByteSequence} that uses a backing byte array.
@@ -75,7 +74,7 @@ public class ArrayByteSequence extends ByteSequence implements Serializable {
    * @param s string to represent as bytes
    */
   public ArrayByteSequence(String s) {
-    this(s.getBytes(Constants.UTF8));
+    this(s.getBytes(StandardCharsets.UTF_8));
   }
   
   /**
@@ -155,6 +154,6 @@ public class ArrayByteSequence extends ByteSequence implements Serializable {
   }
   
   public String toString() {
-    return new String(data, offset, length, Constants.UTF8);
+    return new String(data, offset, length, StandardCharsets.UTF_8);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/data/Column.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Column.java b/core/src/main/java/org/apache/accumulo/core/data/Column.java
index abf14ef..59bb5d0 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Column.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Column.java
@@ -22,8 +22,8 @@ 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.Constants;
 import org.apache.accumulo.core.data.thrift.TColumn;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
@@ -212,8 +212,8 @@ public class Column implements WritableComparable<Column> {
    * @return string form of column
    */
   public String toString() {
-    return new String(columnFamily == null ? new byte[0] : columnFamily, Constants.UTF8) + ":" + new String(columnQualifier == null ? new byte[0] : columnQualifier, Constants.UTF8) + ":"
-        + new String(columnVisibility == null ? new byte[0] : columnVisibility, Constants.UTF8);
+    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);
   }
   
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/data/Condition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Condition.java b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
index d5c504d..71088c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
@@ -17,10 +17,11 @@
 package org.apache.accumulo.core.data;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.hadoop.io.Text;
@@ -53,8 +54,8 @@ public class Condition {
   public Condition(CharSequence cf, CharSequence cq) {
     checkArgument(cf != null, "cf is null");
     checkArgument(cq != null, "cq is null");
-    this.cf = new ArrayByteSequence(cf.toString().getBytes(Constants.UTF8));
-    this.cq = new ArrayByteSequence(cq.toString().getBytes(Constants.UTF8));
+    this.cf = new ArrayByteSequence(cf.toString().getBytes(StandardCharsets.UTF_8));
+    this.cq = new ArrayByteSequence(cq.toString().getBytes(StandardCharsets.UTF_8));
     this.cv = EMPTY;
   }
   
@@ -155,7 +156,7 @@ public class Condition {
    */
   public Condition setValue(CharSequence value) {
     checkArgument(value != null, "value is null");
-    this.val = new ArrayByteSequence(value.toString().getBytes(Constants.UTF8));
+    this.val = new ArrayByteSequence(value.toString().getBytes(StandardCharsets.UTF_8));
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/data/Value.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Value.java b/core/src/main/java/org/apache/accumulo/core/data/Value.java
index 2c44c15..7679dd3 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Value.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Value.java
@@ -23,9 +23,9 @@ 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 org.apache.accumulo.core.Constants;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
@@ -228,7 +228,7 @@ public class Value implements WritableComparable<Object> {
 
   @Override
   public String toString() {
-    return new String(get(), Constants.UTF8);
+    return new String(get(), StandardCharsets.UTF_8);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 5829ce6..7dcbab7 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -22,6 +22,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,7 +37,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.bloomfilter.DynamicBloomFilter;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
@@ -436,8 +436,8 @@ public class BloomFilterLayer {
     
     for (Integer i : vals) {
       String fi = String.format("%010d", i);
-      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf1")), new Value(("v" + fi).getBytes(Constants.UTF8)));
-      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf2")), new Value(("v" + fi).getBytes(Constants.UTF8)));
+      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf1")), new Value(("v" + fi).getBytes(StandardCharsets.UTF_8)));
+      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf2")), new Value(("v" + fi).getBytes(StandardCharsets.UTF_8)));
     }
     
     long t2 = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java b/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
index b187808..4062c3a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
@@ -17,10 +17,10 @@
 package org.apache.accumulo.core.iterators;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -59,7 +59,7 @@ public class ColumnFamilyCounter implements SortedKeyValueIterator<Key,Value> {
       }
       
       this.key = new Key(currentRow.toArray(), currentColf.toArray(), new byte[0], new byte[0], ts);
-      this.value = new Value(Integer.toString(count).getBytes(Constants.UTF8));
+      this.value = new Value(Integer.toString(count).getBytes(StandardCharsets.UTF_8));
       
     } else {
       this.key = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index a4efec9..3c948c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -21,9 +21,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -179,13 +179,13 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   public static class StringEncoder implements Encoder<Long> {
     @Override
     public byte[] encode(Long v) {
-      return Long.toString(v).getBytes(Constants.UTF8);
+      return Long.toString(v).getBytes(StandardCharsets.UTF_8);
     }
     
     @Override
     public Long decode(byte[] b) {
       try {
-        return Long.parseLong(new String(b, Constants.UTF8));
+        return Long.parseLong(new String(b, StandardCharsets.UTF_8));
       } catch (NumberFormatException nfe) {
         throw new ValueFormatException(nfe);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
----------------------------------------------------------------------
diff --git 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
index 985216c..ad43736 100644
--- 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,11 +16,11 @@
  */
 package org.apache.accumulo.core.iterators.conf;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.iterators.conf.ColumnUtil.ColFamHashKey;
 import org.apache.accumulo.core.iterators.conf.ColumnUtil.ColHashKey;
@@ -136,7 +136,7 @@ public class ColumnSet {
   static Text decode(String s) {
     Text t = new Text();
     
-    byte[] sb = s.getBytes(Constants.UTF8);
+    byte[] sb = s.getBytes(StandardCharsets.UTF_8);
     
     // very inefficient code
     for (int i = 0; i < sb.length; i++) {
@@ -144,7 +144,7 @@ public class ColumnSet {
         t.append(new byte[] {sb[i]}, 0, 1);
       } else {
         byte hex[] = new byte[] {sb[++i], sb[++i]};
-        String hs = new String(hex, Constants.UTF8);
+        String hs = new String(hex, StandardCharsets.UTF_8);
         int b = Integer.parseInt(hs, 16);
         t.append(new byte[] {(byte) b}, 0, 1);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --git 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
index dfea550..ccf7d86 100644
--- 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
@@ -18,10 +18,10 @@ package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
@@ -103,13 +103,13 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal>
   public static class BigDecimalEncoder implements org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder<BigDecimal> {
     @Override
     public byte[] encode(BigDecimal v) {
-      return v.toString().getBytes(Constants.UTF8);
+      return v.toString().getBytes(StandardCharsets.UTF_8);
     }
     
     @Override
     public BigDecimal decode(byte[] b) throws ValueFormatException {
       try {
-        return new BigDecimal(new String(b, Constants.UTF8));
+        return new BigDecimal(new String(b, StandardCharsets.UTF_8));
       } catch (NumberFormatException nfe) {
         throw new ValueFormatException(nfe);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
----------------------------------------------------------------------
diff --git 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
index 4f8207c..9ba5944 100644
--- 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
@@ -17,10 +17,10 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
@@ -89,7 +89,7 @@ public class GrepIterator extends Filter {
   @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
     super.init(source, options, env);
-    term = options.get("term").getBytes(Constants.UTF8);
+    term = options.get("term").getBytes(StandardCharsets.UTF_8);
   }
   
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
----------------------------------------------------------------------
diff --git 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
index f3ad48c..9d0d79a 100644
--- 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
@@ -17,11 +17,11 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -392,7 +392,7 @@ public class IntersectingIterator implements SortedKeyValueIterator<Key,Value> {
   protected static String encodeColumns(Text[] columns) {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < columns.length; i++) {
-      sb.append(new String(Base64.encodeBase64(TextUtil.getBytes(columns[i])), Constants.UTF8));
+      sb.append(new String(Base64.encodeBase64(TextUtil.getBytes(columns[i])), StandardCharsets.UTF_8));
       sb.append('\n');
     }
     return sb.toString();
@@ -410,14 +410,14 @@ public class IntersectingIterator implements SortedKeyValueIterator<Key,Value> {
       else
         bytes[i] = 0;
     }
-    return new String(Base64.encodeBase64(bytes), Constants.UTF8);
+    return new String(Base64.encodeBase64(bytes), StandardCharsets.UTF_8);
   }
   
   protected static Text[] decodeColumns(String columns) {
     String[] columnStrings = columns.split("\n");
     Text[] columnTexts = new Text[columnStrings.length];
     for (int i = 0; i < columnStrings.length; i++) {
-      columnTexts[i] = new Text(Base64.decodeBase64(columnStrings[i].getBytes(Constants.UTF8)));
+      columnTexts[i] = new Text(Base64.decodeBase64(columnStrings[i].getBytes(StandardCharsets.UTF_8)));
     }
     return columnTexts;
   }
@@ -431,7 +431,7 @@ public class IntersectingIterator implements SortedKeyValueIterator<Key,Value> {
     if (flags == null)
       return null;
     
-    byte[] bytes = Base64.decodeBase64(flags.getBytes(Constants.UTF8));
+    byte[] bytes = Base64.decodeBase64(flags.getBytes(StandardCharsets.UTF_8));
     boolean[] bFlags = new boolean[bytes.length];
     for (int i = 0; i < bytes.length; i++) {
       if (bytes[i] == 1)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
----------------------------------------------------------------------
diff --git 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
index fdad848..47b3c77 100644
--- 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
@@ -17,13 +17,13 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -45,7 +45,7 @@ import org.apache.hadoop.io.Text;
  */
 public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, OptionDescriber {
   
-  public static final Value SUPPRESS_ROW_VALUE = new Value("SUPPRESS_ROW".getBytes(Constants.UTF8));
+  public static final Value SUPPRESS_ROW_VALUE = new Value("SUPPRESS_ROW".getBytes(StandardCharsets.UTF_8));
   
   private static final ByteSequence EMPTY = new ArrayByteSequence(new byte[] {});
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
----------------------------------------------------------------------
diff --git 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
index 9db33f0..5669fde 100644
--- 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
@@ -18,11 +18,11 @@ package org.apache.accumulo.core.iterators.user;
 
 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;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
@@ -55,7 +55,7 @@ public class RegExFilter extends Filter {
   public static final String ENCODING = "encoding";
   public static final String MATCH_SUBSTRING = "matchSubstring";
   
-  public static final String ENCODING_DEFAULT = Constants.UTF8.name();
+  public static final String ENCODING_DEFAULT = StandardCharsets.UTF_8.name();
   
   private Matcher rowMatcher;
   private Matcher colfMatcher;
@@ -193,7 +193,7 @@ public class RegExFilter extends Filter {
         this.encoding = options.get(ENCODING);
         if ("".equals(this.encoding))
           encoding = ENCODING_DEFAULT;
-        new String("test".getBytes(Constants.UTF8), encoding);
+        new String("test".getBytes(StandardCharsets.UTF_8), encoding);
       } catch (UnsupportedEncodingException e) {
         throw new IllegalArgumentException("invalid encoding " + ENCODING + ":" + this.encoding, e);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
index 45860eb..ee2e1ae 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
@@ -17,11 +17,11 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
@@ -49,7 +49,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
 public class RowDeletingIterator implements SortedKeyValueIterator<Key,Value> {
   
-  public static final Value DELETE_ROW_VALUE = new Value("DEL_ROW".getBytes(Constants.UTF8));
+  public static final Value DELETE_ROW_VALUE = new Value("DEL_ROW".getBytes(StandardCharsets.UTF_8));
   private SortedKeyValueIterator<Key,Value> source;
   private boolean propogateDeletes;
   private ByteSequence currentRow;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git 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
index 77c829a..bcd085e 100644
--- 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
@@ -21,13 +21,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -208,12 +208,12 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
         sb.append(",");
         sb.append(Long.toString(la.get(i)));
       }
-      return sb.toString().getBytes(Constants.UTF8);
+      return sb.toString().getBytes(StandardCharsets.UTF_8);
     }
     
     @Override
     public List<Long> decode(byte[] b) {
-      String[] longstrs = new String(b, Constants.UTF8).split(",");
+      String[] longstrs = new String(b, StandardCharsets.UTF_8).split(",");
       List<Long> la = new ArrayList<Long>(longstrs.length);
       for (String s : longstrs) {
         if (s.length() == 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
----------------------------------------------------------------------
diff --git 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
index 541a379..3d89d2f 100644
--- 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
@@ -17,6 +17,7 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +28,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -112,7 +112,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     if (scanning) {
       String auths = options.get(AUTH_OPT);
       if (auths != null && !auths.isEmpty()) {
-        ve = new VisibilityEvaluator(new Authorizations(auths.getBytes(Constants.UTF8)));
+        ve = new VisibilityEvaluator(new Authorizations(auths.getBytes(StandardCharsets.UTF_8)));
         visibleCache = new LRUMap(100);
       }
     }
@@ -146,7 +146,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     for (Entry<String,String> option : options.entrySet()) {
       try {
         if (option.getKey().equals(AUTH_OPT)) {
-          new Authorizations(option.getValue().getBytes(Constants.UTF8));
+          new Authorizations(option.getValue().getBytes(StandardCharsets.UTF_8));
         } else if (option.getKey().equals(MAX_BUFFER_SIZE_OPT)) {
           AccumuloConfiguration.getMemoryInBytes(option.getValue());
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
----------------------------------------------------------------------
diff --git 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
index 6a5db49..4a10511 100644
--- 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
@@ -17,9 +17,9 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -58,7 +58,7 @@ public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.
     
     if (!filterInvalid) {
       String auths = options.get(AUTHS);
-      Authorizations authObj = auths == null || auths.isEmpty() ? new Authorizations() : new Authorizations(auths.getBytes(Constants.UTF8));
+      Authorizations authObj = auths == null || auths.isEmpty() ? new Authorizations() : new Authorizations(auths.getBytes(StandardCharsets.UTF_8));
       this.ve = new VisibilityEvaluator(authObj);
       this.defaultVisibility = new Text();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 1571c62..d527653 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@ -17,8 +17,10 @@
 package org.apache.accumulo.core.security;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +30,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.util.ByteBufferUtil;
@@ -146,13 +147,13 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
 
     checkArgument(authorizations != null, "authorizations is null");
 
-    String authsString = new String(authorizations, Constants.UTF8);
+    String authsString = new String(authorizations, StandardCharsets.UTF_8);
     if (authsString.startsWith(HEADER)) {
       // it's the new format
       authsString = authsString.substring(HEADER.length());
       if (authsString.length() > 0) {
         for (String encAuth : authsString.split(",")) {
-          byte[] auth = Base64.decodeBase64(encAuth.getBytes(Constants.UTF8));
+          byte[] auth = Base64.decodeBase64(encAuth.getBytes(StandardCharsets.UTF_8));
           auths.add(new ArrayByteSequence(auth));
         }
         checkAuths();
@@ -189,7 +190,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
     auths.clear();
     for (String str : authorizations) {
       str = str.trim();
-      auths.add(new ArrayByteSequence(str.getBytes(Constants.UTF8)));
+      auths.add(new ArrayByteSequence(str.getBytes(StandardCharsets.UTF_8)));
     }
 
     checkAuths();
@@ -202,7 +203,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
    * @see #serialize()
    */
   public byte[] getAuthorizationsArray() {
-    return serialize().getBytes(Constants.UTF8);
+    return serialize().getBytes(StandardCharsets.UTF_8);
   }
 
   /**
@@ -243,7 +244,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
     for (ByteSequence auth : auths) {
       sb.append(sep);
       sep = ",";
-      sb.append(new String(auth.toArray(), Constants.UTF8));
+      sb.append(new String(auth.toArray(), StandardCharsets.UTF_8));
     }
 
     return sb.toString();
@@ -340,7 +341,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
     for (byte[] auth : authsList) {
       sb.append(sep);
       sep = ",";
-      sb.append(new String(Base64.encodeBase64(auth), Constants.UTF8));
+      sb.append(new String(Base64.encodeBase64(auth), StandardCharsets.UTF_8));
     }
 
     return sb.toString();


Mime
View raw message