accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/8] accumulo git commit: ACCUMULO-2589 Drop deprecated code from 1.x
Date Thu, 30 Jun 2016 20:41:46 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
deleted file mode 100644
index 9bd1455..0000000
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.client.mock;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.MutationsRejectedException;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.TableExistsException;
-import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.client.admin.NewTableConfiguration;
-import org.apache.accumulo.core.client.admin.TableOperations;
-import org.apache.accumulo.core.client.admin.TimeType;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.file.FileOperations;
-import org.apache.accumulo.core.file.FileSKVWriter;
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
-import org.apache.accumulo.core.iterators.user.VersioningIterator;
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.util.Pair;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import com.google.common.collect.Iterators;
-
-@Deprecated
-public class MockTableOperationsTest {
-
-  @Rule
-  public TestName test = new TestName();
-
-  private Connector conn;
-
-  @Before
-  public void setupInstance() throws Exception {
-    Instance inst = new MockInstance(test.getMethodName());
-    conn = inst.getConnector("user", new PasswordToken("pass"));
-  }
-
-  @Test
-  public void testCreateUseVersions() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
-    String t = "tableName1";
-
-    {
-      conn.tableOperations().create(t, new NewTableConfiguration().withoutDefaultIterators().setTimeType(TimeType.LOGICAL));
-
-      writeVersionable(conn, t, 3);
-      assertVersionable(conn, t, 3);
-
-      IteratorSetting settings = new IteratorSetting(20, VersioningIterator.class);
-      conn.tableOperations().attachIterator(t, settings);
-
-      assertVersionable(conn, t, 1);
-
-      conn.tableOperations().delete(t);
-    }
-
-    {
-      conn.tableOperations().create(t, new NewTableConfiguration().setTimeType(TimeType.MILLIS));
-
-      try {
-        IteratorSetting settings = new IteratorSetting(20, VersioningIterator.class);
-        conn.tableOperations().attachIterator(t, settings);
-        Assert.fail();
-      } catch (AccumuloException ex) {}
-
-      writeVersionable(conn, t, 3);
-      assertVersionable(conn, t, 1);
-
-      conn.tableOperations().delete(t);
-    }
-  }
-
-  protected void writeVersionable(Connector c, String tableName, int size) throws TableNotFoundException, MutationsRejectedException {
-    for (int i = 0; i < size; i++) {
-      BatchWriter w = c.createBatchWriter(tableName, new BatchWriterConfig());
-      Mutation m = new Mutation("row1");
-      m.put("cf", "cq", String.valueOf(i));
-      w.addMutation(m);
-      w.close();
-    }
-  }
-
-  protected void assertVersionable(Connector c, String tableName, int size) throws TableNotFoundException {
-    BatchScanner s = c.createBatchScanner(tableName, Authorizations.EMPTY, 1);
-    s.setRanges(Collections.singleton(Range.exact("row1", "cf", "cq")));
-    int count = 0;
-    for (Map.Entry<Key,Value> e : s) {
-      Assert.assertEquals("row1", e.getKey().getRow().toString());
-      Assert.assertEquals("cf", e.getKey().getColumnFamily().toString());
-      Assert.assertEquals("cq", e.getKey().getColumnQualifier().toString());
-      count++;
-
-    }
-    Assert.assertEquals(size, count);
-    s.close();
-  }
-
-  @Test
-  public void testTableNotFound() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
-    IteratorSetting setting = new IteratorSetting(100, "myvers", VersioningIterator.class);
-    String t = "tableName";
-    try {
-      conn.tableOperations().attachIterator(t, setting);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().checkIteratorConflicts(t, setting, EnumSet.allOf(IteratorScope.class));
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().delete(t);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().getIteratorSetting(t, "myvers", IteratorScope.scan);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().getProperties(t);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().listSplits(t);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().listIterators(t);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().removeIterator(t, null, EnumSet.noneOf(IteratorScope.class));
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    try {
-      conn.tableOperations().rename(t, t);
-      Assert.fail();
-    } catch (TableNotFoundException e) {}
-    conn.tableOperations().create(t);
-    try {
-      conn.tableOperations().create(t);
-      Assert.fail();
-    } catch (TableExistsException e) {}
-    try {
-      conn.tableOperations().rename(t, t);
-      Assert.fail();
-    } catch (TableExistsException e) {}
-  }
-
-  private static class ImportTestFilesAndData {
-    Path importPath;
-    Path failurePath;
-    List<Pair<Key,Value>> keyVals;
-  }
-
-  @Test
-  public void testImport() throws Throwable {
-    ImportTestFilesAndData dataAndFiles = prepareTestFiles();
-    TableOperations tableOperations = conn.tableOperations();
-    tableOperations.create("a_table");
-    tableOperations.importDirectory("a_table", dataAndFiles.importPath.toString(), dataAndFiles.failurePath.toString(), false);
-    Scanner scanner = conn.createScanner("a_table", new Authorizations());
-    Iterator<Entry<Key,Value>> iterator = scanner.iterator();
-    for (int i = 0; i < 5; i++) {
-      Assert.assertTrue(iterator.hasNext());
-      Entry<Key,Value> kv = iterator.next();
-      Pair<Key,Value> expected = dataAndFiles.keyVals.get(i);
-      Assert.assertEquals(expected.getFirst(), kv.getKey());
-      Assert.assertEquals(expected.getSecond(), kv.getValue());
-    }
-    Assert.assertFalse(iterator.hasNext());
-  }
-
-  private ImportTestFilesAndData prepareTestFiles() throws Throwable {
-    Configuration defaultConf = new Configuration();
-    Path tempFile = new Path("target/accumulo-test/import/sample.rf");
-    Path failures = new Path("target/accumulo-test/failures/");
-    FileSystem fs = FileSystem.get(new URI("file:///"), defaultConf);
-    fs.deleteOnExit(tempFile);
-    fs.deleteOnExit(failures);
-    fs.delete(failures, true);
-    fs.delete(tempFile, true);
-    fs.mkdirs(failures);
-    fs.mkdirs(tempFile.getParent());
-    FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder().forFile(tempFile.toString(), fs, defaultConf)
-        .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build();
-    writer.startDefaultLocalityGroup();
-    List<Pair<Key,Value>> keyVals = new ArrayList<Pair<Key,Value>>();
-    for (int i = 0; i < 5; i++) {
-      keyVals.add(new Pair<Key,Value>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i), new Value(Integer.toString(i).getBytes())));
-    }
-    for (Pair<Key,Value> keyVal : keyVals) {
-      writer.append(keyVal.getFirst(), keyVal.getSecond());
-    }
-    writer.close();
-    ImportTestFilesAndData files = new ImportTestFilesAndData();
-    files.failurePath = failures;
-    files.importPath = tempFile.getParent();
-    files.keyVals = keyVals;
-    return files;
-  }
-
-  @Test(expected = TableNotFoundException.class)
-  public void testFailsWithNoTable() throws Throwable {
-    TableOperations tableOperations = conn.tableOperations();
-    ImportTestFilesAndData testFiles = prepareTestFiles();
-    tableOperations.importDirectory("doesnt_exist_table", testFiles.importPath.toString(), testFiles.failurePath.toString(), false);
-  }
-
-  @Test(expected = IOException.class)
-  public void testFailsWithNonEmptyFailureDirectory() throws Throwable {
-    TableOperations tableOperations = conn.tableOperations();
-    ImportTestFilesAndData testFiles = prepareTestFiles();
-    FileSystem fs = testFiles.failurePath.getFileSystem(new Configuration());
-    fs.open(testFiles.failurePath.suffix("/something")).close();
-    tableOperations.importDirectory("doesnt_exist_table", testFiles.importPath.toString(), testFiles.failurePath.toString(), false);
-  }
-
-  @Test
-  public void testDeleteRows() throws Exception {
-    TableOperations to = conn.tableOperations();
-    to.create("test");
-    BatchWriter bw = conn.createBatchWriter("test", new BatchWriterConfig());
-    for (int r = 0; r < 20; r++) {
-      Mutation m = new Mutation("" + r);
-      for (int c = 0; c < 5; c++) {
-        m.put(new Text("cf"), new Text("" + c), new Value(("" + c).getBytes()));
-      }
-      bw.addMutation(m);
-    }
-    bw.flush();
-    to.deleteRows("test", new Text("1"), new Text("2"));
-    Scanner s = conn.createScanner("test", Authorizations.EMPTY);
-    int oneCnt = 0;
-    for (Entry<Key,Value> entry : s) {
-      char rowStart = entry.getKey().getRow().toString().charAt(0);
-      Assert.assertTrue(rowStart != '2');
-      oneCnt += rowStart == '1' ? 1 : 0;
-    }
-    Assert.assertEquals(5, oneCnt);
-  }
-
-  @Test
-  public void testDeleteRowsWithNullKeys() throws Exception {
-    TableOperations to = conn.tableOperations();
-    to.create("test2");
-    BatchWriter bw = conn.createBatchWriter("test2", new BatchWriterConfig());
-    for (int r = 0; r < 30; r++) {
-      Mutation m = new Mutation(Integer.toString(r));
-      for (int c = 0; c < 5; c++) {
-        m.put(new Text("cf"), new Text(Integer.toString(c)), new Value(Integer.toString(c).getBytes()));
-      }
-      bw.addMutation(m);
-    }
-    bw.flush();
-
-    // test null end
-    // will remove rows 4 through 9 (6 * 5 = 30 entries)
-    to.deleteRows("test2", new Text("30"), null);
-    Scanner s = conn.createScanner("test2", Authorizations.EMPTY);
-    int rowCnt = 0;
-    for (Entry<Key,Value> entry : s) {
-      String rowId = entry.getKey().getRow().toString();
-      Assert.assertFalse(rowId.startsWith("30"));
-      rowCnt++;
-    }
-    s.close();
-    Assert.assertEquals(120, rowCnt);
-
-    // test null start
-    // will remove 0-1, 10-19, 2
-    to.deleteRows("test2", null, new Text("2"));
-    s = conn.createScanner("test2", Authorizations.EMPTY);
-    rowCnt = 0;
-    for (Entry<Key,Value> entry : s) {
-      char rowStart = entry.getKey().getRow().toString().charAt(0);
-      Assert.assertTrue(rowStart >= '2');
-      rowCnt++;
-    }
-    s.close();
-    Assert.assertEquals(55, rowCnt);
-
-    // test null start and end
-    // deletes everything still left
-    to.deleteRows("test2", null, null);
-    s = conn.createScanner("test2", Authorizations.EMPTY);
-    rowCnt = Iterators.size(s.iterator());
-    s.close();
-    to.delete("test2");
-    Assert.assertEquals(0, rowCnt);
-
-  }
-
-  @Test
-  public void testTableIdMap() throws Exception {
-    TableOperations tops = conn.tableOperations();
-    tops.create("foo");
-
-    // Should get a table ID, not the table name
-    Assert.assertNotEquals("foo", tops.tableIdMap().get("foo"));
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java b/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
deleted file mode 100644
index 4f041c9..0000000
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.client.mock;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collections;
-import java.util.Map.Entry;
-
-import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.WrappingIterator;
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.hadoop.io.Text;
-import org.junit.Test;
-
-@Deprecated
-public class TestBatchScanner821 {
-
-  public static class TransformIterator extends WrappingIterator {
-
-    @Override
-    public Key getTopKey() {
-      Key k = getSource().getTopKey();
-      return new Key(new Text(k.getRow().toString().toLowerCase()), k.getColumnFamily(), k.getColumnQualifier(), k.getColumnVisibility(), k.getTimestamp());
-    }
-  }
-
-  @Test
-  public void test() throws Exception {
-    MockInstance inst = new MockInstance();
-    Connector conn = inst.getConnector("root", new PasswordToken(""));
-    conn.tableOperations().create("test");
-    BatchWriter bw = conn.createBatchWriter("test", new BatchWriterConfig());
-    for (String row : "A,B,C,D".split(",")) {
-      Mutation m = new Mutation(row);
-      m.put("cf", "cq", "");
-      bw.addMutation(m);
-    }
-    bw.flush();
-    BatchScanner bs = conn.createBatchScanner("test", Authorizations.EMPTY, 1);
-    IteratorSetting cfg = new IteratorSetting(100, TransformIterator.class);
-    bs.addScanIterator(cfg);
-    bs.setRanges(Collections.singletonList(new Range("A", "Z")));
-    StringBuilder sb = new StringBuilder();
-    String comma = "";
-    for (Entry<Key,Value> entry : bs) {
-      sb.append(comma);
-      sb.append(entry.getKey().getRow());
-      comma = ",";
-    }
-    assertEquals("a,b,c,d", sb.toString());
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index 724bfee..ad0e16a 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -16,13 +16,9 @@
  */
 package org.apache.accumulo.core.data;
 
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
@@ -30,9 +26,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -292,57 +285,6 @@ public class KeyExtentTest {
     return out;
   }
 
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testKeyExtentsForSimpleRange() {
-    Collection<KeyExtent> results;
-
-    results = KeyExtent.getKeyExtentsForRange(null, null, null);
-    assertTrue("Non-empty set returned from no extents", results.isEmpty());
-
-    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.<KeyExtent> emptySet());
-    assertTrue("Non-empty set returned from no extents", results.isEmpty());
-
-    KeyExtent t = nke("t", null, null);
-    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.<KeyExtent> singleton(t));
-    assertEquals("Single tablet should always be returned", 1, results.size());
-    assertEquals(t, results.iterator().next());
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testKeyExtentsForRange() {
-    KeyExtent b = nke("t", "b", null);
-    KeyExtent e = nke("t", "e", "b");
-    KeyExtent h = nke("t", "h", "e");
-    KeyExtent m = nke("t", "m", "h");
-    KeyExtent z = nke("t", null, "m");
-
-    set0.addAll(Arrays.asList(b, e, h, m, z));
-
-    Collection<KeyExtent> results;
-
-    results = KeyExtent.getKeyExtentsForRange(null, null, set0);
-    assertThat("infinite range should return full set", results.size(), is(5));
-    assertThat("infinite range should return full set", results, hasItems(b, e, h, m, z));
-
-    results = KeyExtent.getKeyExtentsForRange(new Text("a"), new Text("z"), set0);
-    assertThat("full overlap should return full set", results.size(), is(5));
-    assertThat("full overlap should return full set", results, hasItems(b, e, h, m, z));
-
-    results = KeyExtent.getKeyExtentsForRange(null, new Text("f"), set0);
-    assertThat("end row should return head set", results.size(), is(3));
-    assertThat("end row should return head set", results, hasItems(b, e, h));
-
-    results = KeyExtent.getKeyExtentsForRange(new Text("f"), null, set0);
-    assertThat("start row should return tail set", results.size(), is(3));
-    assertThat("start row should return tail set", results, hasItems(h, m, z));
-
-    results = KeyExtent.getKeyExtentsForRange(new Text("f"), new Text("g"), set0);
-    assertThat("slice should return correct subset", results.size(), is(1));
-    assertThat("slice should return correct subset", results, hasItem(h));
-  }
-
   @Test
   public void testDecodeEncode() {
     assertNull(KeyExtent.decodePrevEndRow(KeyExtent.encodePrevEndRow(null)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
index 0cae140..0c0042b 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
@@ -33,7 +33,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.nio.ByteBuffer;
-import java.util.List;
 
 import org.apache.hadoop.io.Text;
 import org.junit.Before;
@@ -103,13 +102,6 @@ public class ValueTest {
   }
 
   @Test
-  public void testByteBufferCopy() {
-    @SuppressWarnings("deprecation")
-    Value v = new Value(DATABUFF, true);
-    assertArrayEquals(DATA, v.get());
-  }
-
-  @Test
   public void testValueCopy() {
     Value ov = createMock(Value.class);
     expect(ov.get()).andReturn(DATA);
@@ -200,24 +192,6 @@ public class ValueTest {
   }
 
   @Test
-  @Deprecated
-  public void testToArray() {
-    List<byte[]> l = new java.util.ArrayList<byte[]>();
-    byte[] one = toBytes("one");
-    byte[] two = toBytes("two");
-    byte[] three = toBytes("three");
-    l.add(one);
-    l.add(two);
-    l.add(three);
-
-    byte[][] a = Value.toArray(l);
-    assertEquals(3, a.length);
-    assertArrayEquals(one, a[0]);
-    assertArrayEquals(two, a[1]);
-    assertArrayEquals(three, a[2]);
-  }
-
-  @Test
   public void testString() {
     Value v1 = new Value("abc");
     Value v2 = new Value("abc".getBytes(UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
deleted file mode 100644
index e39d0d5..0000000
--- a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.iterators;
-
-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;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.system.MultiIterator;
-import org.apache.hadoop.io.Text;
-import org.junit.Test;
-
-public class AggregatingIteratorTest {
-
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
-
-  /**
-   * @deprecated since 1.4; visible only for testing
-   */
-  @Deprecated
-  public static class SummationAggregator implements org.apache.accumulo.core.iterators.aggregation.Aggregator {
-
-    int sum;
-
-    @Override
-    public Value aggregate() {
-      return new Value((sum + "").getBytes());
-    }
-
-    @Override
-    public void collect(Value value) {
-      int val = Integer.parseInt(value.toString());
-
-      sum += val;
-    }
-
-    @Override
-    public void reset() {
-      sum = 0;
-
-    }
-
-  }
-
-  static Key nk(int row, int colf, int colq, long ts, boolean deleted) {
-    Key k = nk(row, colf, colq, ts);
-    k.setDeleted(true);
-    return k;
-  }
-
-  static Key nk(int row, int colf, int colq, long ts) {
-    return new Key(nr(row), new Text(String.format("cf%03d", colf)), new Text(String.format("cq%03d", colq)), ts);
-  }
-
-  static Range nr(int row, int colf, int colq, long ts, boolean inclusive) {
-    return new Range(nk(row, colf, colq, ts), inclusive, null, true);
-  }
-
-  static Range nr(int row, int colf, int colq, long ts) {
-    return nr(row, colf, colq, ts, true);
-  }
-
-  static void nkv(TreeMap<Key,Value> tm, int row, int colf, int colq, long ts, boolean deleted, String val) {
-    Key k = nk(row, colf, colq, ts);
-    k.setDeleted(deleted);
-    tm.put(k, new Value(val.getBytes()));
-  }
-
-  static Text nr(int row) {
-    return new Text(String.format("r%03d", row));
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test1() throws IOException {
-
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    // keys that do not aggregate
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-    nkv(tm1, 1, 1, 1, 2, false, "3");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> emptyMap = Collections.emptyMap();
-    ai.init(new SortedMapIterator(tm1), emptyMap, null);
-    ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("4", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 1), ai.getTopKey());
-    assertEquals("2", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // try seeking
-
-    ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 1), ai.getTopKey());
-    assertEquals("2", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // seek after everything
-    ai.seek(nr(1, 1, 1, 0), EMPTY_COL_FAMS, false);
-
-    assertFalse(ai.hasTop());
-
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test2() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    // keys that aggregate
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-    nkv(tm1, 1, 1, 1, 2, false, "3");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> opts = new HashMap<String,String>();
-
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    ai.init(new SortedMapIterator(tm1), opts, null);
-    ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // try seeking to the beginning of a key that aggregates
-
-    ai.seek(nr(1, 1, 1, 3), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // try seeking the middle of a key the aggregates
-    ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false);
-
-    assertFalse(ai.hasTop());
-
-    // try seeking to the end of a key the aggregates
-    ai.seek(nr(1, 1, 1, 1), EMPTY_COL_FAMS, false);
-
-    assertFalse(ai.hasTop());
-
-    // try seeking before a key the aggregates
-    ai.seek(nr(1, 1, 1, 4), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test3() throws IOException {
-
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    // keys that aggregate
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-    nkv(tm1, 1, 1, 1, 2, false, "3");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-
-    // keys that do not aggregate
-    nkv(tm1, 2, 2, 1, 1, false, "2");
-    nkv(tm1, 2, 2, 1, 2, false, "3");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> opts = new HashMap<String,String>();
-
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    ai.init(new SortedMapIterator(tm1), opts, null);
-    ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 1), ai.getTopKey());
-    assertEquals("2", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // seek after key that aggregates
-    ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    // seek before key that aggregates
-    ai.seek(nr(1, 1, 1, 4), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test4() throws IOException {
-
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    // keys that do not aggregate
-    nkv(tm1, 0, 0, 1, 1, false, "7");
-
-    // keys that aggregate
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-    nkv(tm1, 1, 1, 1, 2, false, "3");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-
-    // keys that do not aggregate
-    nkv(tm1, 2, 2, 1, 1, false, "2");
-    nkv(tm1, 2, 2, 1, 2, false, "3");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> opts = new HashMap<String,String>();
-
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    ai.init(new SortedMapIterator(tm1), opts, null);
-    ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(0, 0, 1, 1), ai.getTopKey());
-    assertEquals("7", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 1), ai.getTopKey());
-    assertEquals("2", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertFalse(ai.hasTop());
-
-    // seek test
-    ai.seek(nr(0, 0, 1, 0), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 3), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-
-    ai.next();
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-    // seek after key that aggregates
-    ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(2, 2, 1, 2), ai.getTopKey());
-    assertEquals("3", ai.getTopValue().toString());
-
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test5() throws IOException {
-    // try aggregating across multiple data sets that contain
-    // the exact same keys w/ different values
-
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
-    nkv(tm2, 1, 1, 1, 1, false, "3");
-
-    TreeMap<Key,Value> tm3 = new TreeMap<Key,Value>();
-    nkv(tm3, 1, 1, 1, 1, false, "4");
-
-    AggregatingIterator ai = new AggregatingIterator();
-    Map<String,String> opts = new HashMap<String,String>();
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<SortedKeyValueIterator<Key,Value>>(3);
-    sources.add(new SortedMapIterator(tm1));
-    sources.add(new SortedMapIterator(tm2));
-    sources.add(new SortedMapIterator(tm3));
-
-    MultiIterator mi = new MultiIterator(sources, true);
-    ai.init(mi, opts, null);
-    ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 1), ai.getTopKey());
-    assertEquals("9", ai.getTopValue().toString());
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test6() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    // keys that aggregate
-    nkv(tm1, 1, 1, 1, 1, false, "2");
-    nkv(tm1, 1, 1, 1, 2, false, "3");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> opts = new HashMap<String,String>();
-
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment());
-
-    // try seeking to the beginning of a key that aggregates
-
-    ai.seek(nr(1, 1, 1, 3, false), EMPTY_COL_FAMS, false);
-
-    assertFalse(ai.hasTop());
-
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test7() throws IOException {
-    // test that delete is not aggregated
-
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-
-    nkv(tm1, 1, 1, 1, 2, true, "");
-    nkv(tm1, 1, 1, 1, 3, false, "4");
-    nkv(tm1, 1, 1, 1, 4, false, "3");
-
-    AggregatingIterator ai = new AggregatingIterator();
-
-    Map<String,String> opts = new HashMap<String,String>();
-
-    opts.put("cf001", SummationAggregator.class.getName());
-
-    ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment());
-
-    ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 4), ai.getTopKey());
-    assertEquals("7", ai.getTopValue().toString());
-
-    ai.next();
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 2, true), ai.getTopKey());
-    assertEquals("", ai.getTopValue().toString());
-
-    ai.next();
-    assertFalse(ai.hasTop());
-
-    tm1 = new TreeMap<Key,Value>();
-    nkv(tm1, 1, 1, 1, 2, true, "");
-    ai = new AggregatingIterator();
-    ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment());
-
-    ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
-
-    assertTrue(ai.hasTop());
-    assertEquals(nk(1, 1, 1, 2, true), ai.getTopKey());
-    assertEquals("", ai.getTopValue().toString());
-
-    ai.next();
-    assertFalse(ai.hasTop());
-
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
deleted file mode 100644
index 5a56ead..0000000
--- a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.iterators.aggregation;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.accumulo.core.data.Value;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @deprecated since 1.4
- */
-@Deprecated
-public class NumSummationTest {
-
-  private static final Logger log = LoggerFactory.getLogger(NumSummationTest.class);
-
-  public byte[] init(int n) {
-    byte[] b = new byte[n];
-    for (int i = 0; i < b.length; i++)
-      b[i] = 0;
-    return b;
-  }
-
-  @Test
-  public void test1() {
-    try {
-      long[] la = {1l, 2l, 3l};
-      byte[] b = NumArraySummation.longArrayToBytes(la);
-      long[] la2 = NumArraySummation.bytesToLongArray(b);
-
-      assertTrue(la.length == la2.length);
-      for (int i = 0; i < la.length; i++) {
-        assertTrue(i + ": " + la[i] + " does not equal " + la2[i], la[i] == la2[i]);
-      }
-    } catch (Exception e) {
-      assertTrue(false);
-    }
-  }
-
-  @Test
-  public void test2() {
-    try {
-      NumArraySummation nas = new NumArraySummation();
-      long[] la = {1l, 2l, 3l};
-      nas.collect(new Value(NumArraySummation.longArrayToBytes(la)));
-      long[] la2 = {3l, 2l, 1l, 0l};
-      nas.collect(new Value(NumArraySummation.longArrayToBytes(la2)));
-      la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
-      assertTrue(la.length == 4);
-      for (int i = 0; i < la.length - 1; i++) {
-        assertTrue(la[i] == 4);
-      }
-      assertTrue(la[la.length - 1] == 0);
-      nas.reset();
-      la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
-      assertTrue(la.length == 0);
-    } catch (Exception e) {
-      log.error("{}", e.getMessage(), e);
-      assertTrue(false);
-    }
-  }
-
-  @Test
-  public void test3() {
-    try {
-      NumArraySummation nas = new NumArraySummation();
-      long[] la = {Long.MAX_VALUE, Long.MIN_VALUE, 3l, -5l, 5l, 5l};
-      nas.collect(new Value(NumArraySummation.longArrayToBytes(la)));
-      long[] la2 = {1l, -3l, 2l, 10l};
-      nas.collect(new Value(NumArraySummation.longArrayToBytes(la2)));
-      la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
-      assertTrue(la.length == 6);
-      for (int i = 2; i < la.length; i++) {
-        assertTrue(la[i] == 5);
-      }
-      assertTrue("max long plus one was " + la[0], la[0] == Long.MAX_VALUE);
-      assertTrue("min long minus 3 was " + la[1], la[1] == Long.MIN_VALUE);
-    } catch (Exception e) {
-      assertTrue(false);
-    }
-  }
-
-  @Test
-  public void test4() {
-    try {
-      long l = 5l;
-      byte[] b = NumSummation.longToBytes(l);
-      long l2 = NumSummation.bytesToLong(b);
-
-      assertTrue(l == l2);
-    } catch (Exception e) {
-      assertTrue(false);
-    }
-  }
-
-  @Test
-  public void test5() {
-    try {
-      NumSummation ns = new NumSummation();
-      for (long l = -5l; l < 8l; l++) {
-        ns.collect(new Value(NumSummation.longToBytes(l)));
-      }
-      long l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == 13);
-
-      ns.collect(new Value(NumSummation.longToBytes(Long.MAX_VALUE)));
-      l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == Long.MAX_VALUE);
-
-      ns.collect(new Value(NumSummation.longToBytes(Long.MIN_VALUE)));
-      l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == -1);
-
-      ns.collect(new Value(NumSummation.longToBytes(Long.MIN_VALUE)));
-      l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == Long.MIN_VALUE);
-
-      ns.collect(new Value(NumSummation.longToBytes(Long.MIN_VALUE)));
-      l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == Long.MIN_VALUE);
-
-      ns.reset();
-      l = NumSummation.bytesToLong(ns.aggregate().get());
-      assertTrue("l was " + l, l == 0);
-    } catch (IOException | RuntimeException e) {
-      fail();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
deleted file mode 100644
index 61693ab..0000000
--- a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.iterators.aggregation.conf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.apache.hadoop.io.Text;
-import org.junit.Test;
-
-public class AggregatorConfigurationTest {
-
-  @Test
-  public void testBinary() {
-    Text colf = new Text();
-    Text colq = new Text();
-
-    for (int i = 0; i < 256; i++) {
-      colf.append(new byte[] {(byte) i}, 0, 1);
-      colq.append(new byte[] {(byte) (255 - i)}, 0, 1);
-    }
-
-    runTest(colf, colq);
-    runTest(colf);
-  }
-
-  @Test
-  public void testBasic() {
-    runTest(new Text("colf1"), new Text("cq2"));
-    runTest(new Text("colf1"));
-  }
-
-  @SuppressWarnings("deprecation")
-  private void runTest(Text colf) {
-    String encodedCols;
-    org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig ac3 = new org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig(colf,
-        "com.foo.SuperAgg");
-    encodedCols = ac3.encodeColumns();
-    org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig ac4 = org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig.decodeColumns(
-        encodedCols, "com.foo.SuperAgg");
-
-    assertEquals(colf, ac4.getColumnFamily());
-    assertNull(ac4.getColumnQualifier());
-  }
-
-  @SuppressWarnings("deprecation")
-  private void runTest(Text colf, Text colq) {
-    org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig ac = new org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig(colf, colq,
-        "com.foo.SuperAgg");
-    String encodedCols = ac.encodeColumns();
-    org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig ac2 = org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig.decodeColumns(
-        encodedCols, "com.foo.SuperAgg");
-
-    assertEquals(colf, ac2.getColumnFamily());
-    assertEquals(colq, ac2.getColumnQualifier());
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/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 bd4b1ba..8422c6f 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
@@ -25,9 +25,7 @@ import static org.junit.Assert.fail;
 
 import javax.security.auth.DestroyFailedException;
 
-import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.impl.Credentials;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
@@ -35,7 +33,6 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Authe
 import org.apache.accumulo.core.client.security.tokens.NullToken;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.security.thrift.TCredentials;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Rule;
@@ -86,24 +83,6 @@ public class CredentialsTest {
   }
 
   @Test
-  public void testMockConnector() throws AccumuloException, DestroyFailedException, AccumuloSecurityException {
-    Instance inst = DeprecationUtil.makeMockInstance(test.getMethodName());
-    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());
-    try {
-      inst.getConnector("testUser", testToken);
-      fail();
-    } catch (AccumuloSecurityException e) {
-      assertTrue(e.getSecurityErrorCode().equals(SecurityErrorCode.TOKEN_EXPIRED));
-    }
-  }
-
-  @Test
   public void testEqualsAndHashCode() {
     Credentials nullNullCreds = new Credentials(null, null);
     Credentials abcNullCreds = new Credentials("abc", new NullToken());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
deleted file mode 100644
index 505c198..0000000
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.util.format;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.TreeMap;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.junit.Before;
-import org.junit.Test;
-
-@SuppressWarnings("deprecation")
-public class DateStringFormatterTest {
-  DateStringFormatter formatter;
-
-  Map<Key,Value> data;
-
-  @Before
-  public void setUp() {
-    formatter = new DateStringFormatter();
-    data = new TreeMap<Key,Value>();
-    data.put(new Key("", "", "", 0), new Value());
-  }
-
-  private void testFormatterIgnoresConfig(FormatterConfig config, DateStringFormatter formatter) {
-    // ignores config's DateFormatSupplier and substitutes its own
-    formatter.initialize(data.entrySet(), config);
-
-    assertTrue(formatter.hasNext());
-    final String next = formatter.next();
-    assertTrue(next, next.endsWith("1970/01/01 00:00:00.000"));
-  }
-
-  @Test
-  public void testTimestamps() {
-    final TimeZone utc = TimeZone.getTimeZone("UTC");
-    final TimeZone est = TimeZone.getTimeZone("EST");
-    final FormatterConfig config = new FormatterConfig().setPrintTimestamps(true);
-    DateStringFormatter formatter;
-
-    formatter = new DateStringFormatter(utc);
-    testFormatterIgnoresConfig(config, formatter);
-
-    // even though config says to use EST and only print year, the Formatter will override these
-    formatter = new DateStringFormatter(utc);
-    DateFormatSupplier dfSupplier = DateFormatSupplier.createSimpleFormatSupplier("YYYY", est);
-    config.setDateFormatSupplier(dfSupplier);
-    testFormatterIgnoresConfig(config, formatter);
-  }
-
-  @Test
-  public void testNoTimestamps() {
-    data.put(new Key("", "", "", 1), new Value());
-
-    assertEquals(2, data.size());
-
-    formatter.initialize(data.entrySet(), new FormatterConfig());
-
-    assertEquals(formatter.next(), formatter.next());
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
index 1baa3a1..47ba1c9 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
@@ -38,15 +38,11 @@ import org.apache.accumulo.minicluster.ServerType;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * AccumuloCluster implementation to connect to an existing deployment of Accumulo
  */
 public class StandaloneAccumuloCluster implements AccumuloCluster {
-  @SuppressWarnings("unused")
-  private static final Logger log = LoggerFactory.getLogger(StandaloneAccumuloCluster.class);
 
   static final List<ServerType> ALL_SERVER_TYPES = Collections.unmodifiableList(Arrays.asList(ServerType.MASTER, ServerType.TABLET_SERVER, ServerType.TRACER,
       ServerType.GARBAGE_COLLECTOR, ServerType.MONITOR));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 7bbfd07..482e875 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -370,9 +370,11 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
    * @param config
    *          initial configuration
    */
-  @SuppressWarnings("deprecation")
   public MiniAccumuloClusterImpl(MiniAccumuloConfigImpl config) throws IOException {
-
+    @SuppressWarnings("deprecation")
+    Property INSTANCE_DFS_DIR = Property.INSTANCE_DFS_DIR;
+    @SuppressWarnings("deprecation")
+    Property INSTANCE_DFS_URI = Property.INSTANCE_DFS_URI;
     this.config = config.initialize();
 
     mkdirs(config.getConfDir());
@@ -417,8 +419,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
       writeConfig(hdfsFile, conf);
 
       Map<String,String> siteConfig = config.getSiteConfig();
-      siteConfig.put(Property.INSTANCE_DFS_URI.getKey(), dfsUri);
-      siteConfig.put(Property.INSTANCE_DFS_DIR.getKey(), "/accumulo");
+      siteConfig.put(INSTANCE_DFS_URI.getKey(), dfsUri);
+      siteConfig.put(INSTANCE_DFS_DIR.getKey(), "/accumulo");
       config.setSiteConfig(siteConfig);
     } else if (config.useExistingInstance()) {
       dfsUri = CachedConfiguration.getInstance().get(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index dc616df..4293d47 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -34,6 +34,9 @@ import org.junit.rules.TemporaryFolder;
 
 public class MiniAccumuloConfigImplTest {
 
+  @SuppressWarnings("deprecation")
+  private static final Property INSTANCE_DFS_URI = Property.INSTANCE_DFS_URI;
+
   static TemporaryFolder tempFolder = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target"));
 
   @BeforeClass
@@ -61,15 +64,14 @@ public class MiniAccumuloConfigImplTest {
     assertEquals(5000, config.getZooKeeperStartupTime());
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   public void testSiteConfig() {
 
     // constructor site config overrides default props
     Map<String,String> siteConfig = new HashMap<String,String>();
-    siteConfig.put(Property.INSTANCE_DFS_URI.getKey(), "hdfs://");
+    siteConfig.put(INSTANCE_DFS_URI.getKey(), "hdfs://");
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password").setSiteConfig(siteConfig).initialize();
-    assertEquals("hdfs://", config.getSiteConfig().get(Property.INSTANCE_DFS_URI.getKey()));
+    assertEquals("hdfs://", config.getSiteConfig().get(INSTANCE_DFS_URI.getKey()));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3130c0..b4f9d71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@
     <module>shell</module>
     <module>start</module>
     <module>test</module>
-    <module>trace</module>
   </modules>
   <scm>
     <connection>scm:git:git://git.apache.org/accumulo.git</connection>
@@ -340,11 +339,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-trace</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-tracer</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 7e2c312..66ab16c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -85,7 +85,6 @@ import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
 import org.apache.accumulo.proxy.thrift.BatchScanOptions;
@@ -190,23 +189,18 @@ public class ProxyServer implements AccumuloProxy.Iface {
 
   public ProxyServer(Properties props) {
 
-    String useMock = props.getProperty("useMockInstance");
-    if (useMock != null && Boolean.parseBoolean(useMock))
-      instance = DeprecationUtil.makeMockInstance(this.getClass().getName());
-    else {
-      ClientConfiguration clientConf;
-      if (props.containsKey("clientConfigurationFile")) {
-        String clientConfFile = props.getProperty("clientConfigurationFile");
-        try {
-          clientConf = new ClientConfiguration(clientConfFile);
-        } catch (ConfigurationException e) {
-          throw new RuntimeException(e);
-        }
-      } else {
-        clientConf = ClientConfiguration.loadDefault();
+    ClientConfiguration clientConf;
+    if (props.containsKey("clientConfigurationFile")) {
+      String clientConfFile = props.getProperty("clientConfigurationFile");
+      try {
+        clientConf = new ClientConfiguration(clientConfFile);
+      } catch (ConfigurationException e) {
+        throw new RuntimeException(e);
       }
-      instance = new ZooKeeperInstance(clientConf.withInstance(props.getProperty("instance")).withZkHosts(props.getProperty("zookeepers")));
+    } else {
+      clientConf = ClientConfiguration.loadDefault();
     }
+    instance = new ZooKeeperInstance(clientConf.withInstance(props.getProperty("instance")).withZkHosts(props.getProperty("zookeepers")));
 
     try {
       String tokenProp = props.getProperty("tokenClass", PasswordToken.class.getName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java b/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java
index ce7bfad..1a61707 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java
@@ -28,11 +28,9 @@ import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.impl.ClientContext;
 import org.apache.accumulo.core.client.impl.ConnectorImpl;
 import org.apache.accumulo.core.client.impl.Credentials;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.rpc.SslConnectionParams;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.rpc.SaslServerConnectionParams;
@@ -94,9 +92,6 @@ public class AccumuloServerContext extends ClientContext {
    * Get the credentials to use for this instance so it can be passed to the superclass during construction.
    */
   private static Credentials getCredentials(Instance instance) {
-    if (DeprecationUtil.isMockInstance(instance)) {
-      return new Credentials("mockSystemUser", new PasswordToken("mockSystemPassword"));
-    }
     return SystemCredentials.get(instance);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
index a058660..7af978b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.server.cli;
 
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ClientOnDefaultTable extends org.apache.accumulo.core.cli.ClientOnDefaultTable {
@@ -31,8 +30,6 @@ public class ClientOnDefaultTable extends org.apache.accumulo.core.cli.ClientOnD
     if (cachedInstance != null)
       return cachedInstance;
 
-    if (mock)
-      return cachedInstance = DeprecationUtil.makeMockInstance(instance);
     if (instance == null) {
       return cachedInstance = HdfsZooInstance.getInstance();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
index e02dd93..c966723 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.server.cli;
 
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ClientOnRequiredTable extends org.apache.accumulo.core.cli.ClientOnRequiredTable {
@@ -31,8 +30,6 @@ public class ClientOnRequiredTable extends org.apache.accumulo.core.cli.ClientOn
     if (cachedInstance != null)
       return cachedInstance;
 
-    if (mock)
-      return cachedInstance = DeprecationUtil.makeMockInstance(instance);
     if (instance == null) {
       return cachedInstance = HdfsZooInstance.getInstance();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
index c91471e..81a42f8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.server.cli;
 
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.util.DeprecationUtil;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ClientOpts extends org.apache.accumulo.core.cli.ClientOpts {
@@ -29,8 +28,6 @@ public class ClientOpts extends org.apache.accumulo.core.cli.ClientOpts {
 
   @Override
   public Instance getInstance() {
-    if (mock)
-      return DeprecationUtil.makeMockInstance(instance);
     if (instance == null) {
       return HdfsZooInstance.getInstance();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
index e4e73d2..bca8ddf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.server.client;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -35,28 +34,24 @@ import org.apache.accumulo.core.client.impl.ConnectorImpl;
 import org.apache.accumulo.core.client.impl.Credentials;
 import org.apache.accumulo.core.client.impl.InstanceOperationsImpl;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.metadata.RootTable;
-import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.OpTimer;
-import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
 import org.apache.accumulo.server.Accumulo;
-import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import com.google.common.base.Joiner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Joiner;
+
 /**
  * An implementation of Instance that looks in HDFS and ZooKeeper to find the master and root tablet location.
  *
@@ -177,38 +172,6 @@ public class HdfsZooInstance implements Instance {
     return new ConnectorImpl(new ClientContext(this, new Credentials(principal, token), SiteConfiguration.getInstance()));
   }
 
-  @Deprecated
-  @Override
-  public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
-    return getConnector(user, new PasswordToken(pass));
-  }
-
-  @Deprecated
-  @Override
-  public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
-    return getConnector(user, ByteBufferUtil.toBytes(pass));
-  }
-
-  @Deprecated
-  @Override
-  public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
-    return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
-  }
-
-  private AccumuloConfiguration conf = null;
-
-  @Deprecated
-  @Override
-  public AccumuloConfiguration getConfiguration() {
-    return conf = conf == null ? new ServerConfigurationFactory(this).getConfiguration() : conf;
-  }
-
-  @Override
-  @Deprecated
-  public void setConfiguration(AccumuloConfiguration conf) {
-    this.conf = conf;
-  }
-
   public static void main(String[] args) {
     Instance instance = HdfsZooInstance.getInstance();
     System.out.println("Instance Name: " + instance.getInstanceName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
index 97bc858..9e8f576 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
@@ -22,14 +22,11 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * When SASL is enabled, this parses properties from the site configuration to build up a set of all users capable of impersonating another user, the users
@@ -44,9 +41,8 @@ import org.slf4j.LoggerFactory;
  */
 public class UserImpersonation {
 
-  private static final Logger log = LoggerFactory.getLogger(UserImpersonation.class);
   private static final Set<String> ALWAYS_TRUE = new AlwaysTrueSet<>();
-  private static final String ALL = "*", USERS = "users", HOSTS = "hosts";
+  private static final String ALL = "*";
 
   public static class AlwaysTrueSet<T> implements Set<T> {
 
@@ -173,7 +169,6 @@ public class UserImpersonation {
 
   private final Map<String,UsersWithHosts> proxyUsers;
 
-  @SuppressWarnings("deprecation")
   public UserImpersonation(AccumuloConfiguration conf) {
     proxyUsers = new HashMap<>();
 
@@ -182,9 +177,6 @@ public class UserImpersonation {
     if (!Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION.getDefaultValue().equals(userConfig)) {
       String hostConfig = conf.get(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION);
       parseOnelineConfiguration(userConfig, hostConfig);
-    } else {
-      // Otherwise, assume the old-style
-      parseMultiPropertyConfiguration(conf.getAllPropertiesWithPrefix(Property.INSTANCE_RPC_SASL_PROXYUSERS));
     }
   }
 
@@ -252,64 +244,6 @@ public class UserImpersonation {
     }
   }
 
-  /**
-   * Parses all properties that start with {@link Property#INSTANCE_RPC_SASL_PROXYUSERS}. This approach was the original configuration method, but does not work
-   * with Ambari.
-   *
-   * @param configProperties
-   *          The relevant configuration properties for impersonation.
-   */
-  @SuppressWarnings("javadoc")
-  private void parseMultiPropertyConfiguration(Map<String,String> configProperties) {
-    @SuppressWarnings("deprecation")
-    final String configKey = Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey();
-    for (Entry<String,String> entry : configProperties.entrySet()) {
-      String aclKey = entry.getKey().substring(configKey.length());
-      int index = aclKey.lastIndexOf('.');
-
-      if (-1 == index) {
-        throw new RuntimeException("Expected 2 elements in key suffix: " + aclKey);
-      }
-
-      final String remoteUser = aclKey.substring(0, index).trim(), usersOrHosts = aclKey.substring(index + 1).trim();
-      UsersWithHosts usersWithHosts = proxyUsers.get(remoteUser);
-      if (null == usersWithHosts) {
-        usersWithHosts = new UsersWithHosts();
-        proxyUsers.put(remoteUser, usersWithHosts);
-      }
-
-      if (USERS.equals(usersOrHosts)) {
-        String userString = entry.getValue().trim();
-        if (ALL.equals(userString)) {
-          usersWithHosts.setAcceptAllUsers(true);
-        } else if (!usersWithHosts.acceptsAllUsers()) {
-          Set<String> users = usersWithHosts.getUsers();
-          if (null == users) {
-            users = new HashSet<>();
-            usersWithHosts.setUsers(users);
-          }
-          String[] userValues = StringUtils.split(userString, ',');
-          users.addAll(Arrays.<String> asList(userValues));
-        }
-      } else if (HOSTS.equals(usersOrHosts)) {
-        String hostsString = entry.getValue().trim();
-        if (ALL.equals(hostsString)) {
-          usersWithHosts.setAcceptAllHosts(true);
-        } else if (!usersWithHosts.acceptsAllHosts()) {
-          Set<String> hosts = usersWithHosts.getHosts();
-          if (null == hosts) {
-            hosts = new HashSet<>();
-            usersWithHosts.setHosts(hosts);
-          }
-          String[] hostValues = StringUtils.split(hostsString, ',');
-          hosts.addAll(Arrays.<String> asList(hostValues));
-        }
-      } else {
-        log.debug("Ignoring key " + aclKey);
-      }
-    }
-  }
-
   public UsersWithHosts get(String remoteUser) {
     return proxyUsers.get(remoteUser);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
index cb34fb9..1f915c0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
@@ -41,6 +41,11 @@ import org.junit.Test;
  * This test is not thread-safe.
  */
 public class InitializeTest {
+  @SuppressWarnings("deprecation")
+  private static Property INSTANCE_DFS_DIR = Property.INSTANCE_DFS_DIR;
+  @SuppressWarnings("deprecation")
+  private static Property INSTANCE_DFS_URI = Property.INSTANCE_DFS_URI;
+
   private Configuration conf;
   private VolumeManager fs;
   private SiteConfiguration sconf;
@@ -77,10 +82,9 @@ public class InitializeTest {
     assertTrue(Initialize.isInitialized(fs));
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   public void testCheckInit_NoZK() throws Exception {
-    expect(sconf.get(Property.INSTANCE_DFS_URI)).andReturn("hdfs://foo");
+    expect(sconf.get(INSTANCE_DFS_URI)).andReturn("hdfs://foo");
     expectLastCall().anyTimes();
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1");
     replay(sconf);
@@ -90,12 +94,11 @@ public class InitializeTest {
     assertFalse(Initialize.checkInit(conf, fs, sconf));
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   public void testCheckInit_AlreadyInit() throws Exception {
-    expect(sconf.get(Property.INSTANCE_DFS_URI)).andReturn("hdfs://foo");
+    expect(sconf.get(INSTANCE_DFS_URI)).andReturn("hdfs://foo");
     expectLastCall().anyTimes();
-    expect(sconf.get(Property.INSTANCE_DFS_DIR)).andReturn("/bar");
+    expect(sconf.get(INSTANCE_DFS_DIR)).andReturn("/bar");
     expect(sconf.get(Property.INSTANCE_VOLUMES)).andReturn("");
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1");
     expect(sconf.get(Property.INSTANCE_SECRET)).andReturn(Property.INSTANCE_SECRET.getDefaultValue());
@@ -109,13 +112,12 @@ public class InitializeTest {
   }
 
   // Cannot test, need to mock static FileSystem.getDefaultUri()
-  @SuppressWarnings("deprecation")
   @Ignore
   @Test
   public void testCheckInit_AlreadyInit_DefaultUri() throws Exception {
-    expect(sconf.get(Property.INSTANCE_DFS_URI)).andReturn("");
+    expect(sconf.get(INSTANCE_DFS_URI)).andReturn("");
     expectLastCall().anyTimes();
-    expect(sconf.get(Property.INSTANCE_DFS_DIR)).andReturn("/bar");
+    expect(sconf.get(INSTANCE_DFS_DIR)).andReturn("/bar");
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1");
     expect(sconf.get(Property.INSTANCE_SECRET)).andReturn(Property.INSTANCE_SECRET.getDefaultValue());
     replay(sconf);
@@ -128,10 +130,9 @@ public class InitializeTest {
     assertFalse(Initialize.checkInit(conf, fs, sconf));
   }
 
-  @SuppressWarnings("deprecation")
   @Test(expected = IOException.class)
   public void testCheckInit_FSException() throws Exception {
-    expect(sconf.get(Property.INSTANCE_DFS_URI)).andReturn("hdfs://foo");
+    expect(sconf.get(INSTANCE_DFS_URI)).andReturn("hdfs://foo");
     expectLastCall().anyTimes();
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1");
     expect(sconf.get(Property.INSTANCE_SECRET)).andReturn(Property.INSTANCE_SECRET.getDefaultValue());
@@ -144,10 +145,9 @@ public class InitializeTest {
     Initialize.checkInit(conf, fs, sconf);
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   public void testCheckInit_OK() throws Exception {
-    expect(sconf.get(Property.INSTANCE_DFS_URI)).andReturn("hdfs://foo");
+    expect(sconf.get(INSTANCE_DFS_URI)).andReturn("hdfs://foo");
     expectLastCall().anyTimes();
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1");
     expect(sconf.get(Property.INSTANCE_SECRET)).andReturn(Property.INSTANCE_SECRET.getDefaultValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
index 3ed6a1b..b887f29 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.server.master.balancer;
 
 import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -80,34 +79,6 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
       return 30;
     }
 
-    @Deprecated
-    @Override
-    public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
-      throw new UnsupportedOperationException();
-    }
-
-    @Deprecated
-    @Override
-    public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
-      throw new UnsupportedOperationException();
-    }
-
-    @Deprecated
-    @Override
-    public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
-      throw new UnsupportedOperationException();
-    }
-
-    @Deprecated
-    @Override
-    public AccumuloConfiguration getConfiguration() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Deprecated
-    @Override
-    public void setConfiguration(AccumuloConfiguration conf) {}
-
     @Override
     public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
       throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
index 7a7035c..a395b22 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
@@ -116,18 +116,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testAllowedAnyImpersonationForAnyUser() throws Exception {
-    final String proxyServer = "proxy";
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "*");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test
   public void testAllowedAnyImpersonationForAnyUserNewConfig() throws Exception {
     final String proxyServer = "proxy";
@@ -139,20 +127,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testAllowedImpersonationForSpecificUsers() throws Exception {
-    final String proxyServer = "proxy";
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "client1,client2");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-    tcreds = new TCredentials("client2", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test
   public void testAllowedImpersonationForSpecificUsersNewConfig() throws Exception {
     final String proxyServer = "proxy";
@@ -166,19 +140,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test(expected = ThriftSecurityException.class)
-  public void testDisallowedImpersonationForUser() throws Exception {
-    final String proxyServer = "proxy";
-    // let "otherproxy" impersonate, but not "proxy"
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".users", "*");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test(expected = ThriftSecurityException.class)
   public void testDisallowedImpersonationForUserNewConfig() throws Exception {
     final String proxyServer = "proxy";
@@ -191,21 +152,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test(expected = ThriftSecurityException.class)
-  public void testDisallowedImpersonationForMultipleUsers() throws Exception {
-    final String proxyServer = "proxy";
-    // let "otherproxy" impersonate, but not "proxy"
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy1" + ".users", "*");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy1" + ".hosts", "*");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".users", "client1,client2");
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test(expected = ThriftSecurityException.class)
   public void testDisallowedImpersonationForMultipleUsersNewConfig() throws Exception {
     final String proxyServer = "proxy";
@@ -218,19 +164,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testAllowedImpersonationFromSpecificHost() throws Exception {
-    final String proxyServer = "proxy", client = "client", host = "host.domain.com";
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    TServerUtils.clientAddress.set(host);
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test
   public void testAllowedImpersonationFromSpecificHostNewConfig() throws Exception {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
@@ -243,20 +176,6 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     proxy.updateArgs(new Object[] {new Object(), tcreds});
   }
 
-  @SuppressWarnings("deprecation")
-  @Test(expected = ThriftSecurityException.class)
-  public void testDisallowedImpersonationFromSpecificHost() throws Exception {
-    final String proxyServer = "proxy", client = "client", host = "host.domain.com";
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
-    cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
-    TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
-    UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
-    // The RPC came from a different host than is allowed
-    TServerUtils.clientAddress.set("otherhost.domain.com");
-    proxy.updateArgs(new Object[] {new Object(), tcreds});
-  }
-
   @Test(expected = ThriftSecurityException.class)
   public void testDisallowedImpersonationFromSpecificHostNewConfig() throws Exception {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";


Mime
View raw message