accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [10/48] ACCUMULO-2292 Massive amount of fixes for findbugs warnings.
Date Tue, 04 Feb 2014 17:54:39 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
index c7f169e..df31ff0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
@@ -90,7 +90,7 @@ public class ConcurrencyTest extends FunctionalTest {
     BatchWriter bw = getConnector().createBatchWriter("cct", new BatchWriterConfig());
     for (int i = 0; i < 50; i++) {
       Mutation m = new Mutation(new Text(String.format("%06d", i)));
-      m.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes()));
+      m.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes(Constants.UTF8)));
       bw.addMutation(m);
     }
     
@@ -107,7 +107,7 @@ public class ConcurrencyTest extends FunctionalTest {
     
     for (int i = 0; i < 50; i++) {
       Mutation m = new Mutation(new Text(String.format("%06d", i)));
-      m.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes()));
+      m.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes(Constants.UTF8)));
       bw.addMutation(m);
     }
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
index 217fb61..a464801 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
@@ -76,7 +76,7 @@ public class ConstraintTest extends FunctionalTest {
     BatchWriter bw = getConnector().createBatchWriter("ct", new BatchWriterConfig());
     
     Mutation mut1 = new Mutation(new Text("r1"));
-    mut1.put(new Text("cf1"), new Text("cq1"), new Value("123".getBytes()));
+    mut1.put(new Text("cf1"), new Text("cq1"), new Value("123".getBytes(Constants.UTF8)));
     
     bw.addMutation(mut1);
     
@@ -87,7 +87,7 @@ public class ConstraintTest extends FunctionalTest {
     
     // create a mutation with a non numeric value
     Mutation mut2 = new Mutation(new Text("r1"));
-    mut2.put(new Text("cf1"), new Text("cq1"), new Value("123a".getBytes()));
+    mut2.put(new Text("cf1"), new Text("cq1"), new Value("123a".getBytes(Constants.UTF8)));
     
     bw.addMutation(mut2);
     
@@ -130,7 +130,7 @@ public class ConstraintTest extends FunctionalTest {
     Entry<Key,Value> entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     
@@ -153,7 +153,7 @@ public class ConstraintTest extends FunctionalTest {
     entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123a".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123a".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     
@@ -170,7 +170,7 @@ public class ConstraintTest extends FunctionalTest {
     bw = getConnector().createBatchWriter("ct", new BatchWriterConfig());
     
     Mutation mut3 = new Mutation(new Text("r1"));
-    mut3.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes()));
+    mut3.put(new Text("cf1"), new Text("cq1"), new Value("foo".getBytes(Constants.UTF8)));
     
     bw.addMutation(mut3);
     
@@ -193,7 +193,7 @@ public class ConstraintTest extends FunctionalTest {
     entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123a".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123a".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     
@@ -216,7 +216,7 @@ public class ConstraintTest extends FunctionalTest {
     entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("foo".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("foo".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     
@@ -228,7 +228,7 @@ public class ConstraintTest extends FunctionalTest {
   
   private Mutation newMut(String row, String cf, String cq, String val) {
     Mutation mut1 = new Mutation(new Text(row));
-    mut1.put(new Text(cf), new Text(cq), new Value(val.getBytes()));
+    mut1.put(new Text(cf), new Text(cq), new Value(val.getBytes(Constants.UTF8)));
     return mut1;
   }
   
@@ -300,14 +300,14 @@ public class ConstraintTest extends FunctionalTest {
     Entry<Key,Value> entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq1")) || !entry.getValue().equals(new Value("123".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     
     entry = iter.next();
     
     if (!entry.getKey().getRow().equals(new Text("r1")) || !entry.getKey().getColumnFamily().equals(new Text("cf1"))
-        || !entry.getKey().getColumnQualifier().equals(new Text("cq4")) || !entry.getValue().equals(new Value("789".getBytes()))) {
+        || !entry.getKey().getColumnQualifier().equals(new Text("cq4")) || !entry.getValue().equals(new Value("789".getBytes(Constants.UTF8)))) {
       throw new Exception("Unexpected key or value " + entry.getKey() + " " + entry.getValue());
     }
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
index b48edc3..7f59afa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
@@ -71,7 +71,7 @@ public class CreateAndUseTest extends FunctionalTest {
     
     for (int i = 1; i < 257; i++) {
       Mutation m = new Mutation(new Text(String.format("%08x", (i << 8) - 16)));
-      m.put(cf, cq, new Value(("" + i).getBytes()));
+      m.put(cf, cq, new Value(Integer.toString(i).getBytes(Constants.UTF8)));
       
       bw.addMutation(m);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
index 779ecf1..49187d7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
@@ -55,7 +55,7 @@ public class DeleteEverythingTest extends FunctionalTest {
   public void run() throws Exception {
     BatchWriter bw = getConnector().createBatchWriter("de", new BatchWriterConfig());
     Mutation m = new Mutation(new Text("foo"));
-    m.put(new Text("bar"), new Text("1910"), new Value("5".getBytes()));
+    m.put(new Text("bar"), new Text("1910"), new Value("5".getBytes(Constants.UTF8)));
     bw.addMutation(m);
     bw.flush();
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
index 2880741..78aa79a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
@@ -46,9 +46,9 @@ public class DeleteRowsSplitTest extends FunctionalTest {
   static final SortedSet<Text> SPLITS = new TreeSet<Text>();
   static final List<String> ROWS = new ArrayList<String>();
   static {
-    for (byte b : LETTERS.getBytes()) {
+    for (byte b : LETTERS.getBytes(Constants.UTF8)) {
       SPLITS.add(new Text(new byte[] {b}));
-      ROWS.add(new String(new byte[] {b}));
+      ROWS.add(new String(new byte[] {b}, Constants.UTF8));
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
index d1f757b..9c37742 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
@@ -290,6 +290,6 @@ public abstract class FunctionalTest {
   }
   
   static Mutation nm(String row, String cf, String cq, String value) {
-    return nm(row, cf, cq, new Value(value.getBytes()));
+    return nm(row, cf, cq, new Value(value.getBytes(Constants.UTF8)));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
index d329eb2..8f647e3 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
@@ -120,7 +120,7 @@ public class LargeRowTest extends FunctionalTest {
       TestIngest.toPrintableChars(rowData);
       
       Mutation mut = new Mutation(new Text(rowData));
-      mut.put(new Text(""), new Text(""), new Value(("" + i).getBytes()));
+      mut.put(new Text(""), new Text(""), new Value(Integer.toString(i).getBytes(Constants.UTF8)));
       bw.addMutation(mut);
     }
     
@@ -168,7 +168,7 @@ public class LargeRowTest extends FunctionalTest {
         if (!entry.getKey().getRow().equals(new Text(rowData))) {
           throw new Exception("verification failed, unexpected row i =" + i);
         }
-        if (!entry.getValue().equals(Integer.toString(i).getBytes())) {
+        if (!entry.getValue().equals(Integer.toString(i).getBytes(Constants.UTF8))) {
           throw new Exception("verification failed, unexpected value i =" + i + " value = " + entry.getValue());
         }
         count++;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java
index faecba0..d5fabd3 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java
@@ -27,6 +27,7 @@ import java.util.NoSuchElementException;
 import java.util.Random;
 import java.util.TreeMap;
 
+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.SortedKeyValueIterator;
@@ -104,7 +105,7 @@ public class NativeMapTest {
   }
   
   private Value nv(int v) {
-    return new Value(String.format("r%09d", v).getBytes());
+    return new Value(String.format("r%09d", v).getBytes(Constants.UTF8));
   }
   
   public void setUp() {
@@ -181,12 +182,12 @@ public class NativeMapTest {
           for (int l = 0; l < num; l++) {
             for (int ts = 0; ts < num; ts++) {
               Key key = nk(i, j, k, l, ts, true);
-              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes());
+              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes(Constants.UTF8));
               
               nm.put(key, value);
               
               key = nk(i, j, k, l, ts, false);
-              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes());
+              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes(Constants.UTF8));
               
               nm.put(key, value);
             }
@@ -203,7 +204,7 @@ public class NativeMapTest {
           for (int l = 0; l < num; l++) {
             for (int ts = num - 1; ts >= 0; ts--) {
               Key key = nk(i, j, k, l, ts, true);
-              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes());
+              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes(Constants.UTF8));
               
               assertTrue(iter.hasNext());
               Entry<Key,Value> entry = iter.next();
@@ -211,7 +212,7 @@ public class NativeMapTest {
               assertEquals(value, entry.getValue());
               
               key = nk(i, j, k, l, ts, false);
-              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes());
+              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes(Constants.UTF8));
               
               assertTrue(iter.hasNext());
               entry = iter.next();
@@ -231,7 +232,7 @@ public class NativeMapTest {
           for (int l = 0; l < num; l++) {
             for (int ts = 0; ts < num; ts++) {
               Key key = nk(i, j, k, l, ts, true);
-              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes());
+              Value value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + true + "_" + run).getBytes(Constants.UTF8));
               
               assertEquals(value, nm.get(key));
               
@@ -242,7 +243,7 @@ public class NativeMapTest {
               assertEquals(value, entry.getValue());
               
               key = nk(i, j, k, l, ts, false);
-              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes());
+              value = new Value((i + "_" + j + "_" + k + "_" + l + "_" + ts + "_" + false + "_" + run).getBytes(Constants.UTF8));
               
               assertEquals(value, nm.get(key));
               
@@ -362,10 +363,10 @@ public class NativeMapTest {
     
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
     
-    tm.put(new Key(new Text("fo")), new Value("0".getBytes()));
-    tm.put(new Key(new Text("foo")), new Value("1".getBytes()));
-    tm.put(new Key(new Text("foo1")), new Value("2".getBytes()));
-    tm.put(new Key(new Text("foo2")), new Value("3".getBytes()));
+    tm.put(new Key(new Text("fo")), new Value(new byte[] {'0'}));
+    tm.put(new Key(new Text("foo")), new Value(new byte[] {'1'}));
+    tm.put(new Key(new Text("foo1")), new Value(new byte[] {'2'}));
+    tm.put(new Key(new Text("foo2")), new Value(new byte[] {'3'}));
     
     for (Entry<Key,Value> entry : tm.entrySet()) {
       nm.put(entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
index a0d1825..3741a4e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
@@ -348,7 +348,7 @@ public class PermissionsTest {
         // put in some initial data
         BatchWriter writer = getConnector().createBatchWriter(TEST_TABLE, new BatchWriterConfig());
         Mutation m = new Mutation(new Text("row"));
-        m.put(new Text("cf"), new Text("cq"), new Value("val".getBytes()));
+        m.put(new Text("cf"), new Text("cq"), new Value("val".getBytes(Constants.UTF8)));
         writer.addMutation(m);
         writer.close();
         
@@ -386,7 +386,7 @@ public class PermissionsTest {
           try {
             writer = test_user_conn.createBatchWriter(TEST_TABLE, new BatchWriterConfig());
             m = new Mutation(new Text("row"));
-            m.put(new Text("a"), new Text("b"), new Value("c".getBytes()));
+            m.put(new Text("a"), new Text("b"), new Value("c".getBytes(Constants.UTF8)));
             writer.addMutation(m);
             try {
               writer.close();
@@ -456,7 +456,7 @@ public class PermissionsTest {
         case WRITE:
           writer = test_user_conn.createBatchWriter(TEST_TABLE, new BatchWriterConfig());
           m = new Mutation(new Text("row"));
-          m.put(new Text("a"), new Text("b"), new Value("c".getBytes()));
+          m.put(new Text("a"), new Text("b"), new Value("c".getBytes(Constants.UTF8)));
           writer.addMutation(m);
           writer.close();
           break;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java b/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
index 91ee66e..0da0f61 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.Help;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
@@ -97,7 +98,7 @@ public class RunTests extends Configured implements Tool {
       Text result = new Text();
       try {
         while ((len = out.read(buffer)) > 0) {
-          log.info("More: " + new String(buffer, 0, len));
+          log.info("More: " + new String(buffer, 0, len, Constants.UTF8));
           result.append(buffer, 0, len);
         }
       } catch (Exception ex) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java
index 5e42525..c3c385e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -58,8 +59,8 @@ public class ScanIteratorTest extends FunctionalTest {
     
     for (int i = 0; i < 1000; i++) {
       Mutation m = new Mutation(new Text(String.format("%06d", i)));
-      m.put(new Text("cf1"), new Text("cq1"), new Value(("" + (1000 - i)).getBytes()));
-      m.put(new Text("cf1"), new Text("cq2"), new Value(("" + (i - 1000)).getBytes()));
+      m.put(new Text("cf1"), new Text("cq1"), new Value(Integer.toString(1000 - i).getBytes(Constants.UTF8)));
+      m.put(new Text("cf1"), new Text("cq2"), new Value(Integer.toString(i - 1000).getBytes(Constants.UTF8)));
       
       bw.addMutation(m);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
index f30b5a7..8554e3f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
@@ -237,7 +237,7 @@ public class ScanRangeTest extends FunctionalTest {
       for (int j = 0; j < CF_LIMIT; j++) {
         for (int k = 0; k < CQ_LIMIT; k++) {
           for (int t = 0; t < TS_LIMIT; t++) {
-            m.put(createCF(j), createCQ(k), t, new Value(String.format("%06d_%03d_%03d_%03d", i, j, k, t).getBytes()));
+            m.put(createCF(j), createCQ(k), t, new Value(String.format("%06d_%03d_%03d_%03d", i, j, k, t).getBytes(Constants.UTF8)));
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java
index 1551687..548e1b7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Scanner;
@@ -59,7 +60,7 @@ public class ScanSessionTimeOutTest extends FunctionalTest {
     for (int i = 0; i < 100000; i++) {
       Mutation m = new Mutation(new Text(String.format("%08d", i)));
       for (int j = 0; j < 3; j++)
-        m.put(new Text("cf1"), new Text("cq" + j), new Value(("" + i + "_" + j).getBytes()));
+        m.put(new Text("cf1"), new Text("cq" + j), new Value((i + "_" + j).getBytes(Constants.UTF8)));
       
       bw.addMutation(m);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
index c06eebb..a644b46 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
@@ -65,7 +65,7 @@ public class ServerSideErrorTest extends FunctionalTest {
     BatchWriter bw = getConnector().createBatchWriter("tt", new BatchWriterConfig());
     
     Mutation m = new Mutation(new Text("r1"));
-    m.put(new Text("acf"), new Text("foo"), new Value("1".getBytes()));
+    m.put(new Text("acf"), new Text("foo"), new Value(new byte[] {'1'}));
     
     bw.addMutation(m);
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
index 93bc207..1fc0e4f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
@@ -81,7 +81,7 @@ public class SplitRecoveryTest extends FunctionalTest {
   public void run() throws Exception {
     String zPath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + "/testLock";
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
-    zoo.putPersistentData(zPath, "".getBytes(), NodeExistsPolicy.OVERWRITE);
+    zoo.putPersistentData(zPath, new byte[0], NodeExistsPolicy.OVERWRITE);
     ZooLock zl = new ZooLock(zPath);
     boolean gotLock = zl.tryLock(new LockWatcher() {
       
@@ -95,7 +95,7 @@ public class SplitRecoveryTest extends FunctionalTest {
       public void unableToMonitorLockNode(Throwable e) {
         System.exit(-1);
       }
-    }, "foo".getBytes());
+    }, "foo".getBytes(Constants.UTF8));
     
     if (!gotLock) {
       System.err.println("Failed to get lock " + zPath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
index ffe383b..8aa65e1 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -84,12 +85,12 @@ public class VisibilityTest extends FunctionalTest {
   }
   
   private void mput(Mutation m, String cf, String cq, String cv, String val) {
-    ColumnVisibility le = new ColumnVisibility(cv.getBytes());
-    m.put(new Text(cf), new Text(cq), le, new Value(val.getBytes()));
+    ColumnVisibility le = new ColumnVisibility(cv.getBytes(Constants.UTF8));
+    m.put(new Text(cf), new Text(cq), le, new Value(val.getBytes(Constants.UTF8)));
   }
   
   private void mputDelete(Mutation m, String cf, String cq, String cv) {
-    ColumnVisibility le = new ColumnVisibility(cv.getBytes());
+    ColumnVisibility le = new ColumnVisibility(cv.getBytes(Constants.UTF8));
     m.putDelete(new Text(cf), new Text(cq), le);
   }
   
@@ -266,7 +267,7 @@ public class VisibilityTest extends FunctionalTest {
   private ByteArraySet nbas(Set<String> auths) {
     ByteArraySet bas = new ByteArraySet();
     for (String auth : auths) {
-      bas.add(auth.getBytes());
+      bas.add(auth.getBytes(Constants.UTF8));
     }
     return bas;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 2afca25..51b5054 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -131,7 +131,7 @@ public class ZombieTServer {
       }
     };
     
-    byte[] lockContent = new ServerServices(addressString, Service.TSERV_CLIENT).toString().getBytes();
+    byte[] lockContent = new ServerServices(addressString, Service.TSERV_CLIENT).toString().getBytes(Constants.UTF8);
     if (zlock.tryLock(lw, lockContent)) {
       log.debug("Obtained tablet server lock " + zlock.getLockPath());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index 02442fb..a9b072e 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -101,10 +101,10 @@ public class MetadataBatchScanTest {
         
         String dir = "/t-" + UUID.randomUUID();
         
-        Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes()));
+        Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes(Constants.UTF8)));
         
         for (int i = 0; i < 5; i++) {
-          mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes()));
+          mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes(Constants.UTF8)));
         }
         
         bw.addMutation(mut);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index 397f2e8..fadcb66 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -35,6 +35,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.log4j.Level;
 import org.w3c.dom.Document;
@@ -274,9 +275,9 @@ public class Module extends Node {
           else if (value instanceof String || value instanceof Map || value instanceof Collection || value instanceof Number)
             logMsg += value;
           else if (value instanceof byte[])
-            logMsg += new String((byte[])value);
+            logMsg += new String((byte[])value, Constants.UTF8);
           else if (value instanceof PasswordToken)
-            logMsg += new String(((PasswordToken) value).getPassword());
+            logMsg += new String(((PasswordToken) value).getPassword(), Constants.UTF8);
           else
             logMsg += value.getClass()+ " - " + value;
           

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
index b75b98d..4ebf23f 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
@@ -16,12 +16,13 @@
  */
 package org.apache.accumulo.test.randomwalk.bulk;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.test.randomwalk.State;
 
 public class BulkMinusOne extends BulkTest {
   
-  private static final Value negOne = new Value("-1".getBytes());
+  private static final Value negOne = new Value("-1".getBytes(Constants.UTF8));
   
   @Override
   protected void runLater(State state) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
index 9135163..cdfbb36 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
@@ -44,7 +44,6 @@ public class BulkPlusOne extends BulkTest {
   public static final int COLS = 10;
   public static final int HEX_SIZE = (int) Math.ceil(Math.log(LOTS) / Math.log(16));
   public static final String FMT = "r%0" + HEX_SIZE + "x";
-  static final Value one = new Value("1".getBytes());
   public static final List<Column> COLNAMES = new ArrayList<Column>();
   public static final Text CHECK_COLUMN_FAMILY = new Text("cf");
   static {
@@ -110,7 +109,7 @@ public class BulkPlusOne extends BulkTest {
   @Override
   protected void runLater(State state) throws Exception {
     log.info("Incrementing");
-    bulkLoadLots(log, state, one);
+    bulkLoadLots(log, state, ONE);
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index cb8d2ba..b2299aa 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -23,6 +23,7 @@ import java.util.Properties;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ClientOnRequiredTable;
 import org.apache.accumulo.core.client.RowIterator;
 import org.apache.accumulo.core.client.Scanner;
@@ -35,7 +36,7 @@ import org.apache.hadoop.io.Text;
 
 public class Verify extends Test {
   
-  static byte[] zero = "0".getBytes();
+  static byte[] zero = new byte[] {'0'};
   
   @Override
   public void visit(State state, Properties props) throws Exception {
@@ -142,7 +143,7 @@ public class Verify extends Test {
    * @param lastBadEntry
    */
   private static void report(Text startBadRow, Text lastBadRow, Value value) {
-    System.out.println("Bad value " + new String(value.get()));
+    System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
     System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
index f1c5e22..a2bad7c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Connector;
@@ -53,7 +54,7 @@ public class BatchWrite extends Test {
           Mutation m = new Mutation(String.format("%016x", (rand.nextLong() & 0x7fffffffffffffffl)));
           long val = (rand.nextLong() & 0x7fffffffffffffffl);
           for (int j = 0; j < 10; j++) {
-            m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes()));
+            m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(Constants.UTF8)));
           }
           
           bw.addMutation(m);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
index bc0961e..d4d6838 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
@@ -22,6 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -120,7 +121,7 @@ public class BulkImport extends Test {
           Mutation m = new Mutation(String.format("%016x", row));
           long val = rand.nextLong() & 0x7fffffffffffffffl;
           for (int j = 0; j < 10; j++) {
-            m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes()));
+            m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(Constants.UTF8)));
           }
           
           bw.addMutation(m);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
index 3b36e81..b882a3a 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.Authorizations;
@@ -45,10 +46,10 @@ public class ChangeAuthorizations extends Test {
       if (rand.nextBoolean()) {
         String authorization = String.format("a%d", rand.nextInt(5000));
         log.debug("adding authorization " + authorization);
-        auths.add(authorization.getBytes());
+        auths.add(authorization.getBytes(Constants.UTF8));
       } else {
         if (auths.size() > 0) {
-          log.debug("removing authorization " + new String(auths.remove(0)));
+          log.debug("removing authorization " + new String(auths.remove(0), Constants.UTF8));
         }
       }
       conn.securityOperations().changeUserAuthorizations(userName, new Authorizations(auths));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
index 8278843..698b0c0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
@@ -49,7 +49,7 @@ public class CheckBalance extends Test {
       String location = entry.getKey().getColumnQualifier().toString();
       Long count = counts.get(location);
       if (count == null)
-        count = new Long(0);
+        count = Long.valueOf(0);
       counts.put(location, count + 1);
     }
     double total = 0.;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
index 609bbb0..de4961e 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
@@ -48,7 +48,7 @@ public class StopTabletServer extends Test {
           Collections.sort(children);
           Stat stat = new Stat();
           byte[] data = rdr.getData(base + "/" + child + "/" + children.get(0), stat);
-          if (!"master".equals(new String(data))) {
+          if (!"master".equals(new String(data, Constants.UTF8))) {
             result.add(new TServerInstance(AddressUtil.parseAddress(child, Property.TSERV_CLIENTPORT), stat.getEphemeralOwner()));
           }
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
index 854ad0c..3a805ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
@@ -28,7 +28,7 @@ public class Commit extends Test {
     state.getMultiTableBatchWriter().flush();
     
     log.debug("Committed " + state.getLong("numWrites") + " writes.  Total writes: " + state.getLong("totalWrites"));
-    state.set("numWrites", new Long(0));
+    state.set("numWrites", Long.valueOf(0));
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
index 86df45d..a23426e 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
@@ -86,9 +86,9 @@ public class ImageFixture extends Fixture {
       log.debug("Configured locality groups for " + imageTableName + " groups = " + groups);
     }
     
-    state.set("numWrites", new Long(0));
-    state.set("totalWrites", new Long(0));
-    state.set("verified", new Integer(0));
+    state.set("numWrites", Long.valueOf(0));
+    state.set("totalWrites", Long.valueOf(0));
+    state.set("verified", Integer.valueOf(0));
     state.set("lastIndexRow", new Text(""));
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
index b8c05d3..ba0ed73 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
@@ -18,11 +18,12 @@ package org.apache.accumulo.test.randomwalk.image;
 
 import java.security.MessageDigest;
 import java.util.Iterator;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 import java.util.UUID;
-import java.util.Map.Entry;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
@@ -57,7 +58,7 @@ public class Verify extends Test {
     String uuid = UUID.randomUUID().toString();
     
     MessageDigest alg = MessageDigest.getInstance("SHA-1");
-    alg.update(uuid.getBytes());
+    alg.update(uuid.getBytes(Constants.UTF8));
     
     indexScanner.setRange(new Range(new Text(alg.digest()), null));
     indexScanner.setBatchSize(numVerifications);
@@ -86,7 +87,7 @@ public class Verify extends Test {
     
     int verified = ((Integer) state.get("verified")).intValue() + numVerifications;
     log.debug("Verified " + numVerifications + " - Total " + verified);
-    state.set("verified", new Integer(verified));
+    state.set("verified", Integer.valueOf(verified));
   }
   
   public void verifyRow(Scanner scanner, String row) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
index 4206148..32d3a72 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
@@ -21,6 +21,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.UUID;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.data.Mutation;
@@ -60,7 +61,7 @@ public class Write extends Test {
     m.put(CONTENT_COLUMN_FAMILY, IMAGE_COLUMN_QUALIFIER, new Value(imageBytes));
     
     // store size
-    m.put(META_COLUMN_FAMILY, new Text("size"), new Value(String.format("%d", numBytes).getBytes()));
+    m.put(META_COLUMN_FAMILY, new Text("size"), new Value(String.format("%d", numBytes).getBytes(Constants.UTF8)));
     
     // store hash
     MessageDigest alg = MessageDigest.getInstance("SHA-1");
@@ -74,7 +75,7 @@ public class Write extends Test {
     state.set("totalWrites", totalWrites);
     
     // set count
-    m.put(META_COLUMN_FAMILY, COUNT_COLUMN_QUALIFIER, new Value(String.format("%d", totalWrites).getBytes()));
+    m.put(META_COLUMN_FAMILY, COUNT_COLUMN_QUALIFIER, new Value(String.format("%d", totalWrites).getBytes(Constants.UTF8)));
     
     // add mutation
     imagesBW.addMutation(m);
@@ -82,7 +83,7 @@ public class Write extends Test {
     // now add mutation to index
     Text row = new Text(hash);
     m = new Mutation(row);
-    m.put(META_COLUMN_FAMILY, UUID_COLUMN_QUALIFIER, new Value(uuid.getBytes()));
+    m.put(META_COLUMN_FAMILY, UUID_COLUMN_QUALIFIER, new Value(uuid.getBytes(Constants.UTF8)));
     
     indexBW.addMutation(m);
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
index 341ac02..1153634 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
@@ -33,7 +33,7 @@ public class Commit extends Test {
     log.debug("Committed " + numWrites + " writes.  Total writes: " + totalWrites);
     
     state.set("totalWrites", totalWrites);
-    state.set("numWrites", new Long(0));
+    state.set("numWrites", Long.valueOf(0));
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
index acbb95d..5a2172d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
@@ -70,6 +70,6 @@ public class CopyTable extends Test {
     log.debug("dropped " + srcTableName);
     
     nextId++;
-    state.set("nextId", new Integer(nextId));
+    state.set("nextId", Integer.valueOf(nextId));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
index e64b342..5f37913 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
@@ -45,6 +45,6 @@ public class CreateTable extends Test {
     }
     
     nextId++;
-    state.set("nextId", new Integer(nextId));
+    state.set("nextId", Integer.valueOf(nextId));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
index ee0fff6..1755acc 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
@@ -34,9 +34,9 @@ public class MultiTableFixture extends Fixture {
     String hostname = InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_");
     
     state.set("tableNamePrefix", String.format("multi_%s_%s_%d", hostname, state.getPid(), System.currentTimeMillis()));
-    state.set("nextId", new Integer(0));
-    state.set("numWrites", new Long(0));
-    state.set("totalWrites", new Long(0));
+    state.set("nextId", Integer.valueOf(0));
+    state.set("numWrites", Long.valueOf(0));
+    state.set("totalWrites", Long.valueOf(0));
     state.set("tableList", new ArrayList<String>());
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
index cf23e32..0b9c062 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
@@ -22,6 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.UUID;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
@@ -70,7 +71,7 @@ public class Write extends Test {
     m.put(meta, new Text("payload"), new Value(payloadBytes));
     
     // store size
-    m.put(meta, new Text("size"), new Value(String.format("%d", numBytes).getBytes()));
+    m.put(meta, new Text("size"), new Value(String.format("%d", numBytes).getBytes(Constants.UTF8)));
     
     // store hash
     MessageDigest alg = MessageDigest.getInstance("SHA-1");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
index 685b05d..3f71ec7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.test.randomwalk.security;
 import java.io.IOException;
 import java.util.Map;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.SystemPermission;
@@ -76,7 +77,7 @@ public class SecurityHelper {
   }
   
   public static void setSysUserPass(State state, byte[] sysUserPass) {
-    log.debug("Setting system user pass to " + new String(sysUserPass));
+    log.debug("Setting system user pass to " + new String(sysUserPass, Constants.UTF8));
     state.set(masterPass, sysUserPass);
     state.set(masterPass + "time", System.currentTimeMillis());
     
@@ -91,7 +92,7 @@ public class SecurityHelper {
   }
   
   public static void setTabUserPass(State state, byte[] tabUserPass) {
-    log.debug("Setting table user pass to " + new String(tabUserPass));
+    log.debug("Setting table user pass to " + new String(tabUserPass, Constants.UTF8));
     state.set(tUserPass, tabUserPass);
     state.set(tUserPass + "time", System.currentTimeMillis());
   }
@@ -177,7 +178,7 @@ public class SecurityHelper {
   public static void increaseAuthMap(State state, String s, int increment) {
     Integer curVal = getAuthsMap(state).get(s);
     if (curVal == null) {
-      curVal = new Integer(0);
+      curVal = Integer.valueOf(0);
       getAuthsMap(state).put(s, curVal);
     }
     curVal += increment;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
index a636355..7524f92 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
@@ -24,6 +24,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.UUID;
 
+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.BatchWriter;
@@ -89,7 +90,7 @@ public class TableOp extends Test {
           if (!canRead && !ambiguousZone)
             throw new AccumuloException("Was able to read when I shouldn't have had the perm with connection user " + conn.whoami() + " table " + tableName);
           for (Entry<String,Integer> entry : WalkingSecurity.get(state).getAuthsMap().entrySet()) {
-            if (auths.contains(entry.getKey().getBytes()))
+            if (auths.contains(entry.getKey().getBytes(Constants.UTF8)))
               seen = seen - entry.getValue();
           }
           if (seen != 0 && !ambiguousAuths)
@@ -146,7 +147,7 @@ public class TableOp extends Test {
         String key = WalkingSecurity.get(state).getLastKey() + "1";
         Mutation m = new Mutation(new Text(key));
         for (String s : WalkingSecurity.get(state).getAuthsArray()) {
-          m.put(new Text(), new Text(), new ColumnVisibility(s), new Value("value".getBytes()));
+          m.put(new Text(), new Text(), new ColumnVisibility(s), new Value("value".getBytes(Constants.UTF8)));
         }
         BatchWriter writer = null;
         try {
@@ -204,7 +205,7 @@ public class TableOp extends Test {
         f.startDefaultLocalityGroup();
         fs.mkdirs(fail);
         for (Key k : keys)
-          f.append(k, new Value("Value".getBytes()));
+          f.append(k, new Value("Value".getBytes(Constants.UTF8)));
         f.close();
         try {
           conn.tableOperations().importDirectory(tableName, dir.toString(), fail.toString(), true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
index bd97dd4..992374a 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
@@ -363,7 +363,7 @@ public class WalkingSecurity extends SecurityOperation implements Authorizor, Au
   public void increaseAuthMap(String s, int increment) {
     Integer curVal = getAuthsMap().get(s);
     if (curVal == null) {
-      curVal = new Integer(0);
+      curVal = Integer.valueOf(0);
       getAuthsMap().put(s, curVal);
     }
     curVal += increment;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java
index 8abfb39..cd1ccab 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java
@@ -29,7 +29,7 @@ public class Commit extends Test {
     state.getMultiTableBatchWriter().flush();
     
     log.debug("Committed " + state.getLong("numWrites") + " writes.  Total writes: " + state.getLong("totalWrites"));
-    state.set("numWrites", new Long(0));
+    state.set("numWrites", Long.valueOf(0));
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
index eb45966..8a2f8f4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
@@ -70,7 +70,7 @@ public class MapRedVerifyTool extends Configured implements Tool {
     
     public void writeMutation(Context output, int start, int end) throws IOException, InterruptedException {
       Mutation m = new Mutation(new Text(String.format("%010d", start)));
-      m.put(new Text(String.format("%010d", end)), new Text(""), new Value("".getBytes()));
+      m.put(new Text(String.format("%010d", end)), new Text(""), new Value(new byte[0]));
       output.write(null, m);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
index b7377b7..1573c3b 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
@@ -51,8 +51,8 @@ public class SequentialFixture extends Fixture {
     }
     conn.tableOperations().setProperty(seqTableName, "table.scan.max.memory", "1K");
     
-    state.set("numWrites", new Long(0));
-    state.set("totalWrites", new Long(0));
+    state.set("numWrites", Long.valueOf(0));
+    state.set("totalWrites", Long.valueOf(0));
   }
   
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java
index 671055b..1c3b882 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.test.randomwalk.sequential;
 
 import java.util.Properties;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
@@ -41,7 +42,7 @@ public class Write extends Test {
     state.set("totalWrites", totalWrites);
     
     Mutation m = new Mutation(new Text(String.format("%010d", totalWrites)));
-    m.put(new Text("cf"), new Text("cq"), new Value(new String("val").getBytes()));
+    m.put(new Text("cf"), new Text("cq"), new Value("val".getBytes(Constants.UTF8)));
     bw.addMutation(m);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
index b3bbb15..fb01058 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -120,7 +121,7 @@ public class BulkInsert extends Test {
       log.debug("Bulk inserting document " + docID);
     }
     
-    state.set("nextDocID", new Long(nextDocID));
+    state.set("nextDocID", Long.valueOf(nextDocID));
     
     dataWriter.close();
     indexWriter.close();
@@ -161,13 +162,13 @@ public class BulkInsert extends Test {
   
   private void sort(State state, FileSystem fs, String tableName, String seqFile, String outputDir, String workDir, int maxSplits) throws Exception {
     
-    PrintStream out = new PrintStream(new BufferedOutputStream(fs.create(new Path(workDir + "/splits.txt"))));
+    PrintStream out = new PrintStream(new BufferedOutputStream(fs.create(new Path(workDir + "/splits.txt"))), false, Constants.UTF8.name());
     
     Connector conn = state.getConnector();
     
     Collection<Text> splits = conn.tableOperations().listSplits(tableName, maxSplits);
     for (Text split : splits)
-      out.println(new String(Base64.encodeBase64(TextUtil.getBytes(split))));
+      out.println(new String(Base64.encodeBase64(TextUtil.getBytes(split)), Constants.UTF8));
     
     out.close();
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
index a47da30..812112e 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Properties;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.test.randomwalk.State;
@@ -66,7 +67,7 @@ public class ExportIndex extends Test {
     long t3 = System.currentTimeMillis();
 
     // copy files
-    BufferedReader reader = new BufferedReader(new InputStreamReader(fs.open(new Path(exportDir, "distcp.txt"))));
+    BufferedReader reader = new BufferedReader(new InputStreamReader(fs.open(new Path(exportDir, "distcp.txt")), Constants.UTF8));
     String file = null;
     while ((file = reader.readLine()) != null) {
       Path src = new Path(file);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
index 672dd2e..8e81acb 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
@@ -50,7 +50,7 @@ public class Insert extends Test {
     
     log.debug("Inserted document " + docID);
     
-    state.set("nextDocID", new Long(nextDocID));
+    state.set("nextDocID", Long.valueOf(nextDocID));
   }
   
   static String insertRandomDocument(long did, BatchWriter dataWriter, BatchWriter indexWriter, String indexTableName, String dataTableName, int numPartitions,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
index 97e33b4..996bd73 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
@@ -75,10 +75,10 @@ public class ShardFixture extends Fixture {
     
     state.set("indexTableName", String.format("ST_index_%s_%s_%d", hostname, pid, System.currentTimeMillis()));
     state.set("docTableName", String.format("ST_docs_%s_%s_%d", hostname, pid, System.currentTimeMillis()));
-    state.set("numPartitions", new Integer(numPartitions));
+    state.set("numPartitions", Integer.valueOf(numPartitions));
     state.set("cacheIndex", rand.nextDouble() < .5);
     state.set("rand", rand);
-    state.set("nextDocID", new Long(0));
+    state.set("nextDocID", Long.valueOf(0));
     
     Connector conn = state.getConnector();
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java b/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java
index d941283..f4d1219 100644
--- a/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java
+++ b/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java
@@ -20,6 +20,7 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Connector;
@@ -101,7 +102,7 @@ public class Ingest extends ScaleTest {
     while (count < numIngestEntries) {
       count++;
       long rowId = ContinuousIngest.genLong(minRow, maxRow, r);
-      Mutation m = ContinuousIngest.genMutation(rowId, r.nextInt(maxColF), r.nextInt(maxColQ), cv, ingestInstanceId.getBytes(), count, null, r, false);
+      Mutation m = ContinuousIngest.genMutation(rowId, r.nextInt(maxColF), r.nextInt(maxColQ), cv, ingestInstanceId.getBytes(Constants.UTF8), count, null, r, false);
       totalBytes += m.numBytes();
       try {
         bw.addMutation(m);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
index a13f2be..41c765d 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
@@ -48,6 +48,15 @@ public class TraceRunnable implements Runnable, Comparable<TraceRunnable> {
     }
   }
   
+  @Override
+  public boolean equals(Object o) {
+    if (o instanceof TraceRunnable) {
+      return 0 == this.compareTo((TraceRunnable) o);
+    }
+    
+    return false;
+  }
+  
   @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public int compareTo(TraceRunnable o) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
index d6db906..049b2a2 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.trace.instrument.receivers;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,7 @@ public class ZooSpanClient extends SendSpansViaThrift {
   private static final Logger log = Logger.getLogger(ZooSpanClient.class);
   private static final int TOTAL_TIME_WAIT_CONNECT_MS = 10 * 1000;
   private static final int TIME_WAIT_CONNECT_CHECK_MS = 100;
+  private static final Charset UTF8 = Charset.forName("UTF-8");
   
   ZooKeeper zoo = null;
   final String path;
@@ -108,7 +110,7 @@ public class ZooSpanClient extends SendSpansViaThrift {
       List<String> hosts = new ArrayList<String>();
       for (String child : children) {
         byte[] data = zoo.getData(path + "/" + child, null, null);
-        hosts.add(new String(data));
+        hosts.add(new String(data, UTF8));
       }
       this.hosts.clear();
       this.hosts.addAll(hosts);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
index 78df4b6..7b5e970 100644
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
+++ b/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
@@ -17,8 +17,6 @@
 package org.apache.accumulo.trace.instrument;
 
 import org.junit.Assert;
-
-import org.apache.accumulo.trace.instrument.CountSampler;
 import org.junit.Test;
 
 public class CountSamplerTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
index 8f88469..2e5aaa5 100644
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
+++ b/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.trace.instrument;
 
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
 import org.junit.Test;
 
 public class PerformanceTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b11a0361/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
index 0288241..7dbdc83 100644
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
+++ b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
@@ -28,9 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.trace.instrument.receivers.SpanReceiver;
 import org.apache.accumulo.trace.instrument.thrift.TraceWrap;
 import org.apache.accumulo.trace.thrift.TInfo;


Mime
View raw message