You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/06/14 05:03:44 UTC
[accumulo] branch master updated (de2ade5 -> ba576e9)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from de2ade5 Fix #529 Fix SASL impersonation tests
new 0ba6c49 Fix #530 Remove very old methods
new ba576e9 Run tests faster in Travis
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 2 +-
.../org/apache/accumulo/core/client/Instance.java | 58 ----------------
.../accumulo/core/client/ZooKeeperInstance.java | 77 +---------------------
.../core/client/impl/ClientConfConverter.java | 2 +-
.../core/client/impl/ClientInfoFactory.java | 4 +-
.../accumulo/core/client/mock/MockInstance.java | 25 -------
.../accumulo/core/client/rfile/RFileWriter.java | 2 +-
.../core/client/impl/TabletLocatorImplTest.java | 22 -------
.../org/apache/accumulo/proxy/ProxyServer.java | 4 +-
.../accumulo/server/client/HdfsZooInstance.java | 26 --------
.../BaseHostRegexTableLoadBalancerTest.java | 22 -------
.../accumulo/server/util/TServerUtilsTest.java | 22 -------
.../test/server/security/SystemCredentialsIT.java | 43 ------------
13 files changed, 11 insertions(+), 298 deletions(-)
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 02/02: Run tests faster in Travis
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ba576e98cec8bb40675e458b96022aee3f6296c1
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jun 14 01:02:42 2018 -0400
Run tests faster in Travis
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b32d335..7d41a3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,4 +33,4 @@ env:
- HADOOP_PROFILE=
- HADOOP_PROFILE=-Dhadoop.profile=3
script:
- - mvn clean verify javadoc:jar -DskipITs $HADOOP_PROFILE
+ - mvn clean verify javadoc:jar -DskipITs -DforkCount=1C $HADOOP_PROFILE
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 01/02: Fix #530 Remove very old methods
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 0ba6c49c1d1f3e43dcd2d044f53a0c78c3cbe4ac
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jun 14 00:55:42 2018 -0400
Fix #530 Remove very old methods
* Remove deprecated getConnector methods from Instance
* Remove deprecated ZooKeeperInstance constructors
* Properly deprecate ZooKeeperInstance constructor which depends on
deprecated ClientConfiguration
* Fix warnings from deprecated types referenced (including javadoc
references)
---
.../org/apache/accumulo/core/client/Instance.java | 58 ----------------
.../accumulo/core/client/ZooKeeperInstance.java | 77 +---------------------
.../core/client/impl/ClientConfConverter.java | 2 +-
.../core/client/impl/ClientInfoFactory.java | 4 +-
.../accumulo/core/client/mock/MockInstance.java | 25 -------
.../accumulo/core/client/rfile/RFileWriter.java | 2 +-
.../core/client/impl/TabletLocatorImplTest.java | 22 -------
.../org/apache/accumulo/proxy/ProxyServer.java | 4 +-
.../accumulo/server/client/HdfsZooInstance.java | 26 --------
.../BaseHostRegexTableLoadBalancerTest.java | 22 -------
.../accumulo/server/util/TServerUtilsTest.java | 22 -------
.../test/server/security/SystemCredentialsIT.java | 43 ------------
12 files changed, 10 insertions(+), 297 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index f389202..8581546 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client;
-import java.nio.ByteBuffer;
import java.util.List;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -70,63 +69,6 @@ public interface Instance {
int getZooKeepersSessionTimeOut();
/**
- * Returns a connection to accumulo.
- *
- * @param user
- * a valid accumulo user
- * @param pass
- * A UTF-8 encoded password. The password may be cleared after making this call.
- * @return the accumulo Connector
- * @throws AccumuloException
- * when a generic exception occurs
- * @throws AccumuloSecurityException
- * when a user's credentials are invalid
- * @deprecated since 1.5, use {@link #getConnector(String, AuthenticationToken)} with
- * {@link PasswordToken}
- */
- @Deprecated
- Connector getConnector(String user, byte[] pass)
- throws AccumuloException, AccumuloSecurityException;
-
- /**
- * Returns a connection to accumulo.
- *
- * @param user
- * a valid accumulo user
- * @param pass
- * A UTF-8 encoded password. The password may be cleared after making this call.
- * @return the accumulo Connector
- * @throws AccumuloException
- * when a generic exception occurs
- * @throws AccumuloSecurityException
- * when a user's credentials are invalid
- * @deprecated since 1.5, use {@link #getConnector(String, AuthenticationToken)} with
- * {@link PasswordToken}
- */
- @Deprecated
- Connector getConnector(String user, ByteBuffer pass)
- throws AccumuloException, AccumuloSecurityException;
-
- /**
- * Returns a connection to this instance of accumulo.
- *
- * @param user
- * a valid accumulo user
- * @param pass
- * If a mutable CharSequence is passed in, it may be cleared after this call.
- * @return the accumulo Connector
- * @throws AccumuloException
- * when a generic exception occurs
- * @throws AccumuloSecurityException
- * when a user's credentials are invalid
- * @deprecated since 1.5, use {@link #getConnector(String, AuthenticationToken)} with
- * {@link PasswordToken}
- */
- @Deprecated
- Connector getConnector(String user, CharSequence pass)
- throws AccumuloException, AccumuloSecurityException;
-
- /**
* Returns a connection to this instance of accumulo.
*
* @param principal
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index fbb0a8a..60e9326 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.core.client;
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8;
-import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -33,17 +32,13 @@ import org.apache.accumulo.core.client.impl.ClientInfoImpl;
import org.apache.accumulo.core.client.impl.ConnectorImpl;
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.ClientProperty;
import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
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.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,54 +86,6 @@ public class ZooKeeperInstance implements Instance {
this(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers));
}
- /**
- *
- * @param instanceName
- * The name of specific accumulo instance. This is set at initialization time.
- * @param zooKeepers
- * A comma separated list of zoo keeper server locations. Each location can contain an
- * optional port, of the format host:port.
- * @param sessionTimeout
- * zoo keeper session time out in milliseconds.
- * @deprecated since 1.6.0; Use {@link #ZooKeeperInstance(ClientConfiguration)} instead.
- */
- @Deprecated
- public ZooKeeperInstance(String instanceName, String zooKeepers, int sessionTimeout) {
- this(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers)
- .withZkTimeout(sessionTimeout));
- }
-
- /**
- *
- * @param instanceId
- * The UUID that identifies the accumulo instance you want to connect to.
- * @param zooKeepers
- * A comma separated list of zoo keeper server locations. Each location can contain an
- * optional port, of the format host:port.
- * @deprecated since 1.6.0; Use {@link #ZooKeeperInstance(ClientConfiguration)} instead.
- */
- @Deprecated
- public ZooKeeperInstance(UUID instanceId, String zooKeepers) {
- this(ClientConfiguration.loadDefault().withInstance(instanceId).withZkHosts(zooKeepers));
- }
-
- /**
- *
- * @param instanceId
- * The UUID that identifies the accumulo instance you want to connect to.
- * @param zooKeepers
- * A comma separated list of zoo keeper server locations. Each location can contain an
- * optional port, of the format host:port.
- * @param sessionTimeout
- * zoo keeper session time out in milliseconds.
- * @deprecated since 1.6.0; Use {@link #ZooKeeperInstance(ClientConfiguration)} instead.
- */
- @Deprecated
- public ZooKeeperInstance(UUID instanceId, String zooKeepers, int sessionTimeout) {
- this(ClientConfiguration.loadDefault().withInstance(instanceId).withZkHosts(zooKeepers)
- .withZkTimeout(sessionTimeout));
- }
-
@SuppressWarnings("deprecation")
ZooKeeperInstance(ClientConfiguration config, ZooCacheFactory zcf) {
checkArgument(config != null, "config is null");
@@ -164,8 +111,9 @@ public class ZooKeeperInstance implements Instance {
* {@link ClientConfiguration} which extends Configuration with convenience methods
* specific to Accumulo.
* @since 1.9.0
+ * @deprecated since 2.0.0; use {@link Connector#builder()} instead
*/
- @SuppressWarnings("deprecation")
+ @Deprecated
public ZooKeeperInstance(ClientConfiguration config) {
this(config, new ZooCacheFactory());
}
@@ -270,20 +218,6 @@ public class ZooKeeperInstance implements Instance {
}
@Override
- @Deprecated
- public Connector getConnector(String user, CharSequence pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
- }
-
- @Override
- @Deprecated
- public Connector getConnector(String user, ByteBuffer pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, ByteBufferUtil.toBytes(pass));
- }
-
- @Override
public Connector getConnector(String principal, AuthenticationToken token)
throws AccumuloException, AccumuloSecurityException {
Properties properties = ClientConfConverter.toProperties(clientConf);
@@ -293,13 +227,6 @@ public class ZooKeeperInstance implements Instance {
}
@Override
- @Deprecated
- public Connector getConnector(String principal, byte[] pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(principal, new PasswordToken(pass));
- }
-
- @Override
public String toString() {
StringBuilder sb = new StringBuilder(64);
sb.append("ZooKeeperInstance: ").append(getInstanceName()).append(" ").append(getZooKeepers());
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientConfConverter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientConfConverter.java
index c70a65b..abef062 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientConfConverter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientConfConverter.java
@@ -158,7 +158,7 @@ public class ClientConfConverter {
* internally.
*
* @param config
- * the original {@link org.apache.accumulo.core.client.ClientConfiguration}
+ * the original config
* @return the client configuration presented in the form of an {@link AccumuloConfiguration}
*/
@SuppressWarnings("deprecation")
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
index eb2cfd4..c12e416 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
@@ -47,7 +47,9 @@ public class ClientInfoFactory {
}
public static Instance getInstance(ClientInfo info) {
- return new ZooKeeperInstance(ClientConfConverter.toClientConf(info.getProperties()));
+ @SuppressWarnings("deprecation")
+ Instance i = new ZooKeeperInstance(ClientConfConverter.toClientConf(info.getProperties()));
+ return i;
}
public static Credentials getCredentials(ClientInfo info) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
index 9f1f4c0..7e143e0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
@@ -17,7 +17,6 @@
package org.apache.accumulo.core.client.mock;
import java.io.IOException;
-import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -31,12 +30,9 @@ import org.apache.accumulo.core.client.impl.Credentials;
import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
-import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.io.Text;
/**
* Mock Accumulo provides an in memory implementation of the Accumulo client API. It is possible
@@ -121,27 +117,6 @@ public class MockInstance implements Instance {
}
@Override
- @Deprecated
- public Connector getConnector(String user, byte[] pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, new PasswordToken(pass));
- }
-
- @Override
- @Deprecated
- public Connector getConnector(String user, ByteBuffer pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, ByteBufferUtil.toBytes(pass));
- }
-
- @Override
- @Deprecated
- public Connector getConnector(String user, CharSequence pass)
- throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
- }
-
- @Override
public Connector getConnector(String principal, AuthenticationToken token)
throws AccumuloException, AccumuloSecurityException {
Connector conn = new MockConnector(new Credentials(principal, token), acu, this);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
index 408a3ca..e466a09 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
@@ -37,7 +37,7 @@ import com.google.common.base.Preconditions;
/**
* This class provides an API for writing RFiles. It can be used to create file for bulk import into
- * Accumulo using {@link TableOperations#importDirectory(String, String, String, boolean)}
+ * Accumulo using {@link TableOperations#addFilesTo(String)}
*
* <p>
* A RFileWriter has the following constraints. Violating these constraints will result in runtime
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 616785d..a55b54b 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
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -450,27 +449,6 @@ public class TabletLocatorImplTest {
}
@Override
- @Deprecated
- public Connector getConnector(String user, byte[] pass)
- throws AccumuloException, AccumuloSecurityException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- @Deprecated
- public Connector getConnector(String user, ByteBuffer pass)
- throws AccumuloException, AccumuloSecurityException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- @Deprecated
- public Connector getConnector(String user, CharSequence pass)
- throws AccumuloException, AccumuloSecurityException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public Connector getConnector(String principal, AuthenticationToken token)
throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
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 a6473a9..d9fc9d7 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -195,7 +195,9 @@ public class ProxyServer implements AccumuloProxy.Iface {
if (useMock != null && Boolean.parseBoolean(useMock))
instance = DeprecationUtil.makeMockInstance(this.getClass().getName());
else {
- instance = new ZooKeeperInstance(ClientConfConverter.toClientConf(props));
+ @SuppressWarnings("deprecation")
+ Instance i = new ZooKeeperInstance(ClientConfConverter.toClientConf(props));
+ instance = i;
}
try {
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 65e8d60..2c4d76c 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,14 +34,11 @@ 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;
@@ -51,7 +47,6 @@ 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,27 +175,6 @@ public class HdfsZooInstance implements Instance {
return new ConnectorImpl(new ClientContext(this, new Credentials(principal, token), site));
}
- @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())));
- }
-
public static void main(String[] args) {
Instance instance = HdfsZooInstance.getInstance();
System.out.println("Instance Name: " + instance.getInstanceName());
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 cf7eed4..9e91f04 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;
@@ -90,27 +89,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();
- }
-
@Override
public Connector getConnector(String principal, AuthenticationToken token)
throws AccumuloException, AccumuloSecurityException {
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 1a377ed..2003b38 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
@@ -29,7 +29,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -89,27 +88,6 @@ public class TServerUtilsTest {
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();
- }
-
@Override
public Connector getConnector(String principal, AuthenticationToken token)
throws AccumuloException, AccumuloSecurityException {
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 4030ac4..c4dd4a7 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
@@ -18,7 +18,6 @@ package org.apache.accumulo.test.server.security;
import static org.junit.Assert.assertEquals;
-import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map.Entry;
@@ -104,27 +103,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
throw new UnsupportedOperationException();
}
- @Deprecated
- @Override
- public Connector getConnector(String user, CharSequence 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, byte[] pass)
- throws AccumuloException, AccumuloSecurityException {
- throw new UnsupportedOperationException();
- }
-
};
creds = SystemCredentials.get(inst);
} else if (args[0].equals("good")) {
@@ -168,27 +146,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
throw new UnsupportedOperationException();
}
- @Deprecated
- @Override
- public Connector getConnector(String user, CharSequence 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, byte[] pass)
- throws AccumuloException, AccumuloSecurityException {
- throw new UnsupportedOperationException();
- }
-
};
creds = new SystemCredentials(inst, "!SYSTEM", new PasswordToken("fake"));
} else {
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.