commit 5f6326d40f3f2ed5b07928cca26d5474426215b2
author Mike Walch <mwalch@apache.org> Tue Apr 24 15:37:11 2018 -0400
committer GitHub <noreply@github.com> Tue Apr 24 15:37:11 2018 -0400
tree a05f579d46055e5790c92ed59dba8a6c192850f5
parent 2b6301c86271b5e4dced6abc15ef20cc61122c37

 #408 - Removed uses of deprecated ClientConfiguration (#430)

src/main/java/org/apache/accumulo/proxy/Proxy.java

diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
index ef84f79..898ea0b 100644
--- a/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -26,7 +26,7 @@
 import org.apache.accumulo.core.cli.Help;
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
-import org.apache.accumulo.core.client.impl.ClientContext;
+import org.apache.accumulo.core.client.impl.ClientConfConverter;
 import org.apache.accumulo.core.client.security.tokens.KerberosToken;
 import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
 import org.apache.accumulo.core.conf.Property;
@@ -255,7 +255,7 @@
     SaslServerConnectionParams saslParams = null;
     switch (serverType) {
       case SSL:
-        sslParams = SslConnectionParams.forClient(ClientContext.convertClientConfig(clientConf));
+        sslParams = SslConnectionParams.forClient(ClientConfConverter.toAccumuloConf(clientConf));
         break;
       case SASL:
         if (!clientConf.hasSasl()) {
@@ -291,7 +291,8 @@
         clientConf.setProperty(ClientProperty.KERBEROS_SERVER_PRIMARY, shortName);
 
         KerberosToken token = new KerberosToken();
-        saslParams = new SaslServerConnectionParams(clientConf, token, null);
+        saslParams = new SaslServerConnectionParams(ClientConfConverter.toProperties(clientConf),
+            token, null);
 
         processor = new UGIAssumingProcessor(processor);