Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1442284&r1=1442283&r2=1442284&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java Mon Feb 4 18:09:38 2013 @@ -22,33 +22,37 @@ */ package org.apache.accumulo.core.security.thrift; -import java.nio.ByteBuffer; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -import org.apache.accumulo.core.security.tokens.UserPassToken; -import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; + import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @deprecated since 1.5, use {@link UserPassToken} instead - */ -@SuppressWarnings("serial") -public class AuthInfo implements org.apache.thrift.TBase<AuthInfo, AuthInfo._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class AuthInfo implements org.apache.thrift.TBase<AuthInfo, AuthInfo._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthInfo"); private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField INSTANCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("instanceId", org.apache.thrift.protocol.TType.STRING, (short)3); - @SuppressWarnings("rawtypes") private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { schemes.put(StandardScheme.class, new AuthInfoStandardSchemeFactory()); @@ -414,12 +418,10 @@ public class AuthInfo implements org.apa return _Fields.findByThriftId(fieldId); } - @SuppressWarnings("unchecked") public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - @SuppressWarnings("unchecked") public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -478,7 +480,6 @@ public class AuthInfo implements org.apa } private static class AuthInfoStandardSchemeFactory implements SchemeFactory { - @SuppressWarnings("unchecked") public AuthInfoStandardScheme getScheme() { return new AuthInfoStandardScheme(); } @@ -557,7 +558,6 @@ public class AuthInfo implements org.apa } private static class AuthInfoTupleSchemeFactory implements SchemeFactory { - @SuppressWarnings("unchecked") public AuthInfoTupleScheme getScheme() { return new AuthInfoTupleScheme(); }
