accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [21/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0
Date Thu, 09 Feb 2017 19:29:49 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
index 9e2b3a0..ade9302 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
@@ -15,55 +15,25 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.security.thrift;
 
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToken, TDelegationToken._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationToken> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationToken");
 
   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)1);
   private static final org.apache.thrift.protocol.TField IDENTIFIER_FIELD_DESC = new org.apache.thrift.protocol.TField("identifier", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TDelegationTokenStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TDelegationTokenTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TDelegationTokenStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TDelegationTokenTupleSchemeFactory();
 
-  public ByteBuffer password; // required
+  public java.nio.ByteBuffer password; // required
   public TAuthenticationTokenIdentifier identifier; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -71,10 +41,10 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     PASSWORD((short)1, "password"),
     IDENTIFIER((short)2, "identifier");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -99,21 +69,21 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -122,20 +92,20 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("identifier", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthenticationTokenIdentifier.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDelegationToken.class, metaDataMap);
   }
 
@@ -143,7 +113,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
   }
 
   public TDelegationToken(
-    ByteBuffer password,
+    java.nio.ByteBuffer password,
     TAuthenticationTokenIdentifier identifier)
   {
     this();
@@ -178,16 +148,16 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     return password == null ? null : password.array();
   }
 
-  public ByteBuffer bufferForPassword() {
+  public java.nio.ByteBuffer bufferForPassword() {
     return org.apache.thrift.TBaseHelper.copyBinary(password);
   }
 
   public TDelegationToken setPassword(byte[] password) {
-    this.password = password == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(password, password.length));
+    this.password = password == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(password.clone());
     return this;
   }
 
-  public TDelegationToken setPassword(ByteBuffer password) {
+  public TDelegationToken setPassword(java.nio.ByteBuffer password) {
     this.password = org.apache.thrift.TBaseHelper.copyBinary(password);
     return this;
   }
@@ -231,13 +201,17 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case PASSWORD:
       if (value == null) {
         unsetPassword();
       } else {
-        setPassword((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setPassword((byte[])value);
+        } else {
+          setPassword((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -252,7 +226,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PASSWORD:
       return getPassword();
@@ -261,13 +235,13 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
       return getIdentifier();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -276,11 +250,11 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     case IDENTIFIER:
       return isSetIdentifier();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TDelegationToken)
@@ -291,6 +265,8 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
   public boolean equals(TDelegationToken that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_password = true && this.isSetPassword();
     boolean that_present_password = true && that.isSetPassword();
@@ -315,19 +291,17 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_password = true && (isSetPassword());
-    list.add(present_password);
-    if (present_password)
-      list.add(password);
+    hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287);
+    if (isSetPassword())
+      hashCode = hashCode * 8191 + password.hashCode();
 
-    boolean present_identifier = true && (isSetIdentifier());
-    list.add(present_identifier);
-    if (present_identifier)
-      list.add(identifier);
+    hashCode = hashCode * 8191 + ((isSetIdentifier()) ? 131071 : 524287);
+    if (isSetIdentifier())
+      hashCode = hashCode * 8191 + identifier.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -338,7 +312,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+    lastComparison = java.lang.Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -348,7 +322,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIdentifier()).compareTo(other.isSetIdentifier());
+    lastComparison = java.lang.Boolean.valueOf(isSetIdentifier()).compareTo(other.isSetIdentifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -366,16 +340,16 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TDelegationToken(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TDelegationToken(");
     boolean first = true;
 
     sb.append("password:");
@@ -413,7 +387,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -421,13 +395,13 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     }
   }
 
-  private static class TDelegationTokenStandardSchemeFactory implements SchemeFactory {
+  private static class TDelegationTokenStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDelegationTokenStandardScheme getScheme() {
       return new TDelegationTokenStandardScheme();
     }
   }
 
-  private static class TDelegationTokenStandardScheme extends StandardScheme<TDelegationToken> {
+  private static class TDelegationTokenStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDelegationToken> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDelegationToken struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -487,18 +461,18 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
   }
 
-  private static class TDelegationTokenTupleSchemeFactory implements SchemeFactory {
+  private static class TDelegationTokenTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDelegationTokenTupleScheme getScheme() {
       return new TDelegationTokenTupleScheme();
     }
   }
 
-  private static class TDelegationTokenTupleScheme extends TupleScheme<TDelegationToken> {
+  private static class TDelegationTokenTupleScheme extends org.apache.thrift.scheme.TupleScheme<TDelegationToken> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TDelegationToken struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetPassword()) {
         optionals.set(0);
       }
@@ -516,8 +490,8 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDelegationToken struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.password = iprot.readBinary();
         struct.setPasswordIsSet(true);
@@ -530,5 +504,9 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
index 21e5013..1025b07 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
@@ -15,52 +15,22 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.security.thrift;
 
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegationTokenConfig, TDelegationTokenConfig._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationTokenConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationTokenConfig");
 
   private static final org.apache.thrift.protocol.TField LIFETIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lifetime", org.apache.thrift.protocol.TType.I64, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TDelegationTokenConfigStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TDelegationTokenConfigTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TDelegationTokenConfigStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TDelegationTokenConfigTupleSchemeFactory();
 
   public long lifetime; // optional
 
@@ -68,10 +38,10 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     LIFETIME((short)1, "lifetime");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -94,21 +64,21 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -117,7 +87,7 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -126,12 +96,12 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
   private static final int __LIFETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.LIFETIME};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LIFETIME, new org.apache.thrift.meta_data.FieldMetaData("lifetime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDelegationTokenConfig.class, metaDataMap);
   }
 
@@ -167,55 +137,55 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
   }
 
   public void unsetLifetime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIFETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIFETIME_ISSET_ID);
   }
 
   /** Returns true if field lifetime is set (has been assigned a value) and false otherwise */
   public boolean isSetLifetime() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIFETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIFETIME_ISSET_ID);
   }
 
   public void setLifetimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIFETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIFETIME_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case LIFETIME:
       if (value == null) {
         unsetLifetime();
       } else {
-        setLifetime((Long)value);
+        setLifetime((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LIFETIME:
       return getLifetime();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case LIFETIME:
       return isSetLifetime();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof TDelegationTokenConfig)
@@ -226,6 +196,8 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
   public boolean equals(TDelegationTokenConfig that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_lifetime = true && this.isSetLifetime();
     boolean that_present_lifetime = true && that.isSetLifetime();
@@ -241,14 +213,13 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_lifetime = true && (isSetLifetime());
-    list.add(present_lifetime);
-    if (present_lifetime)
-      list.add(lifetime);
+    hashCode = hashCode * 8191 + ((isSetLifetime()) ? 131071 : 524287);
+    if (isSetLifetime())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lifetime);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -259,7 +230,7 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLifetime()).compareTo(other.isSetLifetime());
+    lastComparison = java.lang.Boolean.valueOf(isSetLifetime()).compareTo(other.isSetLifetime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -277,16 +248,16 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TDelegationTokenConfig(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TDelegationTokenConfig(");
     boolean first = true;
 
     if (isSetLifetime()) {
@@ -311,7 +282,7 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -321,13 +292,13 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
     }
   }
 
-  private static class TDelegationTokenConfigStandardSchemeFactory implements SchemeFactory {
+  private static class TDelegationTokenConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDelegationTokenConfigStandardScheme getScheme() {
       return new TDelegationTokenConfigStandardScheme();
     }
   }
 
-  private static class TDelegationTokenConfigStandardScheme extends StandardScheme<TDelegationTokenConfig> {
+  private static class TDelegationTokenConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDelegationTokenConfig> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDelegationTokenConfig struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -373,18 +344,18 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
   }
 
-  private static class TDelegationTokenConfigTupleSchemeFactory implements SchemeFactory {
+  private static class TDelegationTokenConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TDelegationTokenConfigTupleScheme getScheme() {
       return new TDelegationTokenConfigTupleScheme();
     }
   }
 
-  private static class TDelegationTokenConfigTupleScheme extends TupleScheme<TDelegationTokenConfig> {
+  private static class TDelegationTokenConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<TDelegationTokenConfig> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TDelegationTokenConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLifetime()) {
         optionals.set(0);
       }
@@ -396,8 +367,8 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDelegationTokenConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.lifetime = iprot.readI64();
         struct.setLifetimeIsSet(true);
@@ -405,5 +376,9 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index 4997cf8..03c937a 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionStats._Fields>, java.io.Serializable, Cloneable, Comparable<ActionStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActionStats");
 
@@ -63,11 +36,8 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   private static final org.apache.thrift.protocol.TField QUEUE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("queueTime", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
   private static final org.apache.thrift.protocol.TField QUEUE_SUM_DEV_FIELD_DESC = new org.apache.thrift.protocol.TField("queueSumDev", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ActionStatsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ActionStatsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ActionStatsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ActionStatsTupleSchemeFactory();
 
   public int status; // required
   public double elapsed; // required
@@ -89,10 +59,10 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
     QUEUE_TIME((short)7, "queueTime"),
     QUEUE_SUM_DEV((short)8, "queueSumDev");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -129,21 +99,21 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -152,7 +122,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -167,9 +137,9 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   private static final int __QUEUETIME_ISSET_ID = 6;
   private static final int __QUEUESUMDEV_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.ELAPSED, new org.apache.thrift.meta_data.FieldMetaData("elapsed", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -186,7 +156,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.QUEUE_SUM_DEV, new org.apache.thrift.meta_data.FieldMetaData("queueSumDev", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ActionStats.class, metaDataMap);
   }
 
@@ -272,16 +242,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetStatus() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STATUS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STATUS_ISSET_ID);
   }
 
   /** Returns true if field status is set (has been assigned a value) and false otherwise */
   public boolean isSetStatus() {
-    return EncodingUtils.testBit(__isset_bitfield, __STATUS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STATUS_ISSET_ID);
   }
 
   public void setStatusIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STATUS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STATUS_ISSET_ID, value);
   }
 
   public double getElapsed() {
@@ -295,16 +265,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetElapsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ELAPSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ELAPSED_ISSET_ID);
   }
 
   /** Returns true if field elapsed is set (has been assigned a value) and false otherwise */
   public boolean isSetElapsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __ELAPSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ELAPSED_ISSET_ID);
   }
 
   public void setElapsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ELAPSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ELAPSED_ISSET_ID, value);
   }
 
   public int getNum() {
@@ -318,16 +288,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetNum() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_ISSET_ID);
   }
 
   /** Returns true if field num is set (has been assigned a value) and false otherwise */
   public boolean isSetNum() {
-    return EncodingUtils.testBit(__isset_bitfield, __NUM_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_ISSET_ID);
   }
 
   public void setNumIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_ISSET_ID, value);
   }
 
   public long getCount() {
@@ -341,16 +311,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __COUNT_ISSET_ID);
   }
 
   /** Returns true if field count is set (has been assigned a value) and false otherwise */
   public boolean isSetCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __COUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __COUNT_ISSET_ID);
   }
 
   public void setCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __COUNT_ISSET_ID, value);
   }
 
   public double getSumDev() {
@@ -364,16 +334,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetSumDev() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUMDEV_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUMDEV_ISSET_ID);
   }
 
   /** Returns true if field sumDev is set (has been assigned a value) and false otherwise */
   public boolean isSetSumDev() {
-    return EncodingUtils.testBit(__isset_bitfield, __SUMDEV_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUMDEV_ISSET_ID);
   }
 
   public void setSumDevIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUMDEV_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUMDEV_ISSET_ID, value);
   }
 
   public int getFail() {
@@ -387,16 +357,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetFail() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FAIL_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FAIL_ISSET_ID);
   }
 
   /** Returns true if field fail is set (has been assigned a value) and false otherwise */
   public boolean isSetFail() {
-    return EncodingUtils.testBit(__isset_bitfield, __FAIL_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FAIL_ISSET_ID);
   }
 
   public void setFailIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FAIL_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FAIL_ISSET_ID, value);
   }
 
   public double getQueueTime() {
@@ -410,16 +380,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetQueueTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUEUETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __QUEUETIME_ISSET_ID);
   }
 
   /** Returns true if field queueTime is set (has been assigned a value) and false otherwise */
   public boolean isSetQueueTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __QUEUETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __QUEUETIME_ISSET_ID);
   }
 
   public void setQueueTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUEUETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __QUEUETIME_ISSET_ID, value);
   }
 
   public double getQueueSumDev() {
@@ -433,25 +403,25 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void unsetQueueSumDev() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID);
   }
 
   /** Returns true if field queueSumDev is set (has been assigned a value) and false otherwise */
   public boolean isSetQueueSumDev() {
-    return EncodingUtils.testBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID);
   }
 
   public void setQueueSumDevIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case STATUS:
       if (value == null) {
         unsetStatus();
       } else {
-        setStatus((Integer)value);
+        setStatus((java.lang.Integer)value);
       }
       break;
 
@@ -459,7 +429,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetElapsed();
       } else {
-        setElapsed((Double)value);
+        setElapsed((java.lang.Double)value);
       }
       break;
 
@@ -467,7 +437,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetNum();
       } else {
-        setNum((Integer)value);
+        setNum((java.lang.Integer)value);
       }
       break;
 
@@ -475,7 +445,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetCount();
       } else {
-        setCount((Long)value);
+        setCount((java.lang.Long)value);
       }
       break;
 
@@ -483,7 +453,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetSumDev();
       } else {
-        setSumDev((Double)value);
+        setSumDev((java.lang.Double)value);
       }
       break;
 
@@ -491,7 +461,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetFail();
       } else {
-        setFail((Integer)value);
+        setFail((java.lang.Integer)value);
       }
       break;
 
@@ -499,7 +469,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetQueueTime();
       } else {
-        setQueueTime((Double)value);
+        setQueueTime((java.lang.Double)value);
       }
       break;
 
@@ -507,14 +477,14 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       if (value == null) {
         unsetQueueSumDev();
       } else {
-        setQueueSumDev((Double)value);
+        setQueueSumDev((java.lang.Double)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
       return getStatus();
@@ -541,13 +511,13 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
       return getQueueSumDev();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -568,11 +538,11 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
     case QUEUE_SUM_DEV:
       return isSetQueueSumDev();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof ActionStats)
@@ -583,6 +553,8 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   public boolean equals(ActionStats that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_status = true;
     boolean that_present_status = true;
@@ -661,49 +633,25 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_status = true;
-    list.add(present_status);
-    if (present_status)
-      list.add(status);
+    hashCode = hashCode * 8191 + status;
 
-    boolean present_elapsed = true;
-    list.add(present_elapsed);
-    if (present_elapsed)
-      list.add(elapsed);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(elapsed);
 
-    boolean present_num = true;
-    list.add(present_num);
-    if (present_num)
-      list.add(num);
+    hashCode = hashCode * 8191 + num;
 
-    boolean present_count = true;
-    list.add(present_count);
-    if (present_count)
-      list.add(count);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(count);
 
-    boolean present_sumDev = true;
-    list.add(present_sumDev);
-    if (present_sumDev)
-      list.add(sumDev);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(sumDev);
 
-    boolean present_fail = true;
-    list.add(present_fail);
-    if (present_fail)
-      list.add(fail);
+    hashCode = hashCode * 8191 + fail;
 
-    boolean present_queueTime = true;
-    list.add(present_queueTime);
-    if (present_queueTime)
-      list.add(queueTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queueTime);
 
-    boolean present_queueSumDev = true;
-    list.add(present_queueSumDev);
-    if (present_queueSumDev)
-      list.add(queueSumDev);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queueSumDev);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -714,7 +662,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -724,7 +672,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed());
+    lastComparison = java.lang.Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -734,7 +682,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
+    lastComparison = java.lang.Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -744,7 +692,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
+    lastComparison = java.lang.Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -754,7 +702,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSumDev()).compareTo(other.isSetSumDev());
+    lastComparison = java.lang.Boolean.valueOf(isSetSumDev()).compareTo(other.isSetSumDev());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -764,7 +712,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFail()).compareTo(other.isSetFail());
+    lastComparison = java.lang.Boolean.valueOf(isSetFail()).compareTo(other.isSetFail());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -774,7 +722,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetQueueTime()).compareTo(other.isSetQueueTime());
+    lastComparison = java.lang.Boolean.valueOf(isSetQueueTime()).compareTo(other.isSetQueueTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -784,7 +732,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetQueueSumDev()).compareTo(other.isSetQueueSumDev());
+    lastComparison = java.lang.Boolean.valueOf(isSetQueueSumDev()).compareTo(other.isSetQueueSumDev());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -802,16 +750,16 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ActionStats(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ActionStats(");
     boolean first = true;
 
     sb.append("status:");
@@ -862,7 +810,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -872,13 +820,13 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
     }
   }
 
-  private static class ActionStatsStandardSchemeFactory implements SchemeFactory {
+  private static class ActionStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ActionStatsStandardScheme getScheme() {
       return new ActionStatsStandardScheme();
     }
   }
 
-  private static class ActionStatsStandardScheme extends StandardScheme<ActionStats> {
+  private static class ActionStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ActionStats> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ActionStats struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -999,18 +947,18 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
   }
 
-  private static class ActionStatsTupleSchemeFactory implements SchemeFactory {
+  private static class ActionStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ActionStatsTupleScheme getScheme() {
       return new ActionStatsTupleScheme();
     }
   }
 
-  private static class ActionStatsTupleScheme extends TupleScheme<ActionStats> {
+  private static class ActionStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ActionStats> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ActionStats struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetStatus()) {
         optionals.set(0);
       }
@@ -1064,8 +1012,8 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ActionStats struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(8);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         struct.status = iprot.readI32();
         struct.setStatusIsSet(true);
@@ -1101,5 +1049,9 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 


Mime
View raw message