accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [26/66] [abbrv] accumulo git commit: ACCUMULO-3451 Format master branch (1.7.0-SNAPSHOT)
Date Fri, 09 Jan 2015 02:44:30 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
index 17e1c1d..365cee4 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
@@ -51,11 +51,11 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
 public class IntersectingIteratorTest extends TestCase {
-  
+
   private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
   private static final Logger log = Logger.getLogger(IntersectingIterator.class);
   private static IteratorEnvironment env = new DefaultIteratorEnvironment();
-  
+
   TreeMap<Key,Value> map;
   HashSet<Text> docs = new HashSet<Text>();
   Text[] columnFamilies;
@@ -63,20 +63,20 @@ public class IntersectingIteratorTest extends TestCase {
   Text[] otherColumnFamilies;
   Text[] searchFamilies;
   boolean[] notFlags;
-  
+
   int docid = 0;
-  
+
   static {
     log.setLevel(Level.OFF);
   }
-  
+
   private TreeMap<Key,Value> createSortedMap(float hitRatio, int numRows, int numDocsPerRow, Text[] columnFamilies, Text[] otherColumnFamilies,
       HashSet<Text> docs, Text[] negatedColumns) {
     Random r = new Random();
     Value v = new Value(new byte[0]);
     TreeMap<Key,Value> map = new TreeMap<Key,Value>();
     boolean[] negateMask = new boolean[columnFamilies.length];
-    
+
     for (int i = 0; i < columnFamilies.length; i++) {
       negateMask[i] = false;
       if (negatedColumns.length > 0)
@@ -113,33 +113,33 @@ public class IntersectingIteratorTest extends TestCase {
     }
     return map;
   }
-  
+
   private SortedKeyValueIterator<Key,Value> createIteratorStack(float hitRatio, int numRows, int numDocsPerRow, Text[] columnFamilies,
       Text[] otherColumnFamilies, HashSet<Text> docs) throws IOException {
     Text nullText[] = new Text[0];
     return createIteratorStack(hitRatio, numRows, numDocsPerRow, columnFamilies, otherColumnFamilies, docs, nullText);
   }
-  
+
   private SortedKeyValueIterator<Key,Value> createIteratorStack(float hitRatio, int numRows, int numDocsPerRow, Text[] columnFamilies,
       Text[] otherColumnFamilies, HashSet<Text> docs, Text[] negatedColumns) throws IOException {
     TreeMap<Key,Value> inMemoryMap = createSortedMap(hitRatio, numRows, numDocsPerRow, columnFamilies, otherColumnFamilies, docs, negatedColumns);
     return new SortedMapIterator(inMemoryMap);
   }
-  
+
   private void cleanup() throws IOException {
     docid = 0;
   }
-  
+
   public void testNull() {}
-  
+
   @Override
   public void setUp() {
     Logger.getRootLogger().setLevel(Level.ERROR);
   }
-  
+
   private static final int NUM_ROWS = 10;
   private static final int NUM_DOCIDS = 1000;
-  
+
   public void test1() throws IOException {
     columnFamilies = new Text[2];
     columnFamilies[0] = new Text("C");
@@ -149,7 +149,7 @@ public class IntersectingIteratorTest extends TestCase {
     otherColumnFamilies[1] = new Text("B");
     otherColumnFamilies[2] = new Text("D");
     otherColumnFamilies[3] = new Text("F");
-    
+
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class);
@@ -167,7 +167,7 @@ public class IntersectingIteratorTest extends TestCase {
     assertTrue(hitCount == docs.size());
     cleanup();
   }
-  
+
   public void test2() throws IOException {
     columnFamilies = new Text[3];
     columnFamilies[0] = new Text("A");
@@ -178,7 +178,7 @@ public class IntersectingIteratorTest extends TestCase {
     otherColumnFamilies[1] = new Text("C");
     otherColumnFamilies[2] = new Text("D");
     otherColumnFamilies[3] = new Text("F");
-    
+
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class);
@@ -196,7 +196,7 @@ public class IntersectingIteratorTest extends TestCase {
     assertTrue(hitCount == docs.size());
     cleanup();
   }
-  
+
   public void test3() throws IOException {
     columnFamilies = new Text[6];
     columnFamilies[0] = new Text("C");
@@ -210,7 +210,7 @@ public class IntersectingIteratorTest extends TestCase {
     otherColumnFamilies[1] = new Text("B");
     otherColumnFamilies[2] = new Text("D");
     otherColumnFamilies[3] = new Text("F");
-    
+
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     SortedKeyValueIterator<Key,Value> source2 = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
@@ -233,7 +233,7 @@ public class IntersectingIteratorTest extends TestCase {
     assertTrue(hitCount == docs.size());
     cleanup();
   }
-  
+
   public void test4() throws IOException {
     columnFamilies = new Text[3];
     notFlags = new boolean[3];
@@ -251,7 +251,7 @@ public class IntersectingIteratorTest extends TestCase {
     otherColumnFamilies[1] = new Text("C");
     otherColumnFamilies[2] = new Text("D");
     otherColumnFamilies[3] = new Text("F");
-    
+
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs, negatedColumns);
     IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class);
@@ -269,7 +269,7 @@ public class IntersectingIteratorTest extends TestCase {
     assertTrue(hitCount == docs.size());
     cleanup();
   }
-  
+
   public void test6() throws IOException {
     columnFamilies = new Text[1];
     columnFamilies[0] = new Text("C");
@@ -278,7 +278,7 @@ public class IntersectingIteratorTest extends TestCase {
     otherColumnFamilies[1] = new Text("B");
     otherColumnFamilies[2] = new Text("D");
     otherColumnFamilies[3] = new Text("F");
-    
+
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class);
@@ -296,7 +296,7 @@ public class IntersectingIteratorTest extends TestCase {
     assertTrue(hitCount == docs.size());
     cleanup();
   }
-  
+
   public void testWithBatchScanner() throws Exception {
     Value empty = new Value(new byte[] {});
     MockInstance inst = new MockInstance("mockabye");
@@ -308,7 +308,7 @@ public class IntersectingIteratorTest extends TestCase {
     m.put("15qh", "5000000000000000", empty);
     bw.addMutation(m);
     bw.close();
-    
+
     BatchScanner bs = connector.createBatchScanner("index", Authorizations.EMPTY, 10);
     IteratorSetting ii = new IteratorSetting(20, IntersectingIterator.class);
     IntersectingIterator.setColumnFamilies(ii, new Text[] {new Text("rvy"), new Text("15qh")});

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
index bb59c84..af610ca 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
@@ -35,27 +35,27 @@ import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
 
 public class LargeRowFilterTest extends TestCase {
-  
+
   private String genRow(int r) {
     return String.format("row%03d", r);
   }
-  
+
   private String genCQ(int cq) {
     return String.format("cf%03d", cq);
   }
-  
+
   private void genRow(TreeMap<Key,Value> testData, int row, int startCQ, int stopCQ) {
     for (int cq = startCQ; cq < stopCQ; cq++) {
       testData.put(new Key(genRow(row), "cf001", genCQ(cq), 5), new Value(("v" + row + "_" + cq).getBytes()));
     }
   }
-  
+
   private void genTestData(TreeMap<Key,Value> testData, int numRows) {
     for (int i = 1; i <= numRows; i++) {
       genRow(testData, i, 0, i);
     }
   }
-  
+
   private LargeRowFilter setupIterator(TreeMap<Key,Value> testData, int maxColumns, IteratorScope scope) throws IOException {
     SortedMapIterator smi = new SortedMapIterator(testData);
     LargeRowFilter lrfi = new LargeRowFilter();
@@ -64,133 +64,133 @@ public class LargeRowFilterTest extends TestCase {
     lrfi.init(new ColumnFamilySkippingIterator(smi), is.getOptions(), new RowDeletingIteratorTest.TestIE(scope, false));
     return lrfi;
   }
-  
+
   public void testBasic() throws Exception {
     TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
-    
+
     genTestData(testData, 20);
-    
+
     for (int i = 1; i <= 20; i++) {
       TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
       genTestData(expectedData, i);
-      
+
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
       lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
-      
+
       TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
-      
+
       while (lrfi.hasTop()) {
         filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
         lrfi.next();
       }
-      
+
       assertEquals(expectedData, filteredData);
     }
   }
-  
+
   public void testSeek() throws Exception {
     TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
-    
+
     genTestData(testData, 20);
-    
+
     for (int i = 1; i <= 20; i++) {
       TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
       genTestData(expectedData, i);
-      
+
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
-      
+
       TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
-      
+
       // seek to each row... rows that exceed max columns should be filtered
       for (int j = 1; j <= i; j++) {
         lrfi.seek(new Range(genRow(j), genRow(j)), LocalityGroupUtil.EMPTY_CF_SET, false);
-        
+
         while (lrfi.hasTop()) {
           assertEquals(genRow(j), lrfi.getTopKey().getRow().toString());
           filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
           lrfi.next();
         }
       }
-      
+
       assertEquals(expectedData, filteredData);
     }
   }
-  
+
   public void testSeek2() throws Exception {
     TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
-    
+
     genTestData(testData, 20);
-    
+
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.scan);
-    
+
     // test seeking to the middle of a row
     lrfi.seek(new Range(new Key(genRow(15), "cf001", genCQ(4), 5), true, new Key(genRow(15)).followingKey(PartialKey.ROW), false),
         LocalityGroupUtil.EMPTY_CF_SET, false);
     assertFalse(lrfi.hasTop());
-    
+
     lrfi.seek(new Range(new Key(genRow(10), "cf001", genCQ(4), 5), true, new Key(genRow(10)).followingKey(PartialKey.ROW), false),
         LocalityGroupUtil.EMPTY_CF_SET, false);
     TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
     genRow(expectedData, 10, 4, 10);
-    
+
     TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
     }
-    
+
     assertEquals(expectedData, filteredData);
   }
-  
+
   public void testCompaction() throws Exception {
     TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
-    
+
     genTestData(testData, 20);
-    
+
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.majc);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
-    
+
     TreeMap<Key,Value> compactedData = new TreeMap<Key,Value>();
     while (lrfi.hasTop()) {
       compactedData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
     }
-    
+
     // compacted data should now contain suppression markers
     // add column to row that should be suppressed\
     genRow(compactedData, 15, 15, 16);
-    
+
     // scanning over data w/ higher max columns should not change behavior
     // because there are suppression markers.. if there was a bug and data
     // was not suppressed, increasing the threshold would expose the bug
     lrfi = setupIterator(compactedData, 20, IteratorScope.scan);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
-    
+
     // only expect to see 13 rows
     TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
     genTestData(expectedData, 13);
-    
+
     TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
     }
-    
+
     assertEquals(expectedData.size() + 8, compactedData.size());
     assertEquals(expectedData, filteredData);
-    
+
     // try seeking to the middle of row 15... row has data and suppression marker... this seeks past the marker but before the column
     lrfi.seek(new Range(new Key(genRow(15), "cf001", genCQ(4), 5), true, new Key(genRow(15)).followingKey(PartialKey.ROW), false),
         LocalityGroupUtil.EMPTY_CF_SET, false);
     assertFalse(lrfi.hasTop());
-    
+
     // test seeking w/ column families
     HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
     colfams.add(new ArrayByteSequence("cf001"));
     lrfi.seek(new Range(new Key(genRow(15), "cf001", genCQ(4), 5), true, new Key(genRow(15)).followingKey(PartialKey.ROW), false), colfams, true);
     assertFalse(lrfi.hasTop());
   }
-  
+
   // in other test data is generated in such a way that once a row
   // is suppressed, all subsequent rows are suppressed
   public void testSuppressInner() throws Exception {
@@ -199,21 +199,21 @@ public class LargeRowFilterTest extends TestCase {
     genRow(testData, 2, 0, 50);
     genRow(testData, 3, 0, 15);
     genRow(testData, 4, 0, 5);
-    
+
     TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
     genRow(expectedData, 1, 0, 2);
     genRow(expectedData, 4, 0, 5);
-    
+
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.scan);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
-    
+
     TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
     }
-    
+
     assertEquals(expectedData, filteredData);
-    
+
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
index 4521e55..d2dd6da 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
@@ -37,101 +37,101 @@ import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
 import org.apache.hadoop.io.Text;
 
 public class RowDeletingIteratorTest extends TestCase {
-  
+
   public static class TestIE implements IteratorEnvironment {
-    
+
     private IteratorScope scope;
     private boolean fmc;
-    
+
     public TestIE(IteratorScope scope, boolean fmc) {
       this.scope = scope;
       this.fmc = fmc;
     }
-    
+
     @Override
     public AccumuloConfiguration getConfig() {
       return null;
     }
-    
+
     @Override
     public IteratorScope getIteratorScope() {
       return scope;
     }
-    
+
     @Override
     public boolean isFullMajorCompaction() {
       return fmc;
     }
-    
+
     @Override
     public SortedKeyValueIterator<Key,Value> reserveMapFileReader(String mapFileName) throws IOException {
       return null;
     }
-    
+
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {}
-    
+
   }
-  
+
   Key nk(String row, String cf, String cq, long time) {
     return new Key(new Text(row), new Text(cf), new Text(cq), time);
   }
-  
+
   void put(TreeMap<Key,Value> tm, String row, String cf, String cq, long time, Value val) {
     tm.put(nk(row, cf, cq, time), val);
   }
-  
+
   void put(TreeMap<Key,Value> tm, String row, String cf, String cq, long time, String val) {
     put(tm, row, cf, cq, time, new Value(val.getBytes()));
   }
-  
+
   private void ane(RowDeletingIterator rdi, String row, String cf, String cq, long time, String val) {
     assertTrue(rdi.hasTop());
     assertEquals(nk(row, cf, cq, time), rdi.getTopKey());
     assertEquals(val, rdi.getTopValue().toString());
   }
-  
+
   public void test1() throws Exception {
-    
+
     TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v1");
     put(tm1, "r2", "cf1", "cq1", 5, "v1");
-    
+
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new SortedMapIterator(tm1), null, new TestIE(IteratorScope.scan, false));
-    
+
     rdi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     for (int i = 0; i < 5; i++) {
       rdi.seek(new Range(nk("r1", "cf1", "cq" + i, 5), null), new ArrayList<ByteSequence>(), false);
       ane(rdi, "r2", "cf1", "cq1", 5, "v1");
     }
-    
+
     rdi.seek(new Range(nk("r11", "cf1", "cq1", 5), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     put(tm1, "r2", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     rdi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     assertFalse(rdi.hasTop());
-    
+
     for (int i = 0; i < 5; i++) {
       rdi.seek(new Range(nk("r1", "cf1", "cq" + i, 5), null), new ArrayList<ByteSequence>(), false);
       assertFalse(rdi.hasTop());
     }
-    
+
     put(tm1, "r0", "cf1", "cq1", 5, "v1");
     rdi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r0", "cf1", "cq1", 5, "v1");
     rdi.next();
     assertFalse(rdi.hasTop());
-    
+
   }
-  
+
   public void test2() throws Exception {
-    
+
     TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
@@ -139,99 +139,99 @@ public class RowDeletingIteratorTest extends TestCase {
     put(tm1, "r1", "cf1", "cq4", 5, "v1");
     put(tm1, "r1", "cf1", "cq5", 15, "v1");
     put(tm1, "r2", "cf1", "cq1", 5, "v1");
-    
+
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new SortedMapIterator(tm1), null, new TestIE(IteratorScope.scan, false));
-    
+
     rdi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "cf1", "cq3", 15, "v1");
     rdi.next();
     ane(rdi, "r1", "cf1", "cq5", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "cf1", "cq1", 5), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "cf1", "cq3", 15, "v1");
     rdi.next();
     ane(rdi, "r1", "cf1", "cq5", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "cf1", "cq4", 5), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "cf1", "cq5", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "cf1", "cq5", 20), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "cf1", "cq5", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "cf1", "cq9", 20), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
   }
-  
+
   public void test3() throws Exception {
-    
+
     TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r2", "", "cq1", 5, "v1");
     put(tm1, "r2", "cf1", "cq1", 5, "v1");
-    
+
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new ColumnFamilySkippingIterator(new SortedMapIterator(tm1)), null, new TestIE(IteratorScope.scan, false));
-    
+
     HashSet<ByteSequence> cols = new HashSet<ByteSequence>();
     cols.add(new ArrayByteSequence("cf1".getBytes()));
-    
+
     rdi.seek(new Range(), cols, true);
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     cols.clear();
     cols.add(new ArrayByteSequence("".getBytes()));
     rdi.seek(new Range(), cols, false);
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     cols.clear();
     rdi.seek(new Range(), cols, false);
     ane(rdi, "r2", "", "cq1", 5, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
   }
-  
+
   public void test4() throws Exception {
-    
+
     TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 15, "v1");
     put(tm1, "r1", "cf1", "cq4", 5, "v1");
     put(tm1, "r2", "cf1", "cq1", 5, "v1");
-    
+
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new SortedMapIterator(tm1), null, new TestIE(IteratorScope.minc, false));
-    
+
     rdi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE.toString());
     rdi.next();
     ane(rdi, "r1", "cf1", "cq3", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "cf1", "cq3", 20), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "cf1", "cq3", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
     rdi.seek(new Range(nk("r1", "", "", 42), null), new ArrayList<ByteSequence>(), false);
     ane(rdi, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE.toString());
     rdi.next();
     ane(rdi, "r1", "cf1", "cq3", 15, "v1");
     rdi.next();
     ane(rdi, "r2", "cf1", "cq1", 5, "v1");
-    
+
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
index 958ac18..461f609 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
@@ -50,7 +50,7 @@ import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 
 public class RowFilterTest {
@@ -67,7 +67,7 @@ public class RowFilterTest {
       if (rowIterator.hasTop()) {
         firstKey = new Key(rowIterator.getTopKey());
       }
-      
+
       while (rowIterator.hasTop()) {
         sum += Integer.parseInt(rowIterator.getTopValue().toString());
         rowIterator.next();
@@ -198,7 +198,7 @@ public class RowFilterTest {
     }
     IteratorSetting is = new IteratorSetting(40, SummingRowFilter.class);
     conn.tableOperations().attachIterator("table1", is);
-    
+
     Scanner scanner = conn.createScanner("table1", Authorizations.EMPTY);
     assertEquals(new HashSet<String>(Arrays.asList("2", "3")), getRows(scanner));
 
@@ -226,7 +226,7 @@ public class RowFilterTest {
     scanner.fetchColumn(new Text("cf1"), new Text("cq2"));
     scanner.fetchColumn(new Text("cf1"), new Text("cq4"));
     assertEquals(new HashSet<String>(Arrays.asList("4")), getRows(scanner));
-    
+
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
index 04190d1..730b4cb 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
@@ -42,7 +42,7 @@ public class VersioningIteratorTest {
   private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
   private static final Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
   private static final Logger log = Logger.getLogger(VersioningIteratorTest.class);
-  
+
   void createTestData(TreeMap<Key,Value> tm, Text colf, Text colq) {
     for (int i = 0; i < 2; i++) {
       for (long j = 0; j < 20; j++) {
@@ -50,38 +50,38 @@ public class VersioningIteratorTest {
         tm.put(k, new Value(encoder.encode(j)));
       }
     }
-    
+
     assertTrue("Initial size was " + tm.size(), tm.size() == 40);
   }
-  
+
   TreeMap<Key,Value> iteratorOverTestData(VersioningIterator it) throws IOException {
     TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
     while (it.hasTop()) {
       tmOut.put(it.getTopKey(), it.getTopValue());
       it.next();
     }
-    
+
     return tmOut;
   }
-  
+
   @Test
   public void test1() {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     try {
       VersioningIterator it = new VersioningIterator();
       IteratorSetting is = new IteratorSetting(1, VersioningIterator.class);
       VersioningIterator.setMaxVersions(is, 3);
       it.init(new SortedMapIterator(tm), is.getOptions(), null);
       it.seek(new Range(), EMPTY_COL_FAMS, false);
-      
+
       TreeMap<Key,Value> tmOut = iteratorOverTestData(it);
-      
+
       for (Entry<Key,Value> e : tmOut.entrySet()) {
         assertTrue(e.getValue().get().length == 8);
         assertTrue(16 < encoder.decode(e.getValue().get()));
@@ -94,30 +94,30 @@ public class VersioningIteratorTest {
       assertFalse(true);
     }
   }
-  
+
   @Test
   public void test2() {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     try {
       VersioningIterator it = new VersioningIterator();
       IteratorSetting is = new IteratorSetting(1, VersioningIterator.class);
       VersioningIterator.setMaxVersions(is, 3);
       it.init(new SortedMapIterator(tm), is.getOptions(), null);
-      
+
       // after doing this seek, should only get two keys for row 1
       // since we are seeking to the middle of the most recent
       // three keys
       Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 18);
       it.seek(new Range(seekKey, null), EMPTY_COL_FAMS, false);
-      
+
       TreeMap<Key,Value> tmOut = iteratorOverTestData(it);
-      
+
       for (Entry<Key,Value> e : tmOut.entrySet()) {
         assertTrue(e.getValue().get().length == 8);
         assertTrue(16 < encoder.decode(e.getValue().get()));
@@ -130,48 +130,48 @@ public class VersioningIteratorTest {
       assertFalse(true);
     }
   }
-  
+
   @Test
   public void test3() {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     try {
       VersioningIterator it = new VersioningIterator();
       IteratorSetting is = new IteratorSetting(1, VersioningIterator.class);
       VersioningIterator.setMaxVersions(is, 3);
       it.init(new SortedMapIterator(tm), is.getOptions(), null);
-      
+
       // after doing this seek, should get zero keys for row 1
       Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 15);
       it.seek(new Range(seekKey, null), EMPTY_COL_FAMS, false);
-      
+
       TreeMap<Key,Value> tmOut = iteratorOverTestData(it);
-      
+
       for (Entry<Key,Value> e : tmOut.entrySet()) {
         assertTrue(e.getValue().get().length == 8);
         assertTrue(16 < encoder.decode(e.getValue().get()));
       }
-      
+
       assertTrue("size after seeking past versions was " + tmOut.size(), tmOut.size() == 0);
-      
+
       // after doing this seek, should get zero keys for row 0 and 3 keys for row 1
       seekKey = new Key(new Text(String.format("%03d", 0)), colf, colq, 15);
       it.seek(new Range(seekKey, null), EMPTY_COL_FAMS, false);
-      
+
       tmOut = iteratorOverTestData(it);
-      
+
       for (Entry<Key,Value> e : tmOut.entrySet()) {
         assertTrue(e.getValue().get().length == 8);
         assertTrue(16 < encoder.decode(e.getValue().get()));
       }
-      
+
       assertTrue("size after seeking past versions was " + tmOut.size(), tmOut.size() == 3);
-      
+
     } catch (IOException e) {
       assertFalse(true);
     } catch (Exception e) {
@@ -179,16 +179,16 @@ public class VersioningIteratorTest {
       assertFalse(true);
     }
   }
-  
+
   @Test
   public void test4() {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     for (int i = 1; i <= 30; i++) {
       try {
         VersioningIterator it = new VersioningIterator();
@@ -196,9 +196,9 @@ public class VersioningIteratorTest {
         VersioningIterator.setMaxVersions(is, i);
         it.init(new SortedMapIterator(tm), is.getOptions(), null);
         it.seek(new Range(), EMPTY_COL_FAMS, false);
-        
+
         TreeMap<Key,Value> tmOut = iteratorOverTestData(it);
-        
+
         assertTrue("size after keeping " + i + " versions was " + tmOut.size(), tmOut.size() == Math.min(40, 2 * i));
       } catch (IOException e) {
         assertFalse(true);
@@ -208,51 +208,51 @@ public class VersioningIteratorTest {
       }
     }
   }
-  
+
   @Test
   public void test5() throws IOException {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     VersioningIterator it = new VersioningIterator();
     IteratorSetting is = new IteratorSetting(1, VersioningIterator.class);
     VersioningIterator.setMaxVersions(is, 3);
     it.init(new SortedMapIterator(tm), is.getOptions(), null);
-    
+
     Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 19);
     it.seek(new Range(seekKey, false, null, true), EMPTY_COL_FAMS, false);
-    
+
     assertTrue(it.hasTop());
     assertTrue(it.getTopKey().getTimestamp() == 18);
-    
+
   }
-  
+
   @Test
   public void test6() throws IOException {
     Text colf = new Text("a");
     Text colq = new Text("b");
-    
+
     TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    
+
     createTestData(tm, colf, colq);
-    
+
     VersioningIterator it = new VersioningIterator();
     IteratorSetting is = new IteratorSetting(1, VersioningIterator.class);
     VersioningIterator.setMaxVersions(is, 3);
     it.init(new SortedMapIterator(tm), is.getOptions(), null);
     VersioningIterator it2 = it.deepCopy(null);
-    
+
     Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 19);
     it.seek(new Range(seekKey, false, null, true), EMPTY_COL_FAMS, false);
     it2.seek(new Range(seekKey, false, null, true), EMPTY_COL_FAMS, false);
-    
+
     assertTrue(it.hasTop());
     assertTrue(it.getTopKey().getTimestamp() == 18);
-    
+
     assertTrue(it2.hasTop());
     assertTrue(it2.getTopKey().getTimestamp() == 18);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
index 1804f6f..810c355 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
@@ -38,9 +38,9 @@ import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
 public class VisibilityFilterTest {
-  
+
   private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
-  
+
   private static final Text BAD = new Text("bad");
   private static final Text GOOD = new Text("good");
   private static final Text EMPTY_VIS = new Text("");
@@ -48,7 +48,7 @@ public class VisibilityFilterTest {
   private static final Text HIDDEN_VIS = new Text("abc&def&ghi");
   private static final Text BAD_VIS = new Text("&");
   private static final Value EMPTY_VALUE = new Value(new byte[0]);
-  
+
   private TreeMap<Key,Value> createUnprotectedSource(int numPublic, int numHidden) {
     TreeMap<Key,Value> source = new TreeMap<Key,Value>();
     for (int i = 0; i < numPublic; i++)
@@ -57,7 +57,7 @@ public class VisibilityFilterTest {
       source.put(new Key(new Text(String.format("%03d", i)), BAD, BAD, GOOD_VIS), EMPTY_VALUE);
     return source;
   }
-  
+
   private TreeMap<Key,Value> createPollutedSource(int numGood, int numBad) {
     TreeMap<Key,Value> source = new TreeMap<Key,Value>();
     for (int i = 0; i < numGood; i++)
@@ -66,7 +66,7 @@ public class VisibilityFilterTest {
       source.put(new Key(new Text(String.format("%03d", i)), BAD, BAD, BAD_VIS), EMPTY_VALUE);
     return source;
   }
-  
+
   private TreeMap<Key,Value> createSourceWithHiddenData(int numViewable, int numHidden) {
     TreeMap<Key,Value> source = new TreeMap<Key,Value>();
     for (int i = 0; i < numViewable; i++)
@@ -75,15 +75,15 @@ public class VisibilityFilterTest {
       source.put(new Key(new Text(String.format("%03d", i)), BAD, BAD, HIDDEN_VIS), EMPTY_VALUE);
     return source;
   }
-  
+
   private void verify(TreeMap<Key,Value> source, int expectedSourceSize, Map<String,String> options, Text expectedCF, Text expectedCQ, Text expectedCV,
       int expectedFinalCount) throws IOException {
     assertEquals(expectedSourceSize, source.size());
-    
+
     Filter filter = new VisibilityFilter();
     filter.init(new SortedMapIterator(source), options, null);
     filter.seek(new Range(), EMPTY_COL_FAMS, false);
-    
+
     int count = 0;
     while (filter.hasTop()) {
       count++;
@@ -96,82 +96,82 @@ public class VisibilityFilterTest {
     }
     assertEquals(expectedFinalCount, count);
   }
-  
+
   @Test
   public void testAllowValidLabelsOnly() throws IOException {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.filterInvalidLabelsOnly(is, true);
-    
+
     TreeMap<Key,Value> source = createPollutedSource(1, 2);
     verify(source, 3, is.getOptions(), GOOD, GOOD, GOOD_VIS, 1);
-    
+
     source = createPollutedSource(30, 500);
     verify(source, 530, is.getOptions(), GOOD, GOOD, GOOD_VIS, 30);
-    
+
     source = createPollutedSource(1000, 500);
     verify(source, 1500, is.getOptions(), GOOD, GOOD, GOOD_VIS, 1000);
   }
-  
+
   @Test
   public void testAllowBadLabelsOnly() throws IOException {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.setNegate(is, true);
     VisibilityFilter.filterInvalidLabelsOnly(is, true);
-    
+
     TreeMap<Key,Value> source = createPollutedSource(1, 2);
     verify(source, 3, is.getOptions(), BAD, BAD, BAD_VIS, 2);
-    
+
     source = createPollutedSource(30, 500);
     verify(source, 530, is.getOptions(), BAD, BAD, BAD_VIS, 500);
-    
+
     source = createPollutedSource(1000, 500);
     verify(source, 1500, is.getOptions(), BAD, BAD, BAD_VIS, 500);
   }
-  
+
   @Test
   public void testAllowAuthorizedLabelsOnly() throws IOException {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.setAuthorizations(is, new Authorizations("def"));
-    
+
     TreeMap<Key,Value> source = createSourceWithHiddenData(1, 2);
     verify(source, 3, is.getOptions(), GOOD, GOOD, GOOD_VIS, 1);
-    
+
     source = createSourceWithHiddenData(30, 500);
     verify(source, 530, is.getOptions(), GOOD, GOOD, GOOD_VIS, 30);
-    
+
     source = createSourceWithHiddenData(1000, 500);
     verify(source, 1500, is.getOptions(), GOOD, GOOD, GOOD_VIS, 1000);
   }
-  
+
   @Test
   public void testAllowUnauthorizedLabelsOnly() throws IOException {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.setNegate(is, true);
     VisibilityFilter.setAuthorizations(is, new Authorizations("def"));
-    
+
     TreeMap<Key,Value> source = createSourceWithHiddenData(1, 2);
     verify(source, 3, is.getOptions(), BAD, BAD, HIDDEN_VIS, 2);
-    
+
     source = createSourceWithHiddenData(30, 500);
     verify(source, 530, is.getOptions(), BAD, BAD, HIDDEN_VIS, 500);
-    
+
     source = createSourceWithHiddenData(1000, 500);
     verify(source, 1500, is.getOptions(), BAD, BAD, HIDDEN_VIS, 500);
   }
-  
+
   @Test
   public void testNoLabels() throws IOException {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.setNegate(is, false);
     VisibilityFilter.setAuthorizations(is, new Authorizations());
-    
+
     TreeMap<Key,Value> source = createUnprotectedSource(5, 2);
     verify(source, 7, is.getOptions(), GOOD, GOOD, EMPTY_VIS, 5);
-    
+
     VisibilityFilter.setNegate(is, true);
     verify(source, 7, is.getOptions(), BAD, BAD, GOOD_VIS, 2);
   }
-  
+
   @Test
   public void testFilterUnauthorizedAndBad() throws IOException {
     /*
@@ -179,53 +179,53 @@ public class VisibilityFilterTest {
      */
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.setAuthorizations(is, new Authorizations("def"));
-    
+
     TreeMap<Key,Value> source = createSourceWithHiddenData(1, 5);
     for (Entry<Key,Value> entry : createPollutedSource(0, 1).entrySet())
       source.put(entry.getKey(), entry.getValue());
-    
+
     verify(source, 7, is.getOptions(), GOOD, GOOD, GOOD_VIS, 1);
   }
-  
+
   @Test
   public void testCommaSeparatedAuthorizations() throws IOException {
     Map<String,String> options = Collections.singletonMap("auths", "x,def,y");
-    
+
     TreeMap<Key,Value> source = createSourceWithHiddenData(1, 2);
     verify(source, 3, options, GOOD, GOOD, GOOD_VIS, 1);
-    
+
     source = createSourceWithHiddenData(30, 500);
     verify(source, 530, options, GOOD, GOOD, GOOD_VIS, 30);
-    
+
     source = createSourceWithHiddenData(1000, 500);
     verify(source, 1500, options, GOOD, GOOD, GOOD_VIS, 1000);
   }
-  
+
   @Test
   public void testSerializedAuthorizations() throws IOException {
     Map<String,String> options = Collections.singletonMap("auths", new Authorizations("x", "def", "y").serialize());
-    
+
     TreeMap<Key,Value> source = createSourceWithHiddenData(1, 2);
     verify(source, 3, options, GOOD, GOOD, GOOD_VIS, 1);
-    
+
     source = createSourceWithHiddenData(30, 500);
     verify(source, 530, options, GOOD, GOOD, GOOD_VIS, 30);
-    
+
     source = createSourceWithHiddenData(1000, 500);
     verify(source, 1500, options, GOOD, GOOD, GOOD_VIS, 1000);
   }
-  
+
   @Test
   public void testStaticConfigurators() {
     IteratorSetting is = new IteratorSetting(1, VisibilityFilter.class);
     VisibilityFilter.filterInvalidLabelsOnly(is, false);
     VisibilityFilter.setNegate(is, true);
     VisibilityFilter.setAuthorizations(is, new Authorizations("abc", "def"));
-    
+
     Map<String,String> opts = is.getOptions();
     assertEquals("false", opts.get("filterInvalid"));
     assertEquals("true", opts.get("negate"));
     assertEquals(new Authorizations("abc", "def").serialize(), opts.get("auths"));
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
index dddab41..f5440cd 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
@@ -54,7 +54,7 @@ import org.apache.hadoop.io.Text;
 import org.junit.Assert;
 
 public class WholeColumnFamilyIteratorTest extends TestCase {
-  
+
   public void testEmptyStuff() throws IOException {
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
@@ -98,12 +98,12 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
       resultMap.putAll(WholeColumnFamilyIterator.decodeColumnFamily(rowKey, rowValue));
       iter.next();
     }
-    
+
     // we have 7 groups of row key/cf
     Assert.assertEquals(7, numRows);
-    
+
     assertEquals(resultMap, map);
-    
+
     WholeColumnFamilyIterator iter2 = new WholeColumnFamilyIterator(source) {
       @Override
       public boolean filter(Text row, List<Key> keys, List<Value> values) {
@@ -123,81 +123,81 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
     assertTrue(numRows == trueCount);
     assertEquals(resultMap, map2);
   }
-  
+
   private void pkv(SortedMap<Key,Value> map, String row, String cf, String cq, String cv, long ts, String val) {
     map.put(new Key(new Text(row), new Text(cf), new Text(cq), new Text(cv), ts), new Value(val.getBytes()));
   }
-  
+
   public void testContinue() throws Exception {
     SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
-    
+
     SortedMapIterator source = new SortedMapIterator(map);
     WholeColumnFamilyIterator iter = new WholeColumnFamilyIterator(source);
-    
+
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map1, WholeColumnFamilyIterator.decodeColumnFamily(iter.getTopKey(), iter.getTopValue()));
-    
+
     // simulate something continuing using the last key from the iterator
     // this is what client and server code will do
     range = new Range(iter.getTopKey(), false, range.getEndKey(), range.isEndKeyInclusive());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map2, WholeColumnFamilyIterator.decodeColumnFamily(iter.getTopKey(), iter.getTopValue()));
-    
+
     iter.next();
-    
+
     assertFalse(iter.hasTop());
-    
+
   }
-  
+
   public void testBug1() throws Exception {
     SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
-    
+
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     map.putAll(map1);
     map.putAll(map2);
-    
+
     MultiIterator source = new MultiIterator(Collections.singletonList((SortedKeyValueIterator<Key,Value>) new SortedMapIterator(map)), new Range(null, true,
         new Text("row1"), true));
     WholeColumnFamilyIterator iter = new WholeColumnFamilyIterator(source);
-    
+
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map1, WholeColumnFamilyIterator.decodeColumnFamily(iter.getTopKey(), iter.getTopValue()));
-    
+
     // simulate something continuing using the last key from the iterator
     // this is what client and server code will do
     range = new Range(iter.getTopKey(), false, range.getEndKey(), range.isEndKeyInclusive());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertFalse(iter.hasTop());
-    
+
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
index 8ad97a9..b47ef3e 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
@@ -16,7 +16,9 @@
  */
 package org.apache.accumulo.core.iterators.user;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,7 +44,7 @@ import com.google.common.collect.ImmutableList;
 
 public class WholeRowIteratorTest {
 
-  @Test(expected=IOException.class)
+  @Test(expected = IOException.class)
   public void testBadDecodeRow() throws IOException {
     Key k = new Key(new Text("r1"), new Text("cf1234567890"));
     Value v = new Value("v1".getBytes());
@@ -97,7 +99,7 @@ public class WholeRowIteratorTest {
     }
     assertTrue(numRows == 5);
     assertEquals(resultMap, map);
-    
+
     WholeRowIterator iter2 = new WholeRowIterator(source) {
       @Override
       public boolean filter(Text row, List<Key> keys, List<Value> values) {
@@ -117,83 +119,83 @@ public class WholeRowIteratorTest {
     assertTrue(numRows == trueCount);
     assertEquals(resultMap, map2);
   }
-  
+
   private void pkv(SortedMap<Key,Value> map, String row, String cf, String cq, String cv, long ts, String val) {
     map.put(new Key(new Text(row), new Text(cf), new Text(cq), new Text(cv), ts), new Value(val.getBytes()));
   }
-  
+
   @Test
   public void testContinue() throws Exception {
     SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
-    
+
     SortedMapIterator source = new SortedMapIterator(map);
     WholeRowIterator iter = new WholeRowIterator(source);
-    
+
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map1, WholeRowIterator.decodeRow(iter.getTopKey(), iter.getTopValue()));
-    
+
     // simulate something continuing using the last key from the iterator
     // this is what client and server code will do
     range = new Range(iter.getTopKey(), false, range.getEndKey(), range.isEndKeyInclusive());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map2, WholeRowIterator.decodeRow(iter.getTopKey(), iter.getTopValue()));
-    
+
     iter.next();
-    
+
     assertFalse(iter.hasTop());
-    
+
   }
-  
+
   @Test
   public void testBug1() throws Exception {
     SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
-    
+
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
-    
+
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     map.putAll(map1);
     map.putAll(map2);
-    
+
     MultiIterator source = new MultiIterator(Collections.singletonList((SortedKeyValueIterator<Key,Value>) new SortedMapIterator(map)), new Range(null, true,
         new Text("row1"), true));
     WholeRowIterator iter = new WholeRowIterator(source);
-    
+
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertTrue(iter.hasTop());
     assertEquals(map1, WholeRowIterator.decodeRow(iter.getTopKey(), iter.getTopValue()));
-    
+
     // simulate something continuing using the last key from the iterator
     // this is what client and server code will do
     range = new Range(iter.getTopKey(), false, range.getEndKey(), range.isEndKeyInclusive());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
-    
+
     assertFalse(iter.hasTop());
-    
+
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
index 7501c31..b8ef346 100644
--- a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
@@ -34,13 +34,13 @@ import org.apache.accumulo.core.security.Credentials;
 import org.junit.Test;
 
 public class MetadataServicerTest {
-  
+
   @Test
   public void checkSystemTableIdentifiers() {
     assertNotEquals(RootTable.ID, MetadataTable.ID);
     assertNotEquals(RootTable.NAME, MetadataTable.NAME);
   }
-  
+
   @Test
   public void testGetCorrectServicer() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
     String userTableName = "A";
@@ -50,35 +50,35 @@ public class MetadataServicerTest {
     String userTableId = connector.tableOperations().tableIdMap().get(userTableName);
     Credentials credentials = new Credentials("root", new PasswordToken(""));
     ClientContext context = new ClientContext(instance, credentials, new ClientConfiguration());
-    
+
     MetadataServicer ms = MetadataServicer.forTableId(context, RootTable.ID);
     assertTrue(ms instanceof ServicerForRootTable);
     assertFalse(ms instanceof TableMetadataServicer);
     assertEquals(RootTable.ID, ms.getServicedTableId());
-    
+
     ms = MetadataServicer.forTableId(context, MetadataTable.ID);
     assertTrue(ms instanceof ServicerForMetadataTable);
     assertTrue(ms instanceof TableMetadataServicer);
     assertEquals(RootTable.NAME, ((TableMetadataServicer) ms).getServicingTableName());
     assertEquals(MetadataTable.ID, ms.getServicedTableId());
-    
+
     ms = MetadataServicer.forTableId(context, userTableId);
     assertTrue(ms instanceof ServicerForUserTables);
     assertTrue(ms instanceof TableMetadataServicer);
     assertEquals(MetadataTable.NAME, ((TableMetadataServicer) ms).getServicingTableName());
     assertEquals(userTableId, ms.getServicedTableId());
-    
+
     ms = MetadataServicer.forTableName(context, RootTable.NAME);
     assertTrue(ms instanceof ServicerForRootTable);
     assertFalse(ms instanceof TableMetadataServicer);
     assertEquals(RootTable.ID, ms.getServicedTableId());
-    
+
     ms = MetadataServicer.forTableName(context, MetadataTable.NAME);
     assertTrue(ms instanceof ServicerForMetadataTable);
     assertTrue(ms instanceof TableMetadataServicer);
     assertEquals(RootTable.NAME, ((TableMetadataServicer) ms).getServicingTableName());
     assertEquals(MetadataTable.ID, ms.getServicedTableId());
-    
+
     ms = MetadataServicer.forTableName(context, userTableName);
     assertTrue(ms instanceof ServicerForUserTables);
     assertTrue(ms instanceof TableMetadataServicer);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
index cb40de9..b2b91d7 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
@@ -31,7 +31,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class ReplicationConfigurationUtilTest {
 
@@ -59,13 +59,15 @@ public class ReplicationConfigurationUtilTest {
   @Test
   public void rootTableExtentEmptyConf() {
     KeyExtent extent = new KeyExtent(new Text(RootTable.ID), null, null);
-    Assert.assertFalse("The root table should never be replicated", ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
+    Assert.assertFalse("The root table should never be replicated",
+        ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
   }
 
   @Test
   public void metadataTableExtentEmptyConf() {
     KeyExtent extent = new KeyExtent(new Text(MetadataTable.ID), null, null);
-    Assert.assertFalse("The metadata table should never be replicated", ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
+    Assert.assertFalse("The metadata table should never be replicated",
+        ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
index 6b754bf..88e6304 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationTargetTest.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class ReplicationTargetTest {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/replication/StatusUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/StatusUtilTest.java b/core/src/test/java/org/apache/accumulo/core/replication/StatusUtilTest.java
index 5a35d65..024e05f 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/StatusUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/StatusUtilTest.java
@@ -21,7 +21,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class StatusUtilTest {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/replication/proto/StatusTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/proto/StatusTest.java b/core/src/test/java/org/apache/accumulo/core/replication/proto/StatusTest.java
index 8906fb4..d59a04f 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/proto/StatusTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/proto/StatusTest.java
@@ -21,7 +21,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class StatusTest {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
index 7cd8c42..f2253e4 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenTest.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class AuthenticationTokenTest {
   @Test
@@ -43,14 +43,14 @@ public class AuthenticationTokenTest {
     for (byte b : randomBytes)
       allZero = allZero && b == 0;
     assertFalse(allZero);
-    
+
     byte[] serialized = AuthenticationTokenSerializer.serialize(new PasswordToken(randomBytes));
     PasswordToken passwordToken = AuthenticationTokenSerializer.deserialize(PasswordToken.class, serialized);
     assertArrayEquals(randomBytes, passwordToken.getPassword());
-    
+
     serialized = AuthenticationTokenSerializer.serialize(new NullToken());
     AuthenticationToken nullToken = AuthenticationTokenSerializer.deserialize(NullToken.class, serialized);
     assertEquals(new NullToken(), nullToken);
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java b/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
index 855d778..4fb2139 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
@@ -26,75 +26,75 @@ import org.apache.accumulo.core.util.ByteArraySet;
 import org.junit.Test;
 
 public class AuthorizationsTest {
-  
+
   @Test
   public void testSetOfByteArrays() {
     assertTrue(ByteArraySet.fromStrings("a", "b", "c").contains("a".getBytes()));
   }
-  
+
   @Test
   public void testEncodeDecode() {
     Authorizations a = new Authorizations("a", "abcdefg", "hijklmno", ",");
     byte[] array = a.getAuthorizationsArray();
     Authorizations b = new Authorizations(array);
     assertEquals(a, b);
-    
+
     // test encoding empty auths
     a = new Authorizations();
     array = a.getAuthorizationsArray();
     b = new Authorizations(array);
     assertEquals(a, b);
-    
+
     // test encoding multi-byte auths
     a = new Authorizations("五", "b", "c", "九");
     array = a.getAuthorizationsArray();
     b = new Authorizations(array);
     assertEquals(a, b);
   }
-  
+
   @Test
   public void testSerialization() {
     Authorizations a1 = new Authorizations("a", "b");
     Authorizations a2 = new Authorizations("b", "a");
-    
+
     assertEquals(a1, a2);
     assertEquals(a1.serialize(), a2.serialize());
   }
-  
+
   @Test
   public void testDefensiveAccess() {
     Authorizations expected = new Authorizations("foo", "a");
     Authorizations actual = new Authorizations("foo", "a");
-    
+
     // foo to goo; test defensive iterator
     for (byte[] bytes : actual) {
       bytes[0]++;
     }
     assertArrayEquals(expected.getAuthorizationsArray(), actual.getAuthorizationsArray());
-    
+
     // test defensive getter and serializer
     actual.getAuthorizations().get(0)[0]++;
     assertArrayEquals(expected.getAuthorizationsArray(), actual.getAuthorizationsArray());
     assertEquals(expected.serialize(), actual.serialize());
   }
-  
+
   // This should throw ReadOnlyBufferException, but THRIFT-883 requires that the ByteBuffers themselves not be read-only
   // @Test(expected = ReadOnlyBufferException.class)
   @Test
   public void testReadOnlyByteBuffer() {
     Authorizations expected = new Authorizations("foo");
     Authorizations actual = new Authorizations("foo");
-    
+
     assertArrayEquals(expected.getAuthorizationsArray(), actual.getAuthorizationsArray());
     actual.getAuthorizationsBB().get(0).array()[0]++;
     assertArrayEquals(expected.getAuthorizationsArray(), actual.getAuthorizationsArray());
   }
-  
+
   @Test(expected = UnsupportedOperationException.class)
   public void testUnmodifiableList() {
     Authorizations expected = new Authorizations("foo");
     Authorizations actual = new Authorizations("foo");
-    
+
     assertArrayEquals(expected.getAuthorizationsArray(), actual.getAuthorizationsArray());
     actual.getAuthorizationsBB().add(ByteBuffer.wrap(new byte[] {'a'}));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java b/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
index c5746bc..a399310 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
@@ -38,10 +38,10 @@ import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class CredentialsTest {
-  
+
   @Test
   public void testToThrift() throws DestroyFailedException {
     // verify thrift serialization
@@ -50,7 +50,7 @@ public class CredentialsTest {
     assertEquals("test", tCreds.getPrincipal());
     assertEquals(PasswordToken.class.getName(), tCreds.getTokenClassName());
     assertArrayEquals(AuthenticationTokenSerializer.serialize(new PasswordToken("testing")), tCreds.getToken());
-    
+
     // verify that we can't serialize if it's destroyed
     creds.getToken().destroy();
     try {
@@ -70,14 +70,14 @@ public class CredentialsTest {
     Credentials roundtrip = Credentials.fromThrift(tCreds);
     assertEquals("Roundtrip through thirft changed credentials equality", creds, roundtrip);
   }
-  
+
   @Test
   public void testMockConnector() throws AccumuloException, DestroyFailedException, AccumuloSecurityException {
     Instance inst = new MockInstance();
     Connector rootConnector = inst.getConnector("root", new PasswordToken());
     PasswordToken testToken = new PasswordToken("testPass");
     rootConnector.securityOperations().createLocalUser("testUser", testToken);
-    
+
     assertFalse(testToken.isDestroyed());
     testToken.destroy();
     assertTrue(testToken.isDestroyed());
@@ -88,20 +88,20 @@ public class CredentialsTest {
       assertTrue(e.getSecurityErrorCode().equals(SecurityErrorCode.TOKEN_EXPIRED));
     }
   }
-  
+
   @Test
   public void testEqualsAndHashCode() {
     Credentials nullNullCreds = new Credentials(null, null);
     Credentials abcNullCreds = new Credentials("abc", new NullToken());
     Credentials cbaNullCreds = new Credentials("cba", new NullToken());
     Credentials abcBlahCreds = new Credentials("abc", new PasswordToken("blah"));
-    
+
     // check hash codes
     assertEquals(0, nullNullCreds.hashCode());
     assertEquals("abc".hashCode(), abcNullCreds.hashCode());
     assertEquals(abcNullCreds.hashCode(), abcBlahCreds.hashCode());
     assertFalse(abcNullCreds.hashCode() == cbaNullCreds.hashCode());
-    
+
     // identity
     assertEquals(abcNullCreds, abcNullCreds);
     assertEquals(new Credentials("abc", new NullToken()), abcNullCreds);
@@ -112,7 +112,7 @@ public class CredentialsTest {
     assertFalse(nullNullCreds.equals(abcNullCreds));
     assertFalse(abcNullCreds.equals(abcBlahCreds));
   }
-  
+
   @Test
   public void testCredentialsSerialization() throws AccumuloSecurityException {
     Credentials creds = new Credentials("a:b-c", new PasswordToken("d-e-f".getBytes(UTF_8)));
@@ -121,14 +121,14 @@ public class CredentialsTest {
     assertEquals(creds, result);
     assertEquals("a:b-c", result.getPrincipal());
     assertEquals(new PasswordToken("d-e-f"), result.getToken());
-    
+
     Credentials nullNullCreds = new Credentials(null, null);
     serialized = nullNullCreds.serialize();
     result = Credentials.deserialize(serialized);
     assertEquals(null, result.getPrincipal());
     assertEquals(null, result.getToken());
   }
-  
+
   @Test
   public void testToString() {
     Credentials creds = new Credentials(null, null);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java b/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
index ee4d2ee..2996970 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
@@ -27,34 +27,34 @@ import org.apache.accumulo.core.util.ByteArraySet;
 import org.junit.Test;
 
 public class VisibilityEvaluatorTest {
-  
+
   @Test
   public void testVisibilityEvaluator() throws VisibilityParseException {
     VisibilityEvaluator ct = new VisibilityEvaluator(new Authorizations(ByteArraySet.fromStrings("one", "two", "three", "four")));
-    
+
     // test for empty vis
     assertTrue(ct.evaluate(new ColumnVisibility(new byte[0])));
-    
+
     // test for and
     assertTrue("'and' test", ct.evaluate(new ColumnVisibility("one&two")));
-    
+
     // test for or
     assertTrue("'or' test", ct.evaluate(new ColumnVisibility("foor|four")));
-    
+
     // test for and and or
     assertTrue("'and' and 'or' test", ct.evaluate(new ColumnVisibility("(one&two)|(foo&bar)")));
-    
+
     // test for false negatives
     for (String marking : new String[] {"one", "one|five", "five|one", "(one)", "(one&two)|(foo&bar)", "(one|foo)&three", "one|foo|bar", "(one|foo)|bar",
         "((one|foo)|bar)&two"}) {
       assertTrue(marking, ct.evaluate(new ColumnVisibility(marking)));
     }
-    
+
     // test for false positives
     for (String marking : new String[] {"five", "one&five", "five&one", "((one|foo)|bar)&goober"}) {
       assertFalse(marking, ct.evaluate(new ColumnVisibility(marking)));
     }
-    
+
     // test missing separators; these should throw an exception
     for (String marking : new String[] {"one(five)", "(five)one", "(one)(two)", "a|(b(c))"}) {
       try {
@@ -64,7 +64,7 @@ public class VisibilityEvaluatorTest {
         // all is good
       }
     }
-    
+
     // test unexpected separator
     for (String marking : new String[] {"&(five)", "|(five)", "(five)&", "five|", "a|(b)&", "(&five)", "(five|)"}) {
       try {
@@ -74,7 +74,7 @@ public class VisibilityEvaluatorTest {
         // all is good
       }
     }
-    
+
     // test mismatched parentheses
     for (String marking : new String[] {"(", ")", "(a&b", "b|a)"}) {
       try {
@@ -85,23 +85,23 @@ public class VisibilityEvaluatorTest {
       }
     }
   }
-  
+
   @Test
   public void testQuotedExpressions() throws VisibilityParseException {
     VisibilityEvaluator ct = new VisibilityEvaluator(new Authorizations("A#C", "A\"C", "A\\C", "AC"));
-    
+
     assertTrue(ct.evaluate(new ColumnVisibility(quote("A#C") + "|" + quote("A?C"))));
     assertTrue(ct.evaluate(new ColumnVisibility(new ColumnVisibility(quote("A#C") + "|" + quote("A?C")).flatten())));
     assertTrue(ct.evaluate(new ColumnVisibility(quote("A\"C") + "&" + quote("A\\C"))));
     assertTrue(ct.evaluate(new ColumnVisibility(new ColumnVisibility(quote("A\"C") + "&" + quote("A\\C")).flatten())));
     assertTrue(ct.evaluate(new ColumnVisibility("(" + quote("A\"C") + "|B)&(" + quote("A#C") + "|D)")));
-    
+
     assertFalse(ct.evaluate(new ColumnVisibility(quote("A#C") + "&B")));
-    
+
     assertTrue(ct.evaluate(new ColumnVisibility(quote("A#C"))));
     assertTrue(ct.evaluate(new ColumnVisibility("(" + quote("A#C") + ")")));
   }
-  
+
   @Test
   public void testQuote() {
     assertEquals("\"A#C\"", quote("A#C"));
@@ -111,11 +111,11 @@ public class VisibilityEvaluatorTest {
     assertEquals("\"九\"", quote("九"));
     assertEquals("\"五十\"", quote("五十"));
   }
-  
+
   @Test
   public void testNonAscii() throws VisibilityParseException {
     VisibilityEvaluator ct = new VisibilityEvaluator(new Authorizations("五", "六", "八", "九", "五十"));
-    
+
     assertTrue(ct.evaluate(new ColumnVisibility(quote("五") + "|" + quote("四"))));
     assertFalse(ct.evaluate(new ColumnVisibility(quote("五") + "&" + quote("四"))));
     assertTrue(ct.evaluate(new ColumnVisibility(quote("五") + "&(" + quote("四") + "|" + quote("九") + ")")));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java b/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java
index fe16c0e..5588029 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java
@@ -53,47 +53,47 @@ import org.junit.rules.ExpectedException;
 import com.google.common.primitives.Bytes;
 
 public class CryptoTest {
-  
+
   private static final int MARKER_INT = 0xCADEFEDD;
   private static final String MARKER_STRING = "1 2 3 a b c";
   public static final String CONFIG_FILE_SYSTEM_PROP = "org.apache.accumulo.config.file";
   public static final String CRYPTO_ON_CONF = "crypto-on-accumulo-site.xml";
   public static final String CRYPTO_OFF_CONF = "crypto-off-accumulo-site.xml";
-  public static final String CRYPTO_ON_KEK_OFF_CONF = "crypto-on-no-key-encryption-accumulo-site.xml"; 
-  
+  public static final String CRYPTO_ON_KEK_OFF_CONF = "crypto-on-no-key-encryption-accumulo-site.xml";
+
   @Rule
   public ExpectedException exception = ExpectedException.none();
-  
+
   @Test
   public void testNoCryptoStream() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_OFF_CONF);    
-    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_OFF_CONF);
+
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
-    
+
     assertNotNull(params);
     assertEquals("NullCipher", params.getAlgorithmName());
     assertNull(params.getEncryptionMode());
     assertNull(params.getPadding());
-    
+
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
     assertNotNull(cryptoModule);
     assertTrue(cryptoModule instanceof CryptoModuleFactory.NullCryptoModule);
-    
+
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    
+
     params.setPlaintextOutputStream(out);
-    
+
     params = cryptoModule.getEncryptingOutputStream(params);
     assertNotNull(params.getEncryptedOutputStream());
     assertEquals(out, params.getEncryptedOutputStream());
   }
-  
+
   @Test
   public void testCryptoModuleParamsParsing() {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
 
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
-    
+
     assertNotNull(params);
     assertEquals("AES", params.getAlgorithmName());
     assertEquals("CFB", params.getEncryptionMode());
@@ -103,10 +103,10 @@ public class CryptoTest {
     assertEquals("SUN", params.getRandomNumberGeneratorProvider());
     assertEquals("org.apache.accumulo.core.security.crypto.CachingHDFSSecretKeyEncryptionStrategy", params.getKeyEncryptionStrategyClass());
   }
-  
+
   @Test
   public void testCryptoModuleDoesntLeakSensitive() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
 
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -116,20 +116,21 @@ public class CryptoTest {
 
     cryptoModule.getEncryptingOutputStream(params);
     params.getEncryptedOutputStream().close();
-    
+
     // If we get here, we have encrypted bytes
     byte[] streamBytes = baos.toByteArray();
     for (Property prop : Property.values()) {
       if (prop.isSensitive()) {
         byte[] toCheck = prop.getKey().getBytes();
-        assertEquals(-1, Bytes.indexOf(streamBytes, toCheck));  }
-    }    
+        assertEquals(-1, Bytes.indexOf(streamBytes, toCheck));
+      }
+    }
 
   }
-  
+
   @Test
   public void testCryptoModuleParamsValidation1() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
 
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
@@ -142,8 +143,8 @@ public class CryptoTest {
 
   @Test
   public void testCryptoModuleParamsValidation2() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
-   
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
+
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
 
@@ -152,123 +153,122 @@ public class CryptoTest {
     exception.expect(RuntimeException.class);
     cryptoModule.getDecryptingInputStream(params);
   }
-  
+
   private String getStringifiedBytes(String s) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream dataOut = new DataOutputStream(out);
-    
+
     dataOut.writeUTF(s);
     dataOut.close();
     byte[] stringMarkerBytes = out.toByteArray();
     return Arrays.toString(stringMarkerBytes);
-    
+
   }
-  
+
   private String getStringifiedBytes(int i) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream dataOut = new DataOutputStream(out);
-    
+
     dataOut.writeInt(i);
     dataOut.close();
     byte[] stringMarkerBytes = out.toByteArray();
     return Arrays.toString(stringMarkerBytes);
-    
+
   }
 
   @Test
   public void testCryptoModuleBasicReadWrite() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_KEK_OFF_CONF);    
-  
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_KEK_OFF_CONF);
+
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
-    
+
     assertTrue(cryptoModule instanceof DefaultCryptoModule);
-    
+
     byte[] resultingBytes = setUpSampleEncryptedBytes(cryptoModule, params);
-    
+
     // If we get here, we have encrypted bytes
     ByteArrayInputStream in = new ByteArrayInputStream(resultingBytes);
-    
+
     params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     params.setEncryptedInputStream(in);
-    
+
     params = cryptoModule.getDecryptingInputStream(params);
-    
+
     InputStream plaintextIn = params.getPlaintextInputStream();
-    
+
     assertNotNull(plaintextIn);
     assertTrue(plaintextIn != in);
     DataInputStream dataIn = new DataInputStream(plaintextIn);
     String markerString = dataIn.readUTF();
     int markerInt = dataIn.readInt();
-    
+
     assertEquals(MARKER_STRING, markerString);
     assertEquals(MARKER_INT, markerInt);
   }
 
   private byte[] setUpSampleEncryptedBytes(CryptoModule cryptoModule, CryptoModuleParameters params) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    
+
     params.setPlaintextOutputStream(new NoFlushOutputStream(out));
-    
+
     params = cryptoModule.getEncryptingOutputStream(params);
-    
+
     assertNotNull(params.getEncryptedOutputStream());
     assertTrue(params.getEncryptedOutputStream() != out);
-    
+
     DataOutputStream dataOut = new DataOutputStream(params.getEncryptedOutputStream());
     dataOut.writeUTF(MARKER_STRING);
     dataOut.writeInt(MARKER_INT);
     dataOut.close();
-    
+
     byte[] resultingBytes = out.toByteArray();
     String stringifiedBytes = Arrays.toString(resultingBytes);
-    
+
     String stringifiedMarkerBytes = getStringifiedBytes(MARKER_STRING);
     String stringifiedOtherBytes = getStringifiedBytes(MARKER_INT);
-    
-    
+
     // OK, let's make sure it's encrypted
     assertTrue(!stringifiedBytes.contains(stringifiedMarkerBytes));
     assertTrue(!stringifiedBytes.contains(stringifiedOtherBytes));
     return resultingBytes;
   }
-  
+
   @Test
   public void testKeyEncryptionAndCheckThatFileCannotBeReadWithoutKEK() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
-  
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
+
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
 
     assertTrue(cryptoModule instanceof DefaultCryptoModule);
     assertNotNull(params.getKeyEncryptionStrategyClass());
     assertEquals("org.apache.accumulo.core.security.crypto.CachingHDFSSecretKeyEncryptionStrategy", params.getKeyEncryptionStrategyClass());
-    
+
     byte[] resultingBytes = setUpSampleEncryptedBytes(cryptoModule, params);
 
     // So now that we have bytes encrypted by a key encrypted to a KEK, turn off the KEK configuration and try
-    // to decrypt.  We expect this to fail.  This also tests our ability to override the key encryption strategy.
+    // to decrypt. We expect this to fail. This also tests our ability to override the key encryption strategy.
     conf = setAndGetAccumuloConfig(CRYPTO_ON_KEK_OFF_CONF);
     params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     params.setOverrideStreamsSecretKeyEncryptionStrategy(true);
-    
+
     ByteArrayInputStream in = new ByteArrayInputStream(resultingBytes);
     params.setEncryptedInputStream(in);
-    
+
     params = cryptoModule.getDecryptingInputStream(params);
-    
+
     assertNotNull(params.getPlaintextInputStream());
     DataInputStream dataIn = new DataInputStream(params.getPlaintextInputStream());
     // We expect the following operation to fail and throw an exception
     exception.expect(IOException.class);
     @SuppressWarnings("unused")
     String markerString = dataIn.readUTF();
- }
+  }
 
   @Test
   public void testKeyEncryptionNormalPath() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
 
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
@@ -276,30 +276,30 @@ public class CryptoTest {
     assertTrue(cryptoModule instanceof DefaultCryptoModule);
     assertNotNull(params.getKeyEncryptionStrategyClass());
     assertEquals("org.apache.accumulo.core.security.crypto.CachingHDFSSecretKeyEncryptionStrategy", params.getKeyEncryptionStrategyClass());
-    
+
     byte[] resultingBytes = setUpSampleEncryptedBytes(cryptoModule, params);
 
     params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     params.setOverrideStreamsSecretKeyEncryptionStrategy(true);
-    
+
     ByteArrayInputStream in = new ByteArrayInputStream(resultingBytes);
     params.setEncryptedInputStream(in);
-    
+
     params = cryptoModule.getDecryptingInputStream(params);
-    
+
     assertNotNull(params.getPlaintextInputStream());
     DataInputStream dataIn = new DataInputStream(params.getPlaintextInputStream());
 
     String markerString = dataIn.readUTF();
     int markerInt = dataIn.readInt();
-    
+
     assertEquals(MARKER_STRING, markerString);
     assertEquals(MARKER_INT, markerInt);
   }
-  
+
   @Test
   public void testChangingCryptoParamsAndCanStillDecryptPreviouslyEncryptedFiles() throws IOException {
-    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);    
+    AccumuloConfiguration conf = setAndGetAccumuloConfig(CRYPTO_ON_CONF);
 
     CryptoModule cryptoModule = CryptoModuleFactory.getCryptoModule(conf);
     CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
@@ -307,30 +307,30 @@ public class CryptoTest {
     assertTrue(cryptoModule instanceof DefaultCryptoModule);
     assertNotNull(params.getKeyEncryptionStrategyClass());
     assertEquals("org.apache.accumulo.core.security.crypto.CachingHDFSSecretKeyEncryptionStrategy", params.getKeyEncryptionStrategyClass());
-    
+
     byte[] resultingBytes = setUpSampleEncryptedBytes(cryptoModule, params);
 
     // Now we're going to create a params object and set its algorithm and key length different
-    // from those configured within the site configuration.  After doing this, we should
+    // from those configured within the site configuration. After doing this, we should
     // still be able to read the file that was created with a different set of parameters.
     params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
     params.setAlgorithmName("DESede");
     params.setKeyLength(24 * 8);
-    
+
     ByteArrayInputStream in = new ByteArrayInputStream(resultingBytes);
     params.setEncryptedInputStream(in);
-    
+
     params = cryptoModule.getDecryptingInputStream(params);
-    
+
     assertNotNull(params.getPlaintextInputStream());
     DataInputStream dataIn = new DataInputStream(params.getPlaintextInputStream());
     String markerString = dataIn.readUTF();
     int markerInt = dataIn.readInt();
-    
+
     assertEquals(MARKER_STRING, markerString);
     assertEquals(MARKER_INT, markerInt);
   }
-  
+
   private AccumuloConfiguration setAndGetAccumuloConfig(String cryptoConfSetting) {
     ConfigurationCopy result = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());
     Configuration conf = new Configuration(false);
@@ -340,33 +340,33 @@ public class CryptoTest {
     }
     return result;
   }
-  
+
   @Test
-  public void testKeyWrapAndUnwrap() throws NoSuchAlgorithmException, NoSuchPaddingException, NoSuchProviderException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+  public void testKeyWrapAndUnwrap() throws NoSuchAlgorithmException, NoSuchPaddingException, NoSuchProviderException, InvalidKeyException,
+      IllegalBlockSizeException, BadPaddingException {
     Cipher keyWrapCipher = Cipher.getInstance("AES/ECB/NoPadding");
     SecureRandom random = SecureRandom.getInstance("SHA1PRNG", "SUN");
-    
+
     byte[] kek = new byte[16];
     random.nextBytes(kek);
     byte[] randomKey = new byte[16];
     random.nextBytes(randomKey);
-    
+
     keyWrapCipher.init(Cipher.WRAP_MODE, new SecretKeySpec(kek, "AES"));
-    
+
     Key randKey = new SecretKeySpec(randomKey, "AES");
-    
+
     byte[] wrappedKey = keyWrapCipher.wrap(randKey);
-    
-    assert(wrappedKey != null);
-    assert(wrappedKey.length == randomKey.length);
 
-    
+    assert (wrappedKey != null);
+    assert (wrappedKey.length == randomKey.length);
+
     Cipher keyUnwrapCipher = Cipher.getInstance("AES/ECB/NoPadding");
     keyUnwrapCipher.init(Cipher.UNWRAP_MODE, new SecretKeySpec(kek, "AES"));
     Key unwrappedKey = keyUnwrapCipher.unwrap(wrappedKey, "AES", Cipher.SECRET_KEY);
-    
+
     byte[] unwrappedKeyBytes = unwrappedKey.getEncoded();
-    assert(Arrays.equals(unwrappedKeyBytes, randomKey));
-    
+    assert (Arrays.equals(unwrappedKeyBytes, randomKey));
+
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java b/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
index 7fe5233..3d3b39e 100644
--- a/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
@@ -19,14 +19,14 @@ package org.apache.accumulo.core.trace;
 import org.junit.Test;
 
 public class PerformanceTest {
-  
+
   @Test
   public void test() {
-    
+
   }
-  
+
   public static void main(String[] args) {
-    
+
     long now = System.currentTimeMillis();
     for (long i = 0; i < 1000 * 1000; i++) {
       @SuppressWarnings("unused")


Mime
View raw message