accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1451409 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/test/java/org/apache/accumulo/core/client/impl/ server/src/main/java/org/apache/accu...
Date Thu, 28 Feb 2013 22:40:05 GMT
Author: ctubbsii
Date: Thu Feb 28 22:40:05 2013
New Revision: 1451409

URL: http://svn.apache.org/r1451409
Log:
ACCUMULO-1025 Remove warnings associated with deprecated AuthInfo

Modified:
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
    accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1451409&r1=1451408&r2=1451409&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
Thu Feb 28 22:40:05 2013
@@ -22,7 +22,6 @@ import java.util.Properties;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.security.handler.Authenticator;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 
@@ -101,7 +100,7 @@ public interface Instance {
    * @deprecated since 1.5, use {@link #getConnector(String, AuthenticationToken)}
    */
   @Deprecated
-  public abstract Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException;
+  public abstract Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo
auth) throws AccumuloException, AccumuloSecurityException;
   
   /**
    * Returns a connection to accumulo.

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1451409&r1=1451408&r2=1451409&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
Thu Feb 28 22:40:05 2013
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.conf.Pro
 import org.apache.accumulo.core.file.FileUtil;
 import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
 import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implement
   
   @Deprecated
   @Override
-  public Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException
{
+  public Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws
AccumuloException, AccumuloSecurityException {
     return getConnector(auth.user, auth.password);
   }
   

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1451409&r1=1451408&r2=1451409&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
Thu Feb 28 22:40:05 2013
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.client.I
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.security.CredentialHelper;
 import org.apache.accumulo.core.security.handler.ZKAuthenticator;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
@@ -147,7 +146,7 @@ public class MockInstance implements Ins
   
   @Deprecated
   @Override
-  public Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException
{
+  public Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws
AccumuloException, AccumuloSecurityException {
     return getConnector(auth.user, auth.password);
   }
   

Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java?rev=1451409&r1=1451408&r2=1451409&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
(original)
+++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
Thu Feb 28 22:40:05 2013
@@ -47,7 +47,6 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.util.MetadataTable;
@@ -377,7 +376,7 @@ public class TabletLocatorImplTest exten
   
   static class TestInstance implements Instance {
     
-    private String iid;
+    private final String iid;
     private String rtl;
     
     public TestInstance(String iid, String rtl) {
@@ -453,7 +452,7 @@ public class TabletLocatorImplTest exten
     
     @Deprecated
     @Override
-    public Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException
{
+    public Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth)
throws AccumuloException, AccumuloSecurityException {
       return getConnector(auth.user, auth.getPassword());
     }
     
@@ -470,12 +469,12 @@ public class TabletLocatorImplTest exten
   }
   
   static class TServers {
-    private Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers =
new HashMap<String,Map<KeyExtent,SortedMap<Key,Value>>>();
+    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers
= new HashMap<String,Map<KeyExtent,SortedMap<Key,Value>>>();
   }
   
   static class TestTabletLocationObtainer implements TabletLocationObtainer {
     
-    private Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers;
+    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers;
     
     TestTabletLocationObtainer(TServers tservers) {
       this.tservers = tservers.tservers;

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1451409&r1=1451408&r2=1451409&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
Thu Feb 28 22:40:05 2013
@@ -33,7 +33,6 @@ import org.apache.accumulo.core.conf.Acc
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
 import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
@@ -203,7 +202,7 @@ public class HdfsZooInstance implements 
   
   @Deprecated
   @Override
-  public Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException
{
+  public Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws
AccumuloException, AccumuloSecurityException {
     return getConnector(auth.user, auth.getPassword());
   }
   



Mime
View raw message