You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/12/07 20:50:22 UTC
[GitHub] mikewalch closed pull request #808: Fixes #788 - Remove ClientInfo
from API
mikewalch closed pull request #808: Fixes #788 - Remove ClientInfo from API
URL: https://github.com/apache/accumulo/pull/808
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index 92d6be96ab..ea53e59d55 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -28,6 +28,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -36,7 +37,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -120,13 +120,13 @@ public static String getClassLoaderContext(JobConf job) {
*
* @param job
* Hadoop job instance to be configured
- * @param info
+ * @param clientProps
* Connection information for Accumulo
* @since 2.0.0
*/
- public static void setClientInfo(JobConf job, ClientInfo info) {
- ClientInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
- InputConfigurator.setClientInfo(CLASS, job, inputInfo);
+ public static void setClientProperties(JobConf job, Properties clientProps) {
+ Properties inputProps = InputConfigurator.updateToken(job.getCredentials(), clientProps);
+ InputConfigurator.setClientProperties(CLASS, job, inputProps);
}
/**
@@ -143,15 +143,15 @@ public static void setClientPropertiesFile(JobConf job, String clientPropsFile)
}
/**
- * Retrieves {@link ClientInfo} from the configuration
+ * Retrieves {@link Properties} from the configuration
*
* @param job
* Hadoop job instance configuration
- * @return {@link ClientInfo} object
+ * @return {@link Properties} object
* @since 2.0.0
*/
- protected static ClientInfo getClientInfo(JobConf job) {
- return InputConfigurator.getClientInfo(CLASS, job);
+ protected static Properties getClientProperties(JobConf job) {
+ return InputConfigurator.getClientProperties(CLASS, job);
}
/**
@@ -173,7 +173,7 @@ protected static ClientInfo getClientInfo(JobConf job) {
* @param token
* the user's password
* @since 1.5.0
- * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead
+ * @deprecated since 2.0.0, use {@link #setClientProperties(JobConf, Properties)} instead
*/
@Deprecated
public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token)
@@ -181,7 +181,7 @@ public static void setConnectorInfo(JobConf job, String principal, Authenticatio
if (token instanceof KerberosToken) {
log.info("Received KerberosToken, attempting to fetch DelegationToken");
try {
- AccumuloClient client = Accumulo.newClient().from(getClientInfo(job).getProperties())
+ AccumuloClient client = Accumulo.newClient().from(getClientProperties(job))
.as(principal, token).build();
token = client.securityOperations().getDelegationToken(new DelegationTokenConfig());
} catch (Exception e) {
@@ -278,7 +278,7 @@ protected static AuthenticationToken getAuthenticationToken(JobConf job) {
* @param clientConfig
* client configuration containing connection options
* @since 1.6.0
- * @deprecated since 2.0.0; Use {@link #setClientInfo(JobConf, ClientInfo)} instead.
+ * @deprecated since 2.0.0; Use {@link #setClientProperties(JobConf, Properties)} instead.
*/
@Deprecated
public static void setZooKeeperInstance(JobConf job,
@@ -294,7 +294,7 @@ public static void setZooKeeperInstance(JobConf job,
* the Hadoop context for the configured job
* @return an Accumulo instance
* @since 1.5.0
- * @deprecated since 2.0.0, Use {@link #getClientInfo(JobConf)} instead
+ * @deprecated since 2.0.0, Use {@link #getClientProperties(JobConf)} instead
*/
@Deprecated
protected static org.apache.accumulo.core.client.Instance getInstance(JobConf job) {
@@ -361,7 +361,7 @@ protected static Authorizations getScanAuthorizations(JobConf job) {
* The job
* @return The client configuration for the job
* @since 1.7.0
- * @deprecated since 2.0.0, replaced by {@link #getClientInfo(JobConf)}
+ * @deprecated since 2.0.0, replaced by {@link #getClientProperties(JobConf)}
*/
@Deprecated
protected static org.apache.accumulo.core.client.ClientConfiguration getClientConfiguration(
@@ -481,7 +481,7 @@ public void initialize(InputSplit inSplit, JobConf job) throws IOException {
baseSplit = (org.apache.accumulo.core.client.mapreduce.RangeInputSplit) inSplit;
log.debug("Initializing input split: " + baseSplit);
- ClientContext context = new ClientContext(getClientInfo(job));
+ ClientContext context = new ClientContext(getClientProperties(job));
AccumuloClient client = context.getClient();
Authorizations authorizations = getScanAuthorizations(job);
String classLoaderContext = getClassLoaderContext(job);
@@ -625,7 +625,7 @@ public float getProgress() throws IOException {
Map<String,Map<KeyExtent,List<Range>>> binOfflineTable(JobConf job, Table.ID tableId,
List<Range> ranges)
throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
- ClientContext context = new ClientContext(getClientInfo(job));
+ ClientContext context = new ClientContext(getClientProperties(job));
return InputConfigurator.binOffline(tableId, ranges, context);
}
@@ -651,7 +651,7 @@ public float getProgress() throws IOException {
String tableName = tableConfigEntry.getKey();
InputTableConfig tableConfig = tableConfigEntry.getValue();
- ClientContext context = new ClientContext(getClientInfo(job));
+ ClientContext context = new ClientContext(getClientProperties(job));
Table.ID tableId;
// resolve table name to id once, and use id from this point forward
try {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
index 638924d29c..f25ed8eda5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
@@ -38,7 +37,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setClientInfo(JobConf, ClientInfo)}
+ * <li>{@link AccumuloInputFormat#setClientProperties(JobConf, java.util.Properties)}
* <li>{@link AccumuloInputFormat#setInputTableName(JobConf, String)}</li>
* <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
index 6cb0d09344..cf19819d3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapred.InputFormatBase.RecordReaderBase;
import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
import org.apache.accumulo.core.clientImpl.mapreduce.lib.InputConfigurator;
@@ -39,7 +38,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setClientInfo(JobConf, ClientInfo)}
+ * <li>{@link AccumuloInputFormat#setClientProperties(JobConf, java.util.Properties)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, org.apache.accumulo.core.security.Authorizations)}
* <li>{@link AccumuloMultiTableInputFormat#setInputTableConfigs(org.apache.hadoop.mapred.JobConf, java.util.Map)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index 82cf95f85f..796c8b3bf8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -20,6 +20,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.Set;
import org.apache.accumulo.core.client.Accumulo;
@@ -28,7 +29,6 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
@@ -66,7 +66,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setClientInfo(JobConf, ClientInfo)}
+ * <li>{@link AccumuloOutputFormat#setClientProperties(JobConf, Properties)}
* </ul>
*
* Other static methods are optional.
@@ -81,13 +81,13 @@
*
* @param job
* Hadoop job to be configured
- * @param info
+ * @param clientProps
* Accumulo connection information
* @since 2.0.0
*/
- public static void setClientInfo(JobConf job, ClientInfo info) {
- ClientInfo outInfo = OutputConfigurator.updateToken(job.getCredentials(), info);
- OutputConfigurator.setClientInfo(CLASS, job, outInfo);
+ public static void setClientProperties(JobConf job, Properties clientProps) {
+ Properties outProps = OutputConfigurator.updateToken(job.getCredentials(), clientProps);
+ OutputConfigurator.setClientProperties(CLASS, job, outProps);
}
/**
@@ -97,8 +97,8 @@ public static void setClientInfo(JobConf job, ClientInfo info) {
* Hadoop job to be configured
* @since 2.0.0
*/
- protected static ClientInfo getClientInfo(JobConf job) {
- return OutputConfigurator.getClientInfo(CLASS, job);
+ protected static Properties getClientProperties(JobConf job) {
+ return OutputConfigurator.getClientProperties(CLASS, job);
}
/**
@@ -134,7 +134,7 @@ public static void setClientPropertiesFile(JobConf job, String clientPropsFile)
* @param token
* the user's password
* @since 1.5.0
- * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead.
+ * @deprecated since 2.0.0, use {@link #setClientProperties(JobConf, Properties)} instead.
*/
@Deprecated
public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token)
@@ -230,7 +230,7 @@ protected static AuthenticationToken getAuthenticationToken(JobConf job) {
* @param clientConfig
* client configuration for specifying connection timeouts, SSL connection options, etc.
* @since 1.6.0
- * @deprecated since 2.0.0; Use {@link #setClientInfo(JobConf, ClientInfo)} instead.
+ * @deprecated since 2.0.0; Use {@link #setClientProperties(JobConf, Properties)} instead.
*/
@Deprecated
public static void setZooKeeperInstance(JobConf job,
@@ -246,7 +246,7 @@ public static void setZooKeeperInstance(JobConf job,
* the Hadoop context for the configured job
* @return an Accumulo instance
* @since 1.5.0
- * @deprecated since 2.0.0; Use {@link #getClientInfo(JobConf)} instead
+ * @deprecated since 2.0.0; Use {@link #getClientProperties(JobConf)} instead
*/
@Deprecated
protected static org.apache.accumulo.core.client.Instance getInstance(JobConf job) {
@@ -410,8 +410,7 @@ protected static Boolean getSimulationMode(JobConf job) {
private AccumuloClient client;
- protected AccumuloRecordWriter(JobConf job)
- throws AccumuloException, AccumuloSecurityException, IOException {
+ protected AccumuloRecordWriter(JobConf job) {
Level l = getLogLevel(job);
if (l != null)
log.setLevel(getLogLevel(job));
@@ -427,7 +426,7 @@ protected AccumuloRecordWriter(JobConf job)
this.defaultTableName = (tname == null) ? null : new Text(tname);
if (!simulate) {
- this.client = Accumulo.newClient().from(getClientInfo(job).getProperties()).build();
+ this.client = Accumulo.newClient().from(getClientProperties(job)).build();
mtbw = client.createMultiTableBatchWriter(getBatchWriterOptions(job));
}
}
@@ -564,7 +563,7 @@ public void checkOutputSpecs(FileSystem ignored, JobConf job) throws IOException
throw new IOException("Connector info has not been set.");
try {
// if the instance isn't configured, it will complain here
- AccumuloClient c = Accumulo.newClient().from(getClientInfo(job).getProperties()).build();
+ AccumuloClient c = Accumulo.newClient().from(getClientProperties(job)).build();
String principal = getPrincipal(job);
AuthenticationToken token = getAuthenticationToken(job);
if (!c.securityOperations().authenticateUser(principal, token))
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
index 1bfc1d60e1..9e01cde7bf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.RowIterator;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
@@ -41,7 +40,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setClientInfo(JobConf, ClientInfo)}
+ * <li>{@link AccumuloRowInputFormat#setClientProperties(JobConf, java.util.Properties)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index b159291f41..c5d09f976e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -28,6 +28,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -36,7 +37,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -54,6 +54,7 @@
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.AuthenticationTokenIdentifier;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.DelegationTokenImpl;
import org.apache.accumulo.core.clientImpl.OfflineScanner;
import org.apache.accumulo.core.clientImpl.ScannerImpl;
@@ -122,13 +123,13 @@ public static String getClassLoaderContext(JobContext job) {
*
* @param job
* Hadoop job instance to be configured
- * @param info
+ * @param clientProps
* Connection information for Accumulo
* @since 2.0.0
*/
- public static void setClientInfo(Job job, ClientInfo info) {
- ClientInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
- InputConfigurator.setClientInfo(CLASS, job.getConfiguration(), inputInfo);
+ public static void setClientProperties(Job job, Properties clientProps) {
+ Properties inputProps = InputConfigurator.updateToken(job.getCredentials(), clientProps);
+ InputConfigurator.setClientProperties(CLASS, job.getConfiguration(), inputProps);
}
/**
@@ -145,15 +146,15 @@ public static void setClientPropertiesFile(Job job, String clientPropsFile) {
}
/**
- * Gets the {@link ClientInfo} from the configuration
+ * Gets the {@link Properties} from the configuration
*
* @param context
* Hadoop job context
- * @return ClientInfo
+ * @return Properties
* @since 2.0.0
*/
- protected static ClientInfo getClientInfo(JobContext context) {
- return InputConfigurator.getClientInfo(CLASS, context.getConfiguration());
+ protected static Properties getClientProperties(JobContext context) {
+ return InputConfigurator.getClientProperties(CLASS, context.getConfiguration());
}
/**
@@ -175,7 +176,7 @@ protected static ClientInfo getClientInfo(JobContext context) {
* @param token
* the user's password
* @since 1.5.0
- * @deprecated since 2.0.0; use {@link #setClientInfo(Job, ClientInfo)} instead.
+ * @deprecated since 2.0.0; use {@link #setClientProperties(Job, Properties)} instead.
*/
@Deprecated
public static void setConnectorInfo(Job job, String principal, AuthenticationToken token)
@@ -183,7 +184,7 @@ public static void setConnectorInfo(Job job, String principal, AuthenticationTok
if (token instanceof KerberosToken) {
log.info("Received KerberosToken, attempting to fetch DelegationToken");
try {
- AccumuloClient client = Accumulo.newClient().from(getClientInfo(job).getProperties())
+ AccumuloClient client = Accumulo.newClient().from(getClientProperties(job))
.as(principal, token).build();
token = client.securityOperations().getDelegationToken(new DelegationTokenConfig());
} catch (Exception e) {
@@ -282,7 +283,7 @@ protected static AuthenticationToken getAuthenticationToken(JobContext context)
* @param clientConfig
* client configuration containing connection options
* @since 1.6.0
- * @deprecated since 2.0.0; Use {@link #setClientInfo(Job, ClientInfo)} instead.
+ * @deprecated since 2.0.0; Use {@link #setClientProperties(Job, Properties)} instead.
*/
@Deprecated
public static void setZooKeeperInstance(Job job,
@@ -298,7 +299,7 @@ public static void setZooKeeperInstance(Job job,
* the Hadoop context for the configured job
* @return an Accumulo instance
* @since 1.5.0
- * @deprecated since 2.0.0, use {@link #getClientInfo(JobContext)} instead
+ * @deprecated since 2.0.0, use {@link #getClientProperties(JobContext)} instead
*/
@Deprecated
protected static org.apache.accumulo.core.client.Instance getInstance(JobContext context) {
@@ -409,7 +410,7 @@ protected static void validateOptions(JobContext context) throws IOException {
* The Job
* @return The ClientConfiguration
* @since 1.7.0
- * @deprecated since 2.0.0; use {@link #getClientInfo(JobContext)} instead
+ * @deprecated since 2.0.0; use {@link #getClientProperties(JobContext)} instead
*/
@Deprecated
protected static org.apache.accumulo.core.client.ClientConfiguration getClientConfiguration(
@@ -488,7 +489,7 @@ public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IO
split = (RangeInputSplit) inSplit;
log.debug("Initializing input split: " + split);
- ClientInfo info = getClientInfo(attempt);
+ ClientInfo info = ClientInfo.from(getClientProperties(attempt));
ClientContext context = new ClientContext(info);
AccumuloClient client = context.getClient();
Authorizations authorizations = getScanAuthorizations(attempt);
@@ -651,7 +652,7 @@ public V getCurrentValue() throws IOException, InterruptedException {
Map<String,Map<KeyExtent,List<Range>>> binOfflineTable(JobContext context, Table.ID tableId,
List<Range> ranges)
throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
- ClientContext clientContext = new ClientContext(getClientInfo(context));
+ ClientContext clientContext = new ClientContext(getClientProperties(context));
return InputConfigurator.binOffline(tableId, ranges, clientContext);
}
@@ -677,7 +678,7 @@ public V getCurrentValue() throws IOException, InterruptedException {
String tableName = tableConfigEntry.getKey();
InputTableConfig tableConfig = tableConfigEntry.getValue();
- ClientContext clientContext = new ClientContext(getClientInfo(context));
+ ClientContext clientContext = new ClientContext(getClientProperties(context));
Table.ID tableId;
// resolve table name to id once, and use id from this point forward
try {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
index 1ad29f3523..057a453f57 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
@@ -38,7 +37,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setClientInfo(Job, ClientInfo)}
+ * <li>{@link AccumuloInputFormat#setClientProperties(Job, java.util.Properties)}
* <li>{@link AccumuloInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(Job, Authorizations)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
index 43d12ebb54..bc451f3b1d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
@@ -22,7 +22,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.clientImpl.mapreduce.lib.InputConfigurator;
import org.apache.accumulo.core.data.Key;
@@ -42,7 +41,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloMultiTableInputFormat#setClientInfo(Job, ClientInfo)}
+ * <li>{@link AccumuloMultiTableInputFormat#setClientProperties(Job, java.util.Properties)}
* <li>{@link AccumuloMultiTableInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloMultiTableInputFormat#setInputTableConfigs(Job, Map)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index 3572acbce7..cabcdad27d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -20,6 +20,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.Set;
import org.apache.accumulo.core.client.Accumulo;
@@ -28,7 +29,6 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
@@ -67,7 +67,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setClientInfo(Job, ClientInfo)}
+ * <li>{@link AccumuloOutputFormat#setClientProperties(Job, Properties)}
* </ul>
*
* Other static methods are optional.
@@ -82,12 +82,12 @@
*
* @param job
* Hadoop job to be configured
- * @param info
+ * @param clientProps
* Accumulo connection information
* @since 2.0.0
*/
- public static void setClientInfo(Job job, ClientInfo info) {
- OutputConfigurator.setClientInfo(CLASS, job.getConfiguration(), info);
+ public static void setClientProperties(Job job, Properties clientProps) {
+ OutputConfigurator.setClientProperties(CLASS, job.getConfiguration(), clientProps);
}
/**
@@ -95,12 +95,12 @@ public static void setClientInfo(Job job, ClientInfo info) {
*
* @param context
* Hadoop job context
- * @return {@link ClientInfo}
+ * @return {@link Properties}
*
* @since 2.0.0
*/
- protected static ClientInfo getClientInfo(JobContext context) {
- return OutputConfigurator.getClientInfo(CLASS, context.getConfiguration());
+ protected static Properties getClientProperties(JobContext context) {
+ return OutputConfigurator.getClientProperties(CLASS, context.getConfiguration());
}
/**
@@ -136,7 +136,7 @@ public static void setClientPropertiesFile(Job job, String clientPropsFile) {
* @param token
* the user's password
* @since 1.5.0
- * @deprecated since 2.0.0, replaced by {@link #setClientInfo(Job, ClientInfo)}
+ * @deprecated since 2.0.0, replaced by {@link #setClientProperties(Job, Properties)}
*/
@Deprecated
public static void setConnectorInfo(Job job, String principal, AuthenticationToken token)
@@ -233,7 +233,7 @@ protected static AuthenticationToken getAuthenticationToken(JobContext context)
* @param clientConfig
* client configuration for specifying connection timeouts, SSL connection options, etc.
* @since 1.6.0
- * @deprecated since 2.0.0; Use {@link #setClientInfo(Job, ClientInfo)} instead.
+ * @deprecated since 2.0.0; Use {@link #setClientProperties(Job, Properties)} instead.
*/
@Deprecated
public static void setZooKeeperInstance(Job job,
@@ -249,7 +249,7 @@ public static void setZooKeeperInstance(Job job,
* the Hadoop context for the configured job
* @return an Accumulo instance
* @since 1.5.0
- * @deprecated since 2.0.0; Use {@link #getClientInfo(JobContext)} instead.
+ * @deprecated since 2.0.0; Use {@link #getClientProperties(JobContext)} instead.
*/
@Deprecated
protected static org.apache.accumulo.core.client.Instance getInstance(JobContext context) {
@@ -430,7 +430,7 @@ protected AccumuloRecordWriter(TaskAttemptContext context)
this.defaultTableName = (tname == null) ? null : new Text(tname);
if (!simulate) {
- this.client = Accumulo.newClient().from(getClientInfo(context).getProperties()).build();
+ this.client = Accumulo.newClient().from(getClientProperties(context)).build();
mtbw = client.createMultiTableBatchWriter(getBatchWriterOptions(context));
}
}
@@ -569,7 +569,7 @@ public void checkOutputSpecs(JobContext job) throws IOException {
// if the instance isn't configured, it will complain here
String principal = getPrincipal(job);
AuthenticationToken token = getAuthenticationToken(job);
- AccumuloClient c = Accumulo.newClient().from(getClientInfo(job).getProperties()).build();
+ AccumuloClient c = Accumulo.newClient().from(getClientProperties(job)).build();
if (!c.securityOperations().authenticateUser(principal, token))
throw new IOException("Unable to authenticate user");
} catch (AccumuloException | AccumuloSecurityException e) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
index 9d034ef9e1..4654f4597c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.RowIterator;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
@@ -41,7 +40,7 @@
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setClientInfo(Job, ClientInfo)}
+ * <li>{@link AccumuloRowInputFormat#setClientProperties(Job, java.util.Properties)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job, Authorizations)}
* </ul>
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/AccumuloClientImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/AccumuloClientImpl.java
index a55c9d982b..ca0c907cd6 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/AccumuloClientImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/AccumuloClientImpl.java
@@ -31,7 +31,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ConditionalWriter;
import org.apache.accumulo.core.client.ConditionalWriterConfig;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 16915a32bd..43128863db 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -31,7 +31,6 @@
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.Durability;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
similarity index 95%
rename from core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
rename to core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
index d18ed6c922..191a54eb99 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.core.client;
+package org.apache.accumulo.core.clientImpl;
import java.nio.file.Path;
import java.util.Properties;
+import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.accumulo.core.clientImpl.ClientInfoImpl;
/**
* Accumulo client information. Can be built using {@link Accumulo#newClient()}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
index cf53d2a49d..e4b9882904 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
@@ -23,7 +23,6 @@
import java.nio.file.Paths;
import java.util.Properties;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
index 2b13ea78a7..0896d50085 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
@@ -34,12 +34,12 @@
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.admin.DelegationTokenConfig;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.clientImpl.AuthenticationTokenIdentifier;
import org.apache.accumulo.core.clientImpl.ClientConfConverter;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.ClientInfoImpl;
import org.apache.accumulo.core.clientImpl.DelegationTokenImpl;
import org.apache.accumulo.core.clientImpl.mapreduce.DelegationTokenStub;
@@ -113,17 +113,19 @@ protected static String enumToConfKey(Enum<?> e) {
+ StringUtils.camelize(e.name().toLowerCase());
}
- public static ClientInfo updateToken(org.apache.hadoop.security.Credentials credentials,
- ClientInfo info) {
- ClientInfo result = info;
- if (info.getAuthenticationToken() instanceof KerberosToken) {
+ public static Properties updateToken(org.apache.hadoop.security.Credentials credentials,
+ Properties props) {
+ Properties result = new Properties();
+ props.forEach((key, value) -> result.setProperty((String) key, (String) value));
+
+ AuthenticationToken token = ClientProperty.getAuthenticationToken(result);
+ if (token instanceof KerberosToken) {
log.info("Received KerberosToken, attempting to fetch DelegationToken");
try {
- AccumuloClient client = Accumulo.newClient().from(info.getProperties()).build();
- AuthenticationToken token = client.securityOperations()
+ AccumuloClient client = Accumulo.newClient().from(props).build();
+ AuthenticationToken delegationToken = client.securityOperations()
.getDelegationToken(new DelegationTokenConfig());
- result = ClientInfo.from(Accumulo.newClientProperties().from(info.getProperties())
- .as(info.getPrincipal(), token).build());
+ ClientProperty.setAuthenticationToken(result, delegationToken);
} catch (Exception e) {
log.warn("Failed to automatically obtain DelegationToken, "
+ "Mappers/Reducers will likely fail to communicate with Accumulo", e);
@@ -131,8 +133,8 @@ public static ClientInfo updateToken(org.apache.hadoop.security.Credentials cred
}
// DelegationTokens can be passed securely from user to task without serializing insecurely in
// the configuration
- if (info.getAuthenticationToken() instanceof DelegationTokenImpl) {
- DelegationTokenImpl delegationToken = (DelegationTokenImpl) info.getAuthenticationToken();
+ if (token instanceof DelegationTokenImpl) {
+ DelegationTokenImpl delegationToken = (DelegationTokenImpl) token;
// Convert it into a Hadoop Token
AuthenticationTokenIdentifier identifier = delegationToken.getIdentifier();
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/InputConfigurator.java
index e83bb541c6..142a176843 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/InputConfigurator.java
@@ -41,7 +41,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -51,6 +50,7 @@
import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Table;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.TabletLocator;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
index 31635171e5..6848e41751 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
@@ -17,7 +17,6 @@
package org.apache.accumulo.core.clientImpl.mapreduce.lib;
import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
import org.apache.hadoop.mapreduce.Job;
@@ -40,11 +39,10 @@ public String getTableName() {
public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
super.setAccumuloConfigs(job);
final String tableName = getTableName();
- final ClientInfo info = ClientInfo.from(getClientProperties());
- AccumuloInputFormat.setClientInfo(job, info);
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, tableName);
AccumuloInputFormat.setScanAuthorizations(job, auths);
- AccumuloOutputFormat.setClientInfo(job, info);
+ AccumuloOutputFormat.setClientProperties(job, getClientProperties());
AccumuloOutputFormat.setCreateTables(job, true);
AccumuloOutputFormat.setDefaultTableName(job, tableName);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
index 9d6ab72e6f..1a4964d7db 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
@@ -20,7 +20,6 @@
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
@@ -39,9 +38,8 @@
private static final Logger log = LoggerFactory.getLogger(MapReduceClientOpts.class);
public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
- ClientInfo info = ClientInfo.from(this.getClientProperties());
- AccumuloInputFormat.setClientInfo(job, info);
- AccumuloOutputFormat.setClientInfo(job, info);
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
+ AccumuloOutputFormat.setClientProperties(job, getClientProperties());
}
@Override
diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBaseTest.java b/core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBaseTest.java
index 6f65a6f49a..e1013b21ba 100644
--- a/core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBaseTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBaseTest.java
@@ -26,7 +26,6 @@
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
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;
@@ -77,16 +76,16 @@ public void testSetConnectorInfoClassOfQConfigurationStringString()
}
@Test
- public void testSetClientInfo() {
+ public void testSetClientProperties() {
Configuration conf = new Configuration();
- ClientInfo info = ClientInfo.from(
- Accumulo.newClientProperties().to("myinstance", "myzookeepers").as("user", "pass").build());
- ConfiguratorBase.setClientInfo(this.getClass(), conf, info);
- ClientInfo info2 = ConfiguratorBase.getClientInfo(this.getClass(), conf);
- assertEquals("myinstance", info2.getInstanceName());
- assertEquals("myzookeepers", info2.getZooKeepers());
- assertEquals("user", info2.getPrincipal());
- assertTrue(info2.getAuthenticationToken() instanceof PasswordToken);
+ Properties props = Accumulo.newClientProperties().to("myinstance", "myzookeepers")
+ .as("user", "pass").build();
+ ConfiguratorBase.setClientProperties(this.getClass(), conf, props);
+ Properties props2 = ConfiguratorBase.getClientProperties(this.getClass(), conf);
+ assertEquals("myinstance", ClientProperty.INSTANCE_NAME.getValue(props2));
+ assertEquals("myzookeepers", ClientProperty.INSTANCE_ZOOKEEPERS.getValue(props2));
+ assertEquals("user", ClientProperty.AUTH_PRINCIPAL.getValue(props2));
+ assertTrue(ClientProperty.getAuthenticationToken(props2) instanceof PasswordToken);
}
@SuppressWarnings("deprecation")
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloOutputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloOutputFormat.java
index 86892f0d1a..26af9d3baf 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloOutputFormat.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloOutputFormat.java
@@ -24,8 +24,8 @@
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.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.hadoop.mapreduce.OutputFormatBuilder;
import org.apache.accumulo.hadoopImpl.mapred.AccumuloOutputFormatImpl;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.java
index 0e7dfb6527..0bd279ab18 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.java
@@ -24,8 +24,8 @@
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.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.hadoopImpl.mapreduce.AccumuloOutputFormatImpl;
import org.apache.accumulo.hadoopImpl.mapreduce.OutputFormatBuilderImpl;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AbstractInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AbstractInputFormat.java
index 657f66c96a..63ac313b7f 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AbstractInputFormat.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AbstractInputFormat.java
@@ -35,7 +35,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -46,6 +45,7 @@
import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.OfflineScanner;
import org.apache.accumulo.core.clientImpl.ScannerImpl;
import org.apache.accumulo.core.clientImpl.Table;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloOutputFormatImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloOutputFormatImpl.java
index 99aa434787..e1a26b500d 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloOutputFormatImpl.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloOutputFormatImpl.java
@@ -27,12 +27,12 @@
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.security.SecurityErrorCode;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.TabletId;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AbstractInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AbstractInputFormat.java
index ea13fb3295..2e91e5d285 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AbstractInputFormat.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AbstractInputFormat.java
@@ -35,7 +35,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -46,6 +45,7 @@
import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.OfflineScanner;
import org.apache.accumulo.core.clientImpl.ScannerImpl;
import org.apache.accumulo.core.clientImpl.Table;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloOutputFormatImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloOutputFormatImpl.java
index 11b57e2fcb..dc956bb019 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloOutputFormatImpl.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloOutputFormatImpl.java
@@ -27,12 +27,12 @@
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.security.SecurityErrorCode;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.TabletId;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java
index 71101ff5ab..a2876c1551 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java
@@ -28,9 +28,9 @@
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.IteratorSetting;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.hadoop.mapreduce.InputFormatBuilder;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java
index defe67f348..e5f0539b12 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java
@@ -25,7 +25,7 @@
import java.util.Optional;
import java.util.Properties;
-import org.apache.accumulo.core.client.ClientInfo;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.hadoop.mapreduce.OutputFormatBuilder;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.Job;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBase.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBase.java
index 8d725bb89d..8ac9457bb8 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBase.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBase.java
@@ -29,11 +29,11 @@
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.clientImpl.AuthenticationTokenIdentifier;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.ClientInfoImpl;
import org.apache.accumulo.core.clientImpl.DelegationTokenImpl;
import org.apache.accumulo.core.conf.ClientProperty;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/InputConfigurator.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/InputConfigurator.java
index 46c1a06731..b53749b5ea 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/InputConfigurator.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/InputConfigurator.java
@@ -41,7 +41,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
import org.apache.accumulo.core.client.IsolatedScanner;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -50,6 +49,7 @@
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Table;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.TabletLocator;
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/OutputConfigurator.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/OutputConfigurator.java
index 6df69f6b9d..9cdca7b64e 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/OutputConfigurator.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/OutputConfigurator.java
@@ -27,7 +27,7 @@
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.DurabilityImpl;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
index aa64aa86f5..fe39b20978 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
@@ -30,12 +30,12 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
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.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBaseTest.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBaseTest.java
index 95f1c09427..6334f85400 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBaseTest.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/ConfiguratorBaseTest.java
@@ -23,9 +23,9 @@
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Accumulo;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.hadoop.conf.Configuration;
import org.junit.Test;
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 5870535188..0dab985209 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
@@ -29,9 +29,9 @@
import org.apache.accumulo.cluster.ClusterUser;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.clientImpl.ClientConfConverter;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.ConfigurationCopy;
import org.apache.accumulo.core.conf.SiteConfiguration;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
index bf5240edce..f2ea0669b3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
@@ -25,10 +25,10 @@
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.clientImpl.AccumuloClientImpl;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.SiteConfiguration;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
index e14f747f78..717c9d6a54 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
@@ -23,9 +23,9 @@
import java.util.UUID;
import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.clientImpl.ClientConfConverter;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Credentials;
import org.apache.accumulo.core.clientImpl.InstanceOperationsImpl;
import org.apache.accumulo.core.conf.ClientProperty;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index d38c032eaa..4a4ea0e313 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -38,13 +38,13 @@
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.TableNotFoundException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.ClientExecReturn;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.ReplicationClient;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.ClientProperty;
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index c141ce2b93..4679bc1c28 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -48,13 +48,13 @@
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.IteratorSetting;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
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 bb585de3ee..282470cdc7 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -29,13 +29,13 @@
import org.apache.accumulo.cluster.ClusterUsers;
import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.admin.SecurityOperations;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.harness.conf.AccumuloClusterConfiguration;
diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
index 15fa6aaeac..2b30a7c925 100644
--- a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
+++ b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
@@ -28,10 +28,10 @@
import org.apache.accumulo.cluster.ClusterUser;
import org.apache.accumulo.core.client.Accumulo;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.UserGroupInformation;
diff --git a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
index b442b70773..5219fb4211 100644
--- a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
@@ -29,9 +29,9 @@
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.admin.InstanceOperations;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
diff --git a/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java b/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
index 742416098a..faaf6020b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
@@ -28,11 +28,11 @@
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.ClientInfo;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.TabletLocator;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index 17b4160fc3..209f084482 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -58,7 +58,6 @@
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.IteratorSetting;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
@@ -69,6 +68,7 @@
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.client.summary.summarizers.DeletesSummarizer;
import org.apache.accumulo.core.client.summary.summarizers.FamilySummarizer;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.DefaultConfiguration;
diff --git a/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java b/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java
index 279977219a..cc80d3bcf3 100644
--- a/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java
@@ -25,8 +25,8 @@
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.ClientInfo;
import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
index d0da323a5c..b7119a37fe 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
@@ -27,11 +27,11 @@
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.ConditionalWriterConfig;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index 9cb7679c5e..f01b2ad540 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -23,8 +23,8 @@
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.TableNotFoundException;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.test.TestIngest;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
index 246fff935b..2f8b8bba43 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
@@ -31,9 +31,9 @@
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.util.MonitorUtil;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java
index e3fb5c5f85..c015ce57c6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java
@@ -30,11 +30,11 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
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.clientImpl.ClientInfo;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 59b3143733..df3a5a85ba 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -65,7 +65,6 @@
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.ClientInfo;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.NewTableConfiguration;
@@ -73,6 +72,7 @@
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
index 1345fc74b3..c0264b9e82 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -34,10 +34,10 @@
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.metadata.MetadataTable;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableChangeStateIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
index c7d570e218..6d8db420c4 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
@@ -35,12 +35,12 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.IteratorSetting;
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.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Table;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.conf.Property;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 88df7e82f8..df09bed212 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -34,12 +34,12 @@
import org.apache.accumulo.core.client.BatchDeleter;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
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.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Table;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.data.Key;
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
index 7e1ccc2fa1..0da90167ff 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
@@ -154,7 +154,7 @@ public int run(String[] args) throws Exception {
job.setInputFormat(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloFileOutputFormat.setOutputPath(job, new Path(args[1]));
AccumuloFileOutputFormat.setSampler(job, SAMPLER_CONFIG);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index 48abbf425b..d605e1bcdc 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -123,7 +123,7 @@ public int run(String[] args) throws Exception {
job.setInputFormat(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setBatchScan(job, batchScan);
if (sample) {
@@ -219,7 +219,7 @@ public void testCorrectRangeInputSplits() throws Exception {
try (AccumuloClient accumuloClient = getAccumuloClient()) {
accumuloClient.tableOperations().create(table);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setScanAuthorizations(job, auths);
AccumuloInputFormat.setScanIsolation(job, isolated);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index 749234560a..b4a6063bca 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -104,7 +104,7 @@ public int run(String[] args) throws Exception {
job.setInputFormat(AccumuloInputFormat.class);
- AccumuloMultiTableInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloMultiTableInputFormat.setClientProperties(job, getClientProperties());
InputTableConfig tableConfig1 = new InputTableConfig();
InputTableConfig tableConfig2 = new InputTableConfig();
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
index 0d94a6745d..a275e11b06 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
@@ -27,13 +27,13 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.Accumulo;
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.ClientInfo;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.mapred.AccumuloInputFormat;
@@ -83,7 +83,7 @@ public void testMapred() throws Exception {
// set the max memory so that we ensure we don't flush on the write.
batchConfig.setMaxMemory(Long.MAX_VALUE);
AccumuloOutputFormat outputFormat = new AccumuloOutputFormat();
- AccumuloOutputFormat.setClientInfo(job, getClientInfo());
+ AccumuloOutputFormat.setClientProperties(job, getClientProperties());
AccumuloOutputFormat.setBatchWriterOptions(job, batchConfig);
RecordWriter<Text,Mutation> writer = outputFormat.getRecordWriter(null, job, "Test", null);
@@ -169,10 +169,10 @@ public int run(String[] args) throws Exception {
job.setInputFormat(AccumuloInputFormat.class);
- ClientInfo info = ClientInfo
- .from(Accumulo.newClientProperties().to(instanceName, zooKeepers).as(user, pass).build());
+ Properties clientProps = Accumulo.newClientProperties().to(instanceName, zooKeepers)
+ .as(user, pass).build();
- AccumuloInputFormat.setClientInfo(job, info);
+ AccumuloInputFormat.setClientProperties(job, clientProps);
AccumuloInputFormat.setInputTableName(job, table1);
job.setMapperClass(TestMapper.class);
@@ -182,7 +182,7 @@ public int run(String[] args) throws Exception {
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(Mutation.class);
- AccumuloOutputFormat.setClientInfo(job, info);
+ AccumuloOutputFormat.setClientProperties(job, clientProps);
AccumuloOutputFormat.setCreateTables(job, false);
AccumuloOutputFormat.setDefaultTableName(job, table2);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
index fed0ec10c7..0754edce72 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
@@ -159,7 +159,7 @@ public int run(String[] args) throws Exception {
job.setInputFormat(AccumuloRowInputFormat.class);
- AccumuloRowInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloRowInputFormat.setClientProperties(job, getClientProperties());
AccumuloRowInputFormat.setInputTableName(job, table);
job.setMapperClass(TestMapper.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
index 92118e6ae2..550edb927d 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
@@ -165,7 +165,7 @@ public int run(String[] args) throws Exception {
job.setInputFormatClass(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloFileOutputFormat.setOutputPath(job, new Path(args[1]));
AccumuloFileOutputFormat.setSampler(job, SAMPLER_CONFIG);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index 046f9c4168..af5ffb0463 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -101,7 +101,7 @@ public void testGetSplits() throws Exception {
Job job = Job.getInstance();
AccumuloInputFormat.setInputTableName(job, table);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
// split table
TreeSet<Text> splitsToAdd = new TreeSet<>();
@@ -283,7 +283,7 @@ public int run(String[] args) throws Exception {
job.setInputFormatClass(inputFormatClass);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setBatchScan(job, batchScan);
if (sample) {
@@ -404,7 +404,7 @@ public void testCorrectRangeInputSplits() throws Exception {
try (AccumuloClient accumuloClient = getAccumuloClient()) {
accumuloClient.tableOperations().create(table);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setScanAuthorizations(job, auths);
AccumuloInputFormat.setScanIsolation(job, isolated);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index 0bc7d5ad37..2a2e5b78a8 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -97,7 +97,7 @@ public int run(String[] args) throws Exception {
job.setInputFormatClass(AccumuloMultiTableInputFormat.class);
- AccumuloMultiTableInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloMultiTableInputFormat.setClientProperties(job, getClientProperties());
InputTableConfig tableConfig1 = new InputTableConfig();
InputTableConfig tableConfig2 = new InputTableConfig();
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
index 8e00867711..55ab3ccbf9 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
@@ -93,7 +93,7 @@ public int run(String[] args) throws Exception {
job.setInputFormatClass(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table1);
job.setMapperClass(TestMapper.class);
@@ -103,7 +103,7 @@ public int run(String[] args) throws Exception {
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(Mutation.class);
- AccumuloOutputFormat.setClientInfo(job, getClientInfo());
+ AccumuloOutputFormat.setClientProperties(job, getClientProperties());
AccumuloOutputFormat.setCreateTables(job, false);
AccumuloOutputFormat.setDefaultTableName(job, table2);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
index a0f6a27e11..49fb3f570b 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
@@ -154,7 +154,7 @@ public int run(String[] args) throws Exception {
job.setInputFormatClass(AccumuloRowInputFormat.class);
- AccumuloRowInputFormat.setClientInfo(job, getClientInfo());
+ AccumuloRowInputFormat.setClientProperties(job, getClientProperties());
AccumuloInputFormat.setInputTableName(job, table);
job.setMapperClass(TestMapper.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
index 0a150d64a1..591d58d69e 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
@@ -23,7 +23,7 @@
import java.util.TreeSet;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index f3babd9219..e986b0f4cc 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -47,9 +47,9 @@
import org.apache.accumulo.cluster.ClusterUser;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
index f967a65c30..6b953fee77 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
@@ -28,9 +28,9 @@
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.ClientInfo;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index ab251c93b9..d0e503fa18 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -46,13 +46,13 @@
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.admin.TableOperations;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Table;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services