accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-4568 Remove non-public API leakage
Date Fri, 13 Jan 2017 17:59:06 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master fd0a4ebf1 -> dca2ff939


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java b/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
deleted file mode 100644
index 78c0e56..0000000
--- a/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
+++ /dev/null
@@ -1,58 +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.data;
-
-import org.apache.hadoop.io.BinaryComparable;
-
-/**
- * An array of bytes wrapped so as to extend Hadoop's <code>BinaryComparable</code>
class.
- *
- * @deprecated since 1.7.0 In an attempt to clean up types in the data package that were
not intended to be in public API this type was deprecated. Technically
- *             this method was not considered part of the public API in 1.6.0 and earlier,
therefore it could have been deleted. However a decision was made to
- *             deprecate in order to be cautious and avoid confusion between 1.6.0 and 1.7.0.
- */
-@Deprecated
-public class ComparableBytes extends BinaryComparable {
-
-  public byte[] data;
-
-  /**
-   * Creates a new byte wrapper. The given byte array is used directly as a backing array,
so later changes made to the array reflect into the new object.
-   *
-   * @param b
-   *          bytes to wrap
-   */
-  public ComparableBytes(byte[] b) {
-    this.data = b;
-  }
-
-  /**
-   * Gets the wrapped bytes in this object.
-   *
-   * @return bytes
-   */
-  @Override
-  public byte[] getBytes() {
-    return data;
-  }
-
-  @Override
-  public int getLength() {
-    return data.length;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
deleted file mode 100644
index 4e3d058..0000000
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ /dev/null
@@ -1,259 +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.data;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.apache.accumulo.core.data.thrift.TKeyExtent;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema;
-import org.apache.hadoop.io.BinaryComparable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparable;
-
-/**
- * keeps track of information needed to identify a tablet
- *
- * @deprecated since 1.7.0 use {@link TabletId}
- */
-@Deprecated
-public class KeyExtent implements WritableComparable<KeyExtent> {
-
-  // Wrapping impl.KeyExtent to resuse code. Did not want to extend impl.KeyExtent because
any changes to impl.KeyExtent would be reflected in this class.
-  // Wrapping impl.KeyExtent allows the API of this deprecated class to be frozen.
-  private org.apache.accumulo.core.data.impl.KeyExtent wrapped;
-
-  public KeyExtent() {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent();
-  }
-
-  public KeyExtent(Text table, Text endRow, Text prevEndRow) {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(table.toString(), endRow,
prevEndRow);
-  }
-
-  public KeyExtent(KeyExtent extent) {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(extent.getTableId().toString(),
extent.getEndRow(), extent.getPrevEndRow());
-  }
-
-  public KeyExtent(TKeyExtent tke) {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(tke);
-  }
-
-  // constructor for loading extents from metadata rows
-  public KeyExtent(Text flattenedExtent, Value prevEndRow) {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(flattenedExtent, prevEndRow);
-  }
-
-  // recreates an encoded extent from a string representation
-  // this encoding is what is stored as the row id of the metadata table
-  public KeyExtent(Text flattenedExtent, Text prevEndRow) {
-    this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(flattenedExtent, prevEndRow);
-  }
-
-  public Text getMetadataEntry() {
-    return wrapped.getMetadataEntry();
-  }
-
-  public void setTableId(Text tId) {
-    wrapped.setTableId(tId.toString());
-  }
-
-  public Text getTableId() {
-    return new Text(wrapped.getTableId());
-  }
-
-  public void setEndRow(Text endRow) {
-    wrapped.setEndRow(endRow);
-  }
-
-  public Text getEndRow() {
-    return wrapped.getEndRow();
-  }
-
-  public Text getPrevEndRow() {
-    return wrapped.getPrevEndRow();
-  }
-
-  public void setPrevEndRow(Text prevEndRow) {
-    wrapped.setPrevEndRow(prevEndRow);
-  }
-
-  @Override
-  public void readFields(DataInput in) throws IOException {
-    wrapped.readFields(in);
-  }
-
-  @Override
-  public void write(DataOutput out) throws IOException {
-    wrapped.write(out);
-  }
-
-  public Mutation getPrevRowUpdateMutation() {
-    return wrapped.getPrevRowUpdateMutation();
-  }
-
-  @Override
-  public int compareTo(KeyExtent other) {
-    return wrapped.compareTo(other.wrapped);
-  }
-
-  @Override
-  public int hashCode() {
-    return wrapped.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o instanceof KeyExtent) {
-      return wrapped.equals(((KeyExtent) o).wrapped);
-    }
-
-    return false;
-  }
-
-  @Override
-  public String toString() {
-    return wrapped.toString();
-  }
-
-  public UUID getUUID() {
-    return wrapped.getUUID();
-  }
-
-  public boolean contains(ByteSequence bsrow) {
-    return wrapped.contains(bsrow);
-  }
-
-  public boolean contains(BinaryComparable row) {
-    return wrapped.contains(row);
-  }
-
-  public Range toDataRange() {
-    return wrapped.toDataRange();
-  }
-
-  public Range toMetadataRange() {
-    return wrapped.toMetadataRange();
-  }
-
-  public boolean overlaps(KeyExtent other) {
-    return wrapped.overlaps(other.wrapped);
-  }
-
-  public TKeyExtent toThrift() {
-    return wrapped.toThrift();
-  }
-
-  public boolean isPreviousExtent(KeyExtent prevExtent) {
-    return wrapped.isPreviousExtent(prevExtent.wrapped);
-  }
-
-  public boolean isMeta() {
-    return wrapped.isMeta();
-  }
-
-  public boolean isRootTablet() {
-    return wrapped.isRootTablet();
-  }
-
-  private static SortedSet<org.apache.accumulo.core.data.impl.KeyExtent> unwrap(Set<KeyExtent>
tablets) {
-    SortedSet<org.apache.accumulo.core.data.impl.KeyExtent> trans = new TreeSet<>();
-    for (KeyExtent wrapper : tablets) {
-      trans.add(wrapper.wrapped);
-    }
-
-    return trans;
-  }
-
-  private static KeyExtent wrap(org.apache.accumulo.core.data.impl.KeyExtent ke) {
-    return new KeyExtent(new Text(ke.getTableId()), ke.getEndRow(), ke.getPrevEndRow());
-  }
-
-  private static SortedSet<KeyExtent> wrap(Collection<org.apache.accumulo.core.data.impl.KeyExtent>
unwrapped) {
-    SortedSet<KeyExtent> wrapped = new TreeSet<>();
-    for (org.apache.accumulo.core.data.impl.KeyExtent wrappee : unwrapped) {
-      wrapped.add(wrap(wrappee));
-    }
-
-    return wrapped;
-  }
-
-  public static Text getMetadataEntry(Text tableId, Text endRow) {
-    return MetadataSchema.TabletsSection.getRow(tableId.toString(), endRow);
-  }
-
-  /**
-   * Empty start or end rows tell the method there are no start or end rows, and to use all
the keyextents that are before the end row if no start row etc.
-   *
-   * @deprecated this method not intended for public use and is likely to be removed in a
future version.
-   * @return all the key extents that the rows cover
-   */
-  @Deprecated
-  public static Collection<KeyExtent> getKeyExtentsForRange(Text startRow, Text endRow,
Set<KeyExtent> kes) {
-    return wrap(org.apache.accumulo.core.data.impl.KeyExtent.getKeyExtentsForRange(startRow,
endRow, unwrap(kes)));
-  }
-
-  public static Text decodePrevEndRow(Value ibw) {
-    return org.apache.accumulo.core.data.impl.KeyExtent.decodePrevEndRow(ibw);
-  }
-
-  public static Value encodePrevEndRow(Text per) {
-    return org.apache.accumulo.core.data.impl.KeyExtent.encodePrevEndRow(per);
-  }
-
-  public static Mutation getPrevRowUpdateMutation(KeyExtent ke) {
-    return org.apache.accumulo.core.data.impl.KeyExtent.getPrevRowUpdateMutation(ke.wrapped);
-  }
-
-  public static byte[] tableOfMetadataRow(Text row) {
-    return org.apache.accumulo.core.data.impl.KeyExtent.tableOfMetadataRow(row);
-  }
-
-  public static SortedSet<KeyExtent> findChildren(KeyExtent ke, SortedSet<KeyExtent>
tablets) {
-    return wrap(org.apache.accumulo.core.data.impl.KeyExtent.findChildren(ke.wrapped, unwrap(tablets)));
-  }
-
-  public static KeyExtent findContainingExtent(KeyExtent extent, SortedSet<KeyExtent>
extents) {
-    return wrap(org.apache.accumulo.core.data.impl.KeyExtent.findContainingExtent(extent.wrapped,
unwrap(extents)));
-  }
-
-  public static Set<KeyExtent> findOverlapping(KeyExtent nke, SortedSet<KeyExtent>
extents) {
-    return wrap(org.apache.accumulo.core.data.impl.KeyExtent.findOverlapping(nke.wrapped,
unwrap(extents)));
-  }
-
-  public static Set<KeyExtent> findOverlapping(KeyExtent nke, SortedMap<KeyExtent,?>
extents) {
-    SortedMap<org.apache.accumulo.core.data.impl.KeyExtent,Object> trans = new TreeMap<>();
-    for (Entry<KeyExtent,?> entry : extents.entrySet()) {
-      trans.put(entry.getKey().wrapped, entry.getValue());
-    }
-
-    return wrap(org.apache.accumulo.core.data.impl.KeyExtent.findOverlapping(nke.wrapped,
trans));
-  }
-
-  public static Text getMetadataEntry(KeyExtent extent) {
-    return org.apache.accumulo.core.data.impl.KeyExtent.getMetadataEntry(extent.wrapped);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java b/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
index d28a1ee..d34e379 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
@@ -17,8 +17,6 @@
 
 package org.apache.accumulo.core.data.impl;
 
-import java.util.function.Function;
-
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.TabletId;
 import org.apache.hadoop.io.Text;
@@ -27,35 +25,6 @@ public class TabletIdImpl implements TabletId {
 
   private KeyExtent ke;
 
-  @SuppressWarnings("deprecation")
-  public static final Function<org.apache.accumulo.core.data.KeyExtent,TabletId> KE_2_TID_OLD
= new Function<org.apache.accumulo.core.data.KeyExtent,TabletId>() {
-    @Override
-    public TabletId apply(org.apache.accumulo.core.data.KeyExtent input) {
-      // the following if null check is to appease findbugs... grumble grumble spent a good
part of my morning looking into this
-      // http://sourceforge.net/p/findbugs/bugs/1139/
-      // https://code.google.com/p/guava-libraries/issues/detail?id=920
-      if (input == null)
-        return null;
-      return new TabletIdImpl(input);
-    }
-  };
-
-  @SuppressWarnings("deprecation")
-  public static final Function<TabletId,org.apache.accumulo.core.data.KeyExtent> TID_2_KE_OLD
= new Function<TabletId,org.apache.accumulo.core.data.KeyExtent>() {
-    @Override
-    public org.apache.accumulo.core.data.KeyExtent apply(TabletId input) {
-      if (input == null)
-        return null;
-      return new org.apache.accumulo.core.data.KeyExtent(input.getTableId(), input.getEndRow(),
input.getPrevEndRow());
-    }
-
-  };
-
-  @Deprecated
-  public TabletIdImpl(org.apache.accumulo.core.data.KeyExtent ke) {
-    this.ke = new KeyExtent(ke.getTableId().toString(), ke.getEndRow(), ke.getPrevEndRow());
-  }
-
   public TabletIdImpl(KeyExtent ke) {
     this.ke = ke;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index afe9349..8bd72bf 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@ -70,17 +70,6 @@ public class IteratorUtil {
    */
   public static enum IteratorScope {
     majc, minc, scan;
-
-    /**
-     * Fetch the correct configuration key prefix for the given scope. Throws an IllegalArgumentException
if no property exists for the given scope.
-     *
-     * @deprecated since 1.7.0 This method returns a type that is not part of the public
API and is not guaranteed to be stable. The method was deprecated to
-     *             discourage its use.
-     */
-    @Deprecated
-    public static Property getProperty(IteratorScope scope) {
-      return IteratorUtil.getProperty(scope);
-    }
   }
 
   public static class IterInfoComparator implements Comparator<IterInfo>, Serializable
{

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
deleted file mode 100644
index 611c8d4..0000000
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityConstraint.java
+++ /dev/null
@@ -1,29 +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.security;
-
-/**
- *
- * @deprecated since 1.7.0 This is server side code not intended to exist in a public API
package. This class references types that are not in the public API
- *             and therefore is not guaranteed to be stable. It was deprecated to clearly
communicate this. Use
- *             {@link org.apache.accumulo.core.constraints.VisibilityConstraint} instead.
- */
-@Deprecated
-public class VisibilityConstraint extends org.apache.accumulo.core.constraints.VisibilityConstraint
{
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index bab52f6..39f1621 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.core.client.impl.TabletLocator.TabletServerMutations;
 import org.apache.accumulo.core.client.impl.TabletLocatorImpl.TabletLocationObtainer;
 import org.apache.accumulo.core.client.impl.TabletLocatorImpl.TabletServerLockChecker;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-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.PartialKey;
@@ -451,18 +450,6 @@ public class TabletLocatorImplTest {
       throw new UnsupportedOperationException();
     }
 
-    @Deprecated
-    @Override
-    public AccumuloConfiguration getConfiguration() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    @Deprecated
-    public void setConfiguration(AccumuloConfiguration conf) {
-      throw new UnsupportedOperationException();
-    }
-
     @Override
     @Deprecated
     public Connector getConnector(String user, CharSequence pass) throws AccumuloException,
AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9128dd0..f813c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,7 @@
   <properties>
     <!-- used for filtering the java source with the current version -->
     <accumulo.release.version>${project.version}</accumulo.release.version>
+    <apilyzer.ignoreDeprecated>false</apilyzer.ignoreDeprecated>
     <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
     <!-- bouncycastle version for test dependencies -->
     <bouncycastle.version>1.54</bouncycastle.version>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dca2ff93/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 49bf1f4..745bd6f 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
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
@@ -48,16 +47,16 @@ 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.
  *
@@ -195,30 +194,6 @@ public class HdfsZooInstance implements Instance {
     return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
   }
 
-  private final AtomicReference<AccumuloConfiguration> conf = new AtomicReference<>();
-
-  @Deprecated
-  @Override
-  public AccumuloConfiguration getConfiguration() {
-    AccumuloConfiguration conf = this.conf.get();
-    if (conf == null) {
-      // conf hasn't been set before, get an instance
-      conf = new ServerConfigurationFactory(this).getConfiguration();
-      // if the shared variable is still null, we're done.
-      if (!(this.conf.compareAndSet(null, conf))) {
-        // if it wasn't null, then we need to return the value that won.
-        conf = this.conf.get();
-      }
-    }
-    return conf;
-  }
-
-  @Override
-  @Deprecated
-  public void setConfiguration(AccumuloConfiguration conf) {
-    this.conf.set(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/dca2ff93/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..9360c82 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
@@ -98,16 +98,6 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
       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/dca2ff93/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index 37d127a..bb0b177 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -106,16 +106,6 @@ public class TServerUtilsTest {
       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/dca2ff93/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
index 9752916..20f7390 100644
--- a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.core.client.impl.Credentials;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
 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.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.metadata.RootTable;
@@ -65,12 +64,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
     if (args[0].equals("bad")) {
       Instance inst = new Instance() {
 
-        @Deprecated
-        @Override
-        public void setConfiguration(AccumuloConfiguration conf) {
-          throw new UnsupportedOperationException();
-        }
-
         @Override
         public int getZooKeepersSessionTimeOut() {
           throw new UnsupportedOperationException();
@@ -124,12 +117,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
           throw new UnsupportedOperationException();
         }
 
-        @Deprecated
-        @Override
-        public AccumuloConfiguration getConfiguration() {
-          throw new UnsupportedOperationException();
-        }
-
       };
       creds = SystemCredentials.get(inst);
     } else if (args[0].equals("good")) {
@@ -190,18 +177,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
           throw new UnsupportedOperationException();
         }
 
-        @Deprecated
-        @Override
-        public AccumuloConfiguration getConfiguration() {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public void setConfiguration(AccumuloConfiguration conf) {
-          throw new UnsupportedOperationException();
-        }
-
       };
       creds = new SystemCredentials(inst, "!SYSTEM", new PasswordToken("fake"));
     } else {


Mime
View raw message