You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2018/09/20 17:48:10 UTC
[accumulo] 08/09: Updates from pull request #636
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1d1a2a5d0c447ef617cdfabb0624698b8de58500
Author: Mike Miller <mm...@apache.org>
AuthorDate: Tue Sep 11 14:54:57 2018 -0400
Updates from pull request #636
---
core/src/main/java/org/apache/accumulo/core/Accumulo.java | 7 ++++++-
.../main/java/org/apache/accumulo/core/client/AccumuloClient.java | 5 +++--
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 3 ++-
.../src/main/java/org/apache/accumulo/core/client/ClientInfo.java | 3 ++-
core/src/main/java/org/apache/accumulo/core/client/Connector.java | 3 ++-
core/src/main/java/org/apache/accumulo/core/client/Instance.java | 3 ++-
.../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 6 ++++--
.../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 5 +++--
.../minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 4 ++--
.../accumulo/minicluster/MiniAccumuloClusterStartStopTest.java | 4 ++--
.../org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java | 8 ++++----
.../java/org/apache/accumulo/harness/AccumuloClusterHarness.java | 2 +-
.../main/java/org/apache/accumulo/test/functional/BulkLoadIT.java | 1 +
.../apache/accumulo/test/functional/CreateInitialSplitsIT.java | 2 +-
14 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/Accumulo.java b/core/src/main/java/org/apache/accumulo/core/Accumulo.java
index f0c8009..67d8df6 100644
--- a/core/src/main/java/org/apache/accumulo/core/Accumulo.java
+++ b/core/src/main/java/org/apache/accumulo/core/Accumulo.java
@@ -21,13 +21,18 @@ import org.apache.accumulo.core.client.impl.AccumuloClientImpl;
/**
* The main entry point for Accumulo public API.
+ *
+ * @since 2.0.0
*/
public final class Accumulo {
private Accumulo() {}
/**
- * Create an Accumulo client builder, used to construct a client.
+ * Create an Accumulo client builder, used to construct a client. For example:
+ *
+ * {@code Accumulo.newClient().forInstance(instanceName, zookeepers)
+ * .usingPassword(user, password).withZkTimeout(1234).build();}
*
* @return a builder object for Accumulo clients
*/
diff --git a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
index 2676608..7792fb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client;
import java.util.Properties;
+import org.apache.accumulo.core.Accumulo;
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.client.admin.NamespaceOperations;
import org.apache.accumulo.core.client.admin.ReplicationOperations;
@@ -31,8 +32,8 @@ import org.apache.accumulo.core.security.Authorizations;
* writer for the instance as well as various objects that permit administrative operations.
* Enforces security on the client side with by requiring user credentials.
*
- * Supports fluent API. Various options can be provided to {@link #builder()} and when finished a
- * call to build() will return the AccumuloClient object. For example:
+ * Supports fluent API. Various options can be provided to {@link Accumulo#newClient()} and when
+ * finished a call to build() will return the AccumuloClient object. For example:
*
* {@code Accumulo.newClient().forInstance(instanceName, zookeepers)
* .usingPassword(user, password).withZkTimeout(1234).build();}
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index bf68155..09b4577 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.apache.accumulo.core.Accumulo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.PropertyType;
import org.apache.commons.configuration.CompositeConfiguration;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
* setting them.
*
* @since 1.6.0
- * @deprecated since 2.0.0, replaced {@link AccumuloClient#builder()}
+ * @deprecated since 2.0.0, replaced by {@link Accumulo#newClient()}
*/
@Deprecated
public class ClientConfiguration {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java b/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
index c865518..df78b22 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
@@ -18,11 +18,12 @@ package org.apache.accumulo.core.client;
import java.util.Properties;
+import org.apache.accumulo.core.Accumulo;
import org.apache.accumulo.core.client.impl.ClientInfoImpl;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
/**
- * Accumulo client information. Can be built using {@link AccumuloClient#builder()}
+ * Accumulo client information. Can be built using {@link Accumulo#newClient()}
*
* @since 2.0.0
*/
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Connector.java b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
index 904a483..b378a5b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Connector.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
@@ -30,7 +30,8 @@ import org.apache.accumulo.core.security.Authorizations;
* The Connector enforces security on the client side by forcing all API calls to be accompanied by
* user credentials.
*
- * @deprecated For backwards compatibility only, use {@link AccumuloClient}
+ * @deprecated since 2.0.0. Use {@link AccumuloClient} for wiriting new code. Connector is available
+ * for existing code. Use {@link #from(AccumuloClient)} as a bridge between the two.
*/
public abstract class Connector {
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 fde6a66..c79de29 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
@@ -19,6 +19,7 @@ package org.apache.accumulo.core.client;
import java.nio.ByteBuffer;
import java.util.List;
+import org.apache.accumulo.core.Accumulo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
@@ -26,7 +27,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
* This class represents the information a client needs to know to connect to an instance of
* accumulo.
*
- * @deprecated since 2.0.0, use {@link AccumuloClient#builder()} and {@link ClientInfo} instead
+ * @deprecated since 2.0.0, use {@link Accumulo#newClient()} and {@link ClientInfo} instead
*/
@Deprecated
public interface Instance {
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 5ae6e85..2712520 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
@@ -25,6 +25,7 @@ import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import org.apache.accumulo.core.Accumulo;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.impl.AccumuloClientImpl;
import org.apache.accumulo.core.client.impl.ClientConfConverter;
@@ -57,7 +58,7 @@ import org.slf4j.LoggerFactory;
* If you do not know the instance names then run accumulo
* org.apache.accumulo.server.util.ListInstances on an accumulo server.
*
- * @deprecated since 2.0.0, Use {@link AccumuloClient#builder()} instead
+ * @deprecated since 2.0.0, Use {@link Accumulo#newClient()} instead
*/
@Deprecated
public class ZooKeeperInstance implements Instance {
@@ -82,6 +83,7 @@ public class ZooKeeperInstance implements Instance {
* @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 2.0.0; use {@link Accumulo#newClient()} instead
*/
public ZooKeeperInstance(String instanceName, String zooKeepers) {
this(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers));
@@ -112,7 +114,7 @@ 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 AccumuloClient#builder()} instead
+ * @deprecated since 2.0.0; use {@link Accumulo#newClient()} instead
*/
@Deprecated
public ZooKeeperInstance(ClientConfiguration config) {
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index b3b4673..c6019bd 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.ClientInfo;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.util.Pair;
@@ -120,9 +121,9 @@ public class MiniAccumuloCluster {
* @since 1.6.0
* @deprecated since 2.0.0, replaced by {@link #getAccumuloClient(String, AuthenticationToken)}
*/
- public AccumuloClient getConnector(String user, String passwd)
+ public Connector getConnector(String user, String passwd)
throws AccumuloException, AccumuloSecurityException {
- return impl.getAccumuloClient(user, new PasswordToken(passwd));
+ return Connector.from(impl.getAccumuloClient(user, new PasswordToken(passwd)));
}
/**
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
index 8ab8027..711023b 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -24,7 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
-import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.impl.ClientContext;
import org.apache.commons.io.FileUtils;
import org.apache.curator.framework.CuratorFramework;
@@ -89,7 +89,7 @@ public class MiniAccumuloClusterExistingZooKeepersTest {
@Test
public void canConnectViaExistingZooKeeper() throws Exception {
- AccumuloClient conn = accumulo.getConnector("root", SECRET);
+ Connector conn = accumulo.getConnector("root", SECRET);
ClientContext context = new ClientContext(accumulo.getClientInfo());
assertEquals(zooKeeper.getConnectString(), context.getZooKeepers());
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
index df7d869..ed87ab3 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.client.Connector;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
@@ -76,7 +76,7 @@ public class MiniAccumuloClusterStartStopTest {
public void multipleStopsIsAllowed() throws Exception {
accumulo.start();
- AccumuloClient conn = accumulo.getConnector("root", "superSecret");
+ Connector conn = accumulo.getConnector("root", "superSecret");
conn.tableOperations().create("foo");
accumulo.stop();
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
index b842538..366294a 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
@@ -29,9 +29,9 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
-import org.apache.accumulo.core.client.AccumuloClient;
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.Scanner;
import org.apache.accumulo.core.client.admin.NewTableConfiguration;
@@ -89,7 +89,7 @@ public class MiniAccumuloClusterTest {
@Test(timeout = 30000)
public void test() throws Exception {
- AccumuloClient conn = accumulo.getConnector("root", "superSecret");
+ Connector conn = accumulo.getConnector("root", "superSecret");
conn.tableOperations().create("table1", new NewTableConfiguration());
@@ -105,7 +105,7 @@ public class MiniAccumuloClusterTest {
conn.tableOperations().attachIterator("table1", is);
- AccumuloClient uconn = accumulo.getConnector("user1", "pass1");
+ Connector uconn = accumulo.getConnector("user1", "pass1");
BatchWriter bw = uconn.createBatchWriter("table1", new BatchWriterConfig());
@@ -165,7 +165,7 @@ public class MiniAccumuloClusterTest {
@Test(timeout = 60000)
public void testPerTableClasspath() throws Exception {
- AccumuloClient conn = accumulo.getConnector("root", "superSecret");
+ Connector conn = accumulo.getConnector("root", "superSecret");
conn.tableOperations().create("table2");
diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
index 96bc364..16ffedb 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -359,7 +359,7 @@ public abstract class AccumuloClusterHarness extends AccumuloITBase
}
}
- public Connector getClient() {
+ public Connector getConnector() {
try {
log.warn("No longer used since version 2.0, please call getAccumuloClient() instead.");
String princ = getAdminPrincipal();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
index 723343e..d8b61d2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.impl.Table;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
index 4642630..856956a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
@@ -64,7 +64,7 @@ public class CreateInitialSplitsIT extends AccumuloClusterHarness {
@Before
public void setupInitialSplits() {
- connector = getClient();
+ connector = getConnector();
}
/**