http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
----------------------------------------------------------------------
diff --git 
a/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java 
b/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
index 1cfb946..d0111ec 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
@@ -16,63 +16,33 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.storm.generated;
 
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
[email protected](value = "Autogenerated by Thrift Compiler 
(0.11.0)")
 public class SupervisorAssignments implements 
org.apache.thrift.TBase<SupervisorAssignments, SupervisorAssignments._Fields>, 
java.io.Serializable, Cloneable, Comparable<SupervisorAssignments> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SupervisorAssignments");
 
   private static final org.apache.thrift.protocol.TField 
STORM_ASSIGNMENT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("storm_assignment", 
org.apache.thrift.protocol.TType.MAP, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
SupervisorAssignmentsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
SupervisorAssignmentsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new SupervisorAssignmentsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new SupervisorAssignmentsTupleSchemeFactory();
 
-  private Map<String,Assignment> storm_assignment; // optional
+  private java.util.Map<java.lang.String,Assignment> storm_assignment; // 
optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     STORM_ASSIGNMENT((short)1, "storm_assignment");
 
-    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);
       }
     }
@@ -95,21 +65,21 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
      */
     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;
     }
@@ -118,26 +88,26 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.STORM_ASSIGNMENT};
-  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.STORM_ASSIGNMENT, new 
org.apache.thrift.meta_data.FieldMetaData("storm_assignment", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
             new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 Assignment.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorAssignments.class,
 metaDataMap);
   }
 
   public SupervisorAssignments() {
-    this.storm_assignment = new HashMap<String,Assignment>();
+    this.storm_assignment = new 
java.util.HashMap<java.lang.String,Assignment>();
 
   }
 
@@ -146,13 +116,13 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
    */
   public SupervisorAssignments(SupervisorAssignments other) {
     if (other.is_set_storm_assignment()) {
-      Map<String,Assignment> __this__storm_assignment = new 
HashMap<String,Assignment>(other.storm_assignment.size());
-      for (Map.Entry<String, Assignment> other_element : 
other.storm_assignment.entrySet()) {
+      java.util.Map<java.lang.String,Assignment> __this__storm_assignment = 
new 
java.util.HashMap<java.lang.String,Assignment>(other.storm_assignment.size());
+      for (java.util.Map.Entry<java.lang.String, Assignment> other_element : 
other.storm_assignment.entrySet()) {
 
-        String other_element_key = other_element.getKey();
+        java.lang.String other_element_key = other_element.getKey();
         Assignment other_element_value = other_element.getValue();
 
-        String __this__storm_assignment_copy_key = other_element_key;
+        java.lang.String __this__storm_assignment_copy_key = other_element_key;
 
         Assignment __this__storm_assignment_copy_value = new 
Assignment(other_element_value);
 
@@ -168,7 +138,7 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
 
   @Override
   public void clear() {
-    this.storm_assignment = new HashMap<String,Assignment>();
+    this.storm_assignment = new 
java.util.HashMap<java.lang.String,Assignment>();
 
   }
 
@@ -176,18 +146,18 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
     return (this.storm_assignment == null) ? 0 : this.storm_assignment.size();
   }
 
-  public void put_to_storm_assignment(String key, Assignment val) {
+  public void put_to_storm_assignment(java.lang.String key, Assignment val) {
     if (this.storm_assignment == null) {
-      this.storm_assignment = new HashMap<String,Assignment>();
+      this.storm_assignment = new 
java.util.HashMap<java.lang.String,Assignment>();
     }
     this.storm_assignment.put(key, val);
   }
 
-  public Map<String,Assignment> get_storm_assignment() {
+  public java.util.Map<java.lang.String,Assignment> get_storm_assignment() {
     return this.storm_assignment;
   }
 
-  public void set_storm_assignment(Map<String,Assignment> storm_assignment) {
+  public void set_storm_assignment(java.util.Map<java.lang.String,Assignment> 
storm_assignment) {
     this.storm_assignment = storm_assignment;
   }
 
@@ -206,43 +176,43 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case STORM_ASSIGNMENT:
       if (value == null) {
         unset_storm_assignment();
       } else {
-        set_storm_assignment((Map<String,Assignment>)value);
+        
set_storm_assignment((java.util.Map<java.lang.String,Assignment>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STORM_ASSIGNMENT:
       return get_storm_assignment();
 
     }
-    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 STORM_ASSIGNMENT:
       return is_set_storm_assignment();
     }
-    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 SupervisorAssignments)
@@ -253,6 +223,8 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
   public boolean equals(SupervisorAssignments that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_storm_assignment = true && 
this.is_set_storm_assignment();
     boolean that_present_storm_assignment = true && 
that.is_set_storm_assignment();
@@ -268,14 +240,13 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_storm_assignment = true && (is_set_storm_assignment());
-    list.add(present_storm_assignment);
-    if (present_storm_assignment)
-      list.add(storm_assignment);
+    hashCode = hashCode * 8191 + ((is_set_storm_assignment()) ? 131071 : 
524287);
+    if (is_set_storm_assignment())
+      hashCode = hashCode * 8191 + storm_assignment.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -286,7 +257,7 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(is_set_storm_assignment()).compareTo(other.is_set_storm_assignment());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_storm_assignment()).compareTo(other.is_set_storm_assignment());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -304,16 +275,16 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
   }
 
   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("SupervisorAssignments(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("SupervisorAssignments(");
     boolean first = true;
 
     if (is_set_storm_assignment()) {
@@ -342,7 +313,7 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
     }
   }
 
-  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) {
@@ -350,13 +321,13 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
     }
   }
 
-  private static class SupervisorAssignmentsStandardSchemeFactory implements 
SchemeFactory {
+  private static class SupervisorAssignmentsStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SupervisorAssignmentsStandardScheme getScheme() {
       return new SupervisorAssignmentsStandardScheme();
     }
   }
 
-  private static class SupervisorAssignmentsStandardScheme extends 
StandardScheme<SupervisorAssignments> {
+  private static class SupervisorAssignmentsStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<SupervisorAssignments> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
SupervisorAssignments struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -372,8 +343,8 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map886 = iprot.readMapBegin();
-                struct.storm_assignment = new 
HashMap<String,Assignment>(2*_map886.size);
-                String _key887;
+                struct.storm_assignment = new 
java.util.HashMap<java.lang.String,Assignment>(2*_map886.size);
+                java.lang.String _key887;
                 Assignment _val888;
                 for (int _i889 = 0; _i889 < _map886.size; ++_i889)
                 {
@@ -407,7 +378,7 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
           oprot.writeFieldBegin(STORM_ASSIGNMENT_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, struct.storm_assignment.size()));
-            for (Map.Entry<String, Assignment> _iter890 : 
struct.storm_assignment.entrySet())
+            for (java.util.Map.Entry<java.lang.String, Assignment> _iter890 : 
struct.storm_assignment.entrySet())
             {
               oprot.writeString(_iter890.getKey());
               _iter890.getValue().write(oprot);
@@ -423,18 +394,18 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
 
   }
 
-  private static class SupervisorAssignmentsTupleSchemeFactory implements 
SchemeFactory {
+  private static class SupervisorAssignmentsTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SupervisorAssignmentsTupleScheme getScheme() {
       return new SupervisorAssignmentsTupleScheme();
     }
   }
 
-  private static class SupervisorAssignmentsTupleScheme extends 
TupleScheme<SupervisorAssignments> {
+  private static class SupervisorAssignmentsTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<SupervisorAssignments> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
SupervisorAssignments 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.is_set_storm_assignment()) {
         optionals.set(0);
       }
@@ -442,7 +413,7 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
       if (struct.is_set_storm_assignment()) {
         {
           oprot.writeI32(struct.storm_assignment.size());
-          for (Map.Entry<String, Assignment> _iter891 : 
struct.storm_assignment.entrySet())
+          for (java.util.Map.Entry<java.lang.String, Assignment> _iter891 : 
struct.storm_assignment.entrySet())
           {
             oprot.writeString(_iter891.getKey());
             _iter891.getValue().write(oprot);
@@ -453,13 +424,13 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
SupervisorAssignments 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)) {
         {
           org.apache.thrift.protocol.TMap _map892 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.storm_assignment = new 
HashMap<String,Assignment>(2*_map892.size);
-          String _key893;
+          struct.storm_assignment = new 
java.util.HashMap<java.lang.String,Assignment>(2*_map892.size);
+          java.lang.String _key893;
           Assignment _val894;
           for (int _i895 = 0; _i895 < _map892.size; ++_i895)
           {
@@ -474,5 +445,8 @@ public class SupervisorAssignments implements 
org.apache.thrift.TBase<Supervisor
     }
   }
 
+  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();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git 
a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java 
b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
index 6d2a051..3312601 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
@@ -16,90 +16,60 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.storm.generated;
 
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
[email protected](value = "Autogenerated by Thrift Compiler 
(0.11.0)")
 public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, 
SupervisorInfo._Fields>, java.io.Serializable, Cloneable, 
Comparable<SupervisorInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SupervisorInfo");
 
   private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("time_secs", 
org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = 
new org.apache.thrift.protocol.TField("hostname", 
org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField 
ASSIGNMENT_ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("assignment_id", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField 
SERVER_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("server_port", 
org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField USED_PORTS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("used_ports", 
org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField META_FIELD_DESC = new 
org.apache.thrift.protocol.TField("meta", 
org.apache.thrift.protocol.TType.LIST, (short)6);
-  private static final org.apache.thrift.protocol.TField 
SCHEDULER_META_FIELD_DESC = new 
org.apache.thrift.protocol.TField("scheduler_meta", 
org.apache.thrift.protocol.TType.MAP, (short)7);
-  private static final org.apache.thrift.protocol.TField 
UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", 
org.apache.thrift.protocol.TType.I64, (short)8);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.STRING, (short)9);
-  private static final org.apache.thrift.protocol.TField 
RESOURCES_MAP_FIELD_DESC = new 
org.apache.thrift.protocol.TField("resources_map", 
org.apache.thrift.protocol.TType.MAP, (short)10);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
SupervisorInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SupervisorInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.protocol.TField USED_PORTS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("used_ports", 
org.apache.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.thrift.protocol.TField META_FIELD_DESC = new 
org.apache.thrift.protocol.TField("meta", 
org.apache.thrift.protocol.TType.LIST, (short)5);
+  private static final org.apache.thrift.protocol.TField 
SCHEDULER_META_FIELD_DESC = new 
org.apache.thrift.protocol.TField("scheduler_meta", 
org.apache.thrift.protocol.TType.MAP, (short)6);
+  private static final org.apache.thrift.protocol.TField 
UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", 
org.apache.thrift.protocol.TType.I64, (short)7);
+  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField 
RESOURCES_MAP_FIELD_DESC = new 
org.apache.thrift.protocol.TField("resources_map", 
org.apache.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.thrift.protocol.TField 
SERVER_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("server_port", 
org.apache.thrift.protocol.TType.I32, (short)10);
+
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new SupervisorInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new SupervisorInfoTupleSchemeFactory();
 
   private long time_secs; // required
-  private String hostname; // required
-  private String assignment_id; // optional
-  private int server_port; // optional
-  private List<Long> used_ports; // optional
-  private List<Long> meta; // optional
-  private Map<String,String> scheduler_meta; // optional
+  private java.lang.String hostname; // required
+  private java.lang.String assignment_id; // optional
+  private java.util.List<java.lang.Long> used_ports; // optional
+  private java.util.List<java.lang.Long> meta; // optional
+  private java.util.Map<java.lang.String,java.lang.String> scheduler_meta; // 
optional
   private long uptime_secs; // optional
-  private String version; // optional
-  private Map<String,Double> resources_map; // optional
+  private java.lang.String version; // optional
+  private java.util.Map<java.lang.String,java.lang.Double> resources_map; // 
optional
+  private int server_port; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     TIME_SECS((short)1, "time_secs"),
     HOSTNAME((short)2, "hostname"),
     ASSIGNMENT_ID((short)3, "assignment_id"),
-    SERVER_PORT((short)4, "server_port"),
-    USED_PORTS((short)5, "used_ports"),
-    META((short)6, "meta"),
-    SCHEDULER_META((short)7, "scheduler_meta"),
-    UPTIME_SECS((short)8, "uptime_secs"),
-    VERSION((short)9, "version"),
-    RESOURCES_MAP((short)10, "resources_map");
+    USED_PORTS((short)4, "used_ports"),
+    META((short)5, "meta"),
+    SCHEDULER_META((short)6, "scheduler_meta"),
+    UPTIME_SECS((short)7, "uptime_secs"),
+    VERSION((short)8, "version"),
+    RESOURCES_MAP((short)9, "resources_map"),
+    SERVER_PORT((short)10, "server_port");
 
-    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);
       }
     }
@@ -115,20 +85,20 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
           return HOSTNAME;
         case 3: // ASSIGNMENT_ID
           return ASSIGNMENT_ID;
-        case 4: // SERVER_PORT
-          return SERVER_PORT;
-        case 5: // USED_PORTS
+        case 4: // USED_PORTS
           return USED_PORTS;
-        case 6: // META
+        case 5: // META
           return META;
-        case 7: // SCHEDULER_META
+        case 6: // SCHEDULER_META
           return SCHEDULER_META;
-        case 8: // UPTIME_SECS
+        case 7: // UPTIME_SECS
           return UPTIME_SECS;
-        case 9: // VERSION
+        case 8: // VERSION
           return VERSION;
-        case 10: // RESOURCES_MAP
+        case 9: // RESOURCES_MAP
           return RESOURCES_MAP;
+        case 10: // SERVER_PORT
+          return SERVER_PORT;
         default:
           return null;
       }
@@ -140,21 +110,21 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
      */
     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;
     }
@@ -163,28 +133,26 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final int __TIME_SECS_ISSET_ID = 0;
-  private static final int __SERVER_PORT_ISSET_ID = 1;
-  private static final int __UPTIME_SECS_ISSET_ID = 2;
+  private static final int __UPTIME_SECS_ISSET_ID = 1;
+  private static final int __SERVER_PORT_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = 
{_Fields.ASSIGNMENT_ID,_Fields.SERVER_PORT,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION,_Fields.RESOURCES_MAP};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
+  private static final _Fields optionals[] = 
{_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION,_Fields.RESOURCES_MAP,_Fields.SERVER_PORT};
+  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.TIME_SECS, new 
org.apache.thrift.meta_data.FieldMetaData("time_secs", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.HOSTNAME, new 
org.apache.thrift.meta_data.FieldMetaData("hostname", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ASSIGNMENT_ID, new 
org.apache.thrift.meta_data.FieldMetaData("assignment_id", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SERVER_PORT, new 
org.apache.thrift.meta_data.FieldMetaData("server_port", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.USED_PORTS, new 
org.apache.thrift.meta_data.FieldMetaData("used_ports", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
@@ -203,7 +171,9 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         new 
org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    tmpMap.put(_Fields.SERVER_PORT, new 
org.apache.thrift.meta_data.FieldMetaData("server_port", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorInfo.class,
 metaDataMap);
   }
 
@@ -212,7 +182,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
 
   public SupervisorInfo(
     long time_secs,
-    String hostname)
+    java.lang.String hostname)
   {
     this();
     this.time_secs = time_secs;
@@ -232,17 +202,16 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     if (other.is_set_assignment_id()) {
       this.assignment_id = other.assignment_id;
     }
-    this.server_port = other.server_port;
     if (other.is_set_used_ports()) {
-      List<Long> __this__used_ports = new ArrayList<Long>(other.used_ports);
+      java.util.List<java.lang.Long> __this__used_ports = new 
java.util.ArrayList<java.lang.Long>(other.used_ports);
       this.used_ports = __this__used_ports;
     }
     if (other.is_set_meta()) {
-      List<Long> __this__meta = new ArrayList<Long>(other.meta);
+      java.util.List<java.lang.Long> __this__meta = new 
java.util.ArrayList<java.lang.Long>(other.meta);
       this.meta = __this__meta;
     }
     if (other.is_set_scheduler_meta()) {
-      Map<String,String> __this__scheduler_meta = new 
HashMap<String,String>(other.scheduler_meta);
+      java.util.Map<java.lang.String,java.lang.String> __this__scheduler_meta 
= new 
java.util.HashMap<java.lang.String,java.lang.String>(other.scheduler_meta);
       this.scheduler_meta = __this__scheduler_meta;
     }
     this.uptime_secs = other.uptime_secs;
@@ -250,9 +219,10 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       this.version = other.version;
     }
     if (other.is_set_resources_map()) {
-      Map<String,Double> __this__resources_map = new 
HashMap<String,Double>(other.resources_map);
+      java.util.Map<java.lang.String,java.lang.Double> __this__resources_map = 
new java.util.HashMap<java.lang.String,java.lang.Double>(other.resources_map);
       this.resources_map = __this__resources_map;
     }
+    this.server_port = other.server_port;
   }
 
   public SupervisorInfo deepCopy() {
@@ -265,8 +235,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     this.time_secs = 0;
     this.hostname = null;
     this.assignment_id = null;
-    set_server_port_isSet(false);
-    this.server_port = 0;
     this.used_ports = null;
     this.meta = null;
     this.scheduler_meta = null;
@@ -274,6 +242,8 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     this.uptime_secs = 0;
     this.version = null;
     this.resources_map = null;
+    set_server_port_isSet(false);
+    this.server_port = 0;
   }
 
   public long get_time_secs() {
@@ -286,23 +256,23 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__TIME_SECS_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and 
false otherwise */
   public boolean is_set_time_secs() {
-    return EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, 
value);
   }
 
-  public String get_hostname() {
+  public java.lang.String get_hostname() {
     return this.hostname;
   }
 
-  public void set_hostname(String hostname) {
+  public void set_hostname(java.lang.String hostname) {
     this.hostname = hostname;
   }
 
@@ -321,11 +291,11 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  public String get_assignment_id() {
+  public java.lang.String get_assignment_id() {
     return this.assignment_id;
   }
 
-  public void set_assignment_id(String assignment_id) {
+  public void set_assignment_id(java.lang.String assignment_id) {
     this.assignment_id = assignment_id;
   }
 
@@ -344,48 +314,26 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  public int get_server_port() {
-    return this.server_port;
-  }
-
-  public void set_server_port(int server_port) {
-    this.server_port = server_port;
-    set_server_port_isSet(true);
-  }
-
-  public void unset_server_port() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__SERVER_PORT_ISSET_ID);
-  }
-
-  /** Returns true if field server_port is set (has been assigned a value) and 
false otherwise */
-  public boolean is_set_server_port() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVER_PORT_ISSET_ID);
-  }
-
-  public void set_server_port_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__SERVER_PORT_ISSET_ID, value);
-  }
-
   public int get_used_ports_size() {
     return (this.used_ports == null) ? 0 : this.used_ports.size();
   }
 
-  public java.util.Iterator<Long> get_used_ports_iterator() {
+  public java.util.Iterator<java.lang.Long> get_used_ports_iterator() {
     return (this.used_ports == null) ? null : this.used_ports.iterator();
   }
 
   public void add_to_used_ports(long elem) {
     if (this.used_ports == null) {
-      this.used_ports = new ArrayList<Long>();
+      this.used_ports = new java.util.ArrayList<java.lang.Long>();
     }
     this.used_ports.add(elem);
   }
 
-  public List<Long> get_used_ports() {
+  public java.util.List<java.lang.Long> get_used_ports() {
     return this.used_ports;
   }
 
-  public void set_used_ports(List<Long> used_ports) {
+  public void set_used_ports(java.util.List<java.lang.Long> used_ports) {
     this.used_ports = used_ports;
   }
 
@@ -408,22 +356,22 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     return (this.meta == null) ? 0 : this.meta.size();
   }
 
-  public java.util.Iterator<Long> get_meta_iterator() {
+  public java.util.Iterator<java.lang.Long> get_meta_iterator() {
     return (this.meta == null) ? null : this.meta.iterator();
   }
 
   public void add_to_meta(long elem) {
     if (this.meta == null) {
-      this.meta = new ArrayList<Long>();
+      this.meta = new java.util.ArrayList<java.lang.Long>();
     }
     this.meta.add(elem);
   }
 
-  public List<Long> get_meta() {
+  public java.util.List<java.lang.Long> get_meta() {
     return this.meta;
   }
 
-  public void set_meta(List<Long> meta) {
+  public void set_meta(java.util.List<java.lang.Long> meta) {
     this.meta = meta;
   }
 
@@ -446,18 +394,18 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     return (this.scheduler_meta == null) ? 0 : this.scheduler_meta.size();
   }
 
-  public void put_to_scheduler_meta(String key, String val) {
+  public void put_to_scheduler_meta(java.lang.String key, java.lang.String 
val) {
     if (this.scheduler_meta == null) {
-      this.scheduler_meta = new HashMap<String,String>();
+      this.scheduler_meta = new 
java.util.HashMap<java.lang.String,java.lang.String>();
     }
     this.scheduler_meta.put(key, val);
   }
 
-  public Map<String,String> get_scheduler_meta() {
+  public java.util.Map<java.lang.String,java.lang.String> get_scheduler_meta() 
{
     return this.scheduler_meta;
   }
 
-  public void set_scheduler_meta(Map<String,String> scheduler_meta) {
+  public void 
set_scheduler_meta(java.util.Map<java.lang.String,java.lang.String> 
scheduler_meta) {
     this.scheduler_meta = scheduler_meta;
   }
 
@@ -486,23 +434,23 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and 
false otherwise */
   public boolean is_set_uptime_secs() {
-    return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__UPTIME_SECS_ISSET_ID, value);
   }
 
-  public String get_version() {
+  public java.lang.String get_version() {
     return this.version;
   }
 
-  public void set_version(String version) {
+  public void set_version(java.lang.String version) {
     this.version = version;
   }
 
@@ -525,18 +473,18 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     return (this.resources_map == null) ? 0 : this.resources_map.size();
   }
 
-  public void put_to_resources_map(String key, double val) {
+  public void put_to_resources_map(java.lang.String key, double val) {
     if (this.resources_map == null) {
-      this.resources_map = new HashMap<String,Double>();
+      this.resources_map = new 
java.util.HashMap<java.lang.String,java.lang.Double>();
     }
     this.resources_map.put(key, val);
   }
 
-  public Map<String,Double> get_resources_map() {
+  public java.util.Map<java.lang.String,java.lang.Double> get_resources_map() {
     return this.resources_map;
   }
 
-  public void set_resources_map(Map<String,Double> resources_map) {
+  public void 
set_resources_map(java.util.Map<java.lang.String,java.lang.Double> 
resources_map) {
     this.resources_map = resources_map;
   }
 
@@ -555,13 +503,35 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public int get_server_port() {
+    return this.server_port;
+  }
+
+  public void set_server_port(int server_port) {
+    this.server_port = server_port;
+    set_server_port_isSet(true);
+  }
+
+  public void unset_server_port() {
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__SERVER_PORT_ISSET_ID);
+  }
+
+  /** Returns true if field server_port is set (has been assigned a value) and 
false otherwise */
+  public boolean is_set_server_port() {
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__SERVER_PORT_ISSET_ID);
+  }
+
+  public void set_server_port_isSet(boolean value) {
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__SERVER_PORT_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case TIME_SECS:
       if (value == null) {
         unset_time_secs();
       } else {
-        set_time_secs((Long)value);
+        set_time_secs((java.lang.Long)value);
       }
       break;
 
@@ -569,7 +539,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_hostname();
       } else {
-        set_hostname((String)value);
+        set_hostname((java.lang.String)value);
       }
       break;
 
@@ -577,15 +547,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_assignment_id();
       } else {
-        set_assignment_id((String)value);
-      }
-      break;
-
-    case SERVER_PORT:
-      if (value == null) {
-        unset_server_port();
-      } else {
-        set_server_port((Integer)value);
+        set_assignment_id((java.lang.String)value);
       }
       break;
 
@@ -593,7 +555,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_used_ports();
       } else {
-        set_used_ports((List<Long>)value);
+        set_used_ports((java.util.List<java.lang.Long>)value);
       }
       break;
 
@@ -601,7 +563,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_meta();
       } else {
-        set_meta((List<Long>)value);
+        set_meta((java.util.List<java.lang.Long>)value);
       }
       break;
 
@@ -609,7 +571,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_scheduler_meta();
       } else {
-        set_scheduler_meta((Map<String,String>)value);
+        
set_scheduler_meta((java.util.Map<java.lang.String,java.lang.String>)value);
       }
       break;
 
@@ -617,7 +579,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_uptime_secs();
       } else {
-        set_uptime_secs((Long)value);
+        set_uptime_secs((java.lang.Long)value);
       }
       break;
 
@@ -625,7 +587,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_version();
       } else {
-        set_version((String)value);
+        set_version((java.lang.String)value);
       }
       break;
 
@@ -633,14 +595,22 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (value == null) {
         unset_resources_map();
       } else {
-        set_resources_map((Map<String,Double>)value);
+        
set_resources_map((java.util.Map<java.lang.String,java.lang.Double>)value);
+      }
+      break;
+
+    case SERVER_PORT:
+      if (value == null) {
+        unset_server_port();
+      } else {
+        set_server_port((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TIME_SECS:
       return get_time_secs();
@@ -651,9 +621,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     case ASSIGNMENT_ID:
       return get_assignment_id();
 
-    case SERVER_PORT:
-      return get_server_port();
-
     case USED_PORTS:
       return get_used_ports();
 
@@ -672,14 +639,17 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     case RESOURCES_MAP:
       return get_resources_map();
 
+    case SERVER_PORT:
+      return get_server_port();
+
     }
-    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) {
@@ -689,8 +659,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       return is_set_hostname();
     case ASSIGNMENT_ID:
       return is_set_assignment_id();
-    case SERVER_PORT:
-      return is_set_server_port();
     case USED_PORTS:
       return is_set_used_ports();
     case META:
@@ -703,12 +671,14 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       return is_set_version();
     case RESOURCES_MAP:
       return is_set_resources_map();
+    case SERVER_PORT:
+      return is_set_server_port();
     }
-    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 SupervisorInfo)
@@ -719,6 +689,8 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
   public boolean equals(SupervisorInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_time_secs = true;
     boolean that_present_time_secs = true;
@@ -747,15 +719,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return false;
     }
 
-    boolean this_present_server_port = true && this.is_set_server_port();
-    boolean that_present_server_port = true && that.is_set_server_port();
-    if (this_present_server_port || that_present_server_port) {
-      if (!(this_present_server_port && that_present_server_port))
-        return false;
-      if (this.server_port != that.server_port)
-        return false;
-    }
-
     boolean this_present_used_ports = true && this.is_set_used_ports();
     boolean that_present_used_ports = true && that.is_set_used_ports();
     if (this_present_used_ports || that_present_used_ports) {
@@ -810,64 +773,61 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return false;
     }
 
+    boolean this_present_server_port = true && this.is_set_server_port();
+    boolean that_present_server_port = true && that.is_set_server_port();
+    if (this_present_server_port || that_present_server_port) {
+      if (!(this_present_server_port && that_present_server_port))
+        return false;
+      if (this.server_port != that.server_port)
+        return false;
+    }
+
     return true;
   }
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_time_secs = true;
-    list.add(present_time_secs);
-    if (present_time_secs)
-      list.add(time_secs);
+    hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(time_secs);
 
-    boolean present_hostname = true && (is_set_hostname());
-    list.add(present_hostname);
-    if (present_hostname)
-      list.add(hostname);
+    hashCode = hashCode * 8191 + ((is_set_hostname()) ? 131071 : 524287);
+    if (is_set_hostname())
+      hashCode = hashCode * 8191 + hostname.hashCode();
 
-    boolean present_assignment_id = true && (is_set_assignment_id());
-    list.add(present_assignment_id);
-    if (present_assignment_id)
-      list.add(assignment_id);
+    hashCode = hashCode * 8191 + ((is_set_assignment_id()) ? 131071 : 524287);
+    if (is_set_assignment_id())
+      hashCode = hashCode * 8191 + assignment_id.hashCode();
 
-    boolean present_server_port = true && (is_set_server_port());
-    list.add(present_server_port);
-    if (present_server_port)
-      list.add(server_port);
+    hashCode = hashCode * 8191 + ((is_set_used_ports()) ? 131071 : 524287);
+    if (is_set_used_ports())
+      hashCode = hashCode * 8191 + used_ports.hashCode();
 
-    boolean present_used_ports = true && (is_set_used_ports());
-    list.add(present_used_ports);
-    if (present_used_ports)
-      list.add(used_ports);
+    hashCode = hashCode * 8191 + ((is_set_meta()) ? 131071 : 524287);
+    if (is_set_meta())
+      hashCode = hashCode * 8191 + meta.hashCode();
 
-    boolean present_meta = true && (is_set_meta());
-    list.add(present_meta);
-    if (present_meta)
-      list.add(meta);
+    hashCode = hashCode * 8191 + ((is_set_scheduler_meta()) ? 131071 : 524287);
+    if (is_set_scheduler_meta())
+      hashCode = hashCode * 8191 + scheduler_meta.hashCode();
 
-    boolean present_scheduler_meta = true && (is_set_scheduler_meta());
-    list.add(present_scheduler_meta);
-    if (present_scheduler_meta)
-      list.add(scheduler_meta);
+    hashCode = hashCode * 8191 + ((is_set_uptime_secs()) ? 131071 : 524287);
+    if (is_set_uptime_secs())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(uptime_secs);
 
-    boolean present_uptime_secs = true && (is_set_uptime_secs());
-    list.add(present_uptime_secs);
-    if (present_uptime_secs)
-      list.add(uptime_secs);
+    hashCode = hashCode * 8191 + ((is_set_version()) ? 131071 : 524287);
+    if (is_set_version())
+      hashCode = hashCode * 8191 + version.hashCode();
 
-    boolean present_version = true && (is_set_version());
-    list.add(present_version);
-    if (present_version)
-      list.add(version);
+    hashCode = hashCode * 8191 + ((is_set_resources_map()) ? 131071 : 524287);
+    if (is_set_resources_map())
+      hashCode = hashCode * 8191 + resources_map.hashCode();
 
-    boolean present_resources_map = true && (is_set_resources_map());
-    list.add(present_resources_map);
-    if (present_resources_map)
-      list.add(resources_map);
+    hashCode = hashCode * 8191 + ((is_set_server_port()) ? 131071 : 524287);
+    if (is_set_server_port())
+      hashCode = hashCode * 8191 + server_port;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -878,7 +838,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -888,7 +848,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_hostname()).compareTo(other.is_set_hostname());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_hostname()).compareTo(other.is_set_hostname());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -898,7 +858,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_assignment_id()).compareTo(other.is_set_assignment_id());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_assignment_id()).compareTo(other.is_set_assignment_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -908,17 +868,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_server_port()).compareTo(other.is_set_server_port());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (is_set_server_port()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.server_port, other.server_port);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(is_set_used_ports()).compareTo(other.is_set_used_ports());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_used_ports()).compareTo(other.is_set_used_ports());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -928,7 +878,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_meta()).compareTo(other.is_set_meta());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_meta()).compareTo(other.is_set_meta());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -938,7 +888,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_scheduler_meta()).compareTo(other.is_set_scheduler_meta());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_scheduler_meta()).compareTo(other.is_set_scheduler_meta());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -948,7 +898,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -958,7 +908,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -968,7 +918,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -978,6 +928,16 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         return lastComparison;
       }
     }
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_server_port()).compareTo(other.is_set_server_port());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (is_set_server_port()) {
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.server_port, other.server_port);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -986,16 +946,16 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   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("SupervisorInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("SupervisorInfo(");
     boolean first = true;
 
     sb.append("time_secs:");
@@ -1019,12 +979,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       }
       first = false;
     }
-    if (is_set_server_port()) {
-      if (!first) sb.append(", ");
-      sb.append("server_port:");
-      sb.append(this.server_port);
-      first = false;
-    }
     if (is_set_used_ports()) {
       if (!first) sb.append(", ");
       sb.append("used_ports:");
@@ -1081,6 +1035,12 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       }
       first = false;
     }
+    if (is_set_server_port()) {
+      if (!first) sb.append(", ");
+      sb.append("server_port:");
+      sb.append(this.server_port);
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -1106,7 +1066,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  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;
@@ -1116,13 +1076,13 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  private static class SupervisorInfoStandardSchemeFactory implements 
SchemeFactory {
+  private static class SupervisorInfoStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SupervisorInfoStandardScheme getScheme() {
       return new SupervisorInfoStandardScheme();
     }
   }
 
-  private static class SupervisorInfoStandardScheme extends 
StandardScheme<SupervisorInfo> {
+  private static class SupervisorInfoStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<SupervisorInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
SupervisorInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1158,19 +1118,11 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 4: // SERVER_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.server_port = iprot.readI32();
-              struct.set_server_port_isSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 5: // USED_PORTS
+          case 4: // USED_PORTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list622 = 
iprot.readListBegin();
-                struct.used_ports = new ArrayList<Long>(_list622.size);
+                struct.used_ports = new 
java.util.ArrayList<java.lang.Long>(_list622.size);
                 long _elem623;
                 for (int _i624 = 0; _i624 < _list622.size; ++_i624)
                 {
@@ -1184,11 +1136,11 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 6: // META
+          case 5: // META
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list625 = 
iprot.readListBegin();
-                struct.meta = new ArrayList<Long>(_list625.size);
+                struct.meta = new 
java.util.ArrayList<java.lang.Long>(_list625.size);
                 long _elem626;
                 for (int _i627 = 0; _i627 < _list625.size; ++_i627)
                 {
@@ -1202,13 +1154,13 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 7: // SCHEDULER_META
+          case 6: // SCHEDULER_META
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map628 = iprot.readMapBegin();
-                struct.scheduler_meta = new 
HashMap<String,String>(2*_map628.size);
-                String _key629;
-                String _val630;
+                struct.scheduler_meta = new 
java.util.HashMap<java.lang.String,java.lang.String>(2*_map628.size);
+                java.lang.String _key629;
+                java.lang.String _val630;
                 for (int _i631 = 0; _i631 < _map628.size; ++_i631)
                 {
                   _key629 = iprot.readString();
@@ -1222,7 +1174,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 8: // UPTIME_SECS
+          case 7: // UPTIME_SECS
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.uptime_secs = iprot.readI64();
               struct.set_uptime_secs_isSet(true);
@@ -1230,7 +1182,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 9: // VERSION
+          case 8: // VERSION
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.version = iprot.readString();
               struct.set_version_isSet(true);
@@ -1238,12 +1190,12 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 10: // RESOURCES_MAP
+          case 9: // RESOURCES_MAP
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map632 = iprot.readMapBegin();
-                struct.resources_map = new 
HashMap<String,Double>(2*_map632.size);
-                String _key633;
+                struct.resources_map = new 
java.util.HashMap<java.lang.String,java.lang.Double>(2*_map632.size);
+                java.lang.String _key633;
                 double _val634;
                 for (int _i635 = 0; _i635 < _map632.size; ++_i635)
                 {
@@ -1258,6 +1210,14 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
+          case 10: // SERVER_PORT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.server_port = iprot.readI32();
+              struct.set_server_port_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
         }
@@ -1286,11 +1246,6 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
           oprot.writeFieldEnd();
         }
       }
-      if (struct.is_set_server_port()) {
-        oprot.writeFieldBegin(SERVER_PORT_FIELD_DESC);
-        oprot.writeI32(struct.server_port);
-        oprot.writeFieldEnd();
-      }
       if (struct.used_ports != null) {
         if (struct.is_set_used_ports()) {
           oprot.writeFieldBegin(USED_PORTS_FIELD_DESC);
@@ -1324,7 +1279,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
           oprot.writeFieldBegin(SCHEDULER_META_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, struct.scheduler_meta.size()));
-            for (Map.Entry<String, String> _iter638 : 
struct.scheduler_meta.entrySet())
+            for (java.util.Map.Entry<java.lang.String, java.lang.String> 
_iter638 : struct.scheduler_meta.entrySet())
             {
               oprot.writeString(_iter638.getKey());
               oprot.writeString(_iter638.getValue());
@@ -1351,7 +1306,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
           oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
-            for (Map.Entry<String, Double> _iter639 : 
struct.resources_map.entrySet())
+            for (java.util.Map.Entry<java.lang.String, java.lang.Double> 
_iter639 : struct.resources_map.entrySet())
             {
               oprot.writeString(_iter639.getKey());
               oprot.writeDouble(_iter639.getValue());
@@ -1361,57 +1316,59 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
           oprot.writeFieldEnd();
         }
       }
+      if (struct.is_set_server_port()) {
+        oprot.writeFieldBegin(SERVER_PORT_FIELD_DESC);
+        oprot.writeI32(struct.server_port);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
   }
 
-  private static class SupervisorInfoTupleSchemeFactory implements 
SchemeFactory {
+  private static class SupervisorInfoTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SupervisorInfoTupleScheme getScheme() {
       return new SupervisorInfoTupleScheme();
     }
   }
 
-  private static class SupervisorInfoTupleScheme extends 
TupleScheme<SupervisorInfo> {
+  private static class SupervisorInfoTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<SupervisorInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
SupervisorInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI64(struct.time_secs);
       oprot.writeString(struct.hostname);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_assignment_id()) {
         optionals.set(0);
       }
-      if (struct.is_set_server_port()) {
+      if (struct.is_set_used_ports()) {
         optionals.set(1);
       }
-      if (struct.is_set_used_ports()) {
+      if (struct.is_set_meta()) {
         optionals.set(2);
       }
-      if (struct.is_set_meta()) {
+      if (struct.is_set_scheduler_meta()) {
         optionals.set(3);
       }
-      if (struct.is_set_scheduler_meta()) {
+      if (struct.is_set_uptime_secs()) {
         optionals.set(4);
       }
-      if (struct.is_set_uptime_secs()) {
+      if (struct.is_set_version()) {
         optionals.set(5);
       }
-      if (struct.is_set_version()) {
+      if (struct.is_set_resources_map()) {
         optionals.set(6);
       }
-      if (struct.is_set_resources_map()) {
+      if (struct.is_set_server_port()) {
         optionals.set(7);
       }
       oprot.writeBitSet(optionals, 8);
       if (struct.is_set_assignment_id()) {
         oprot.writeString(struct.assignment_id);
       }
-      if (struct.is_set_server_port()) {
-        oprot.writeI32(struct.server_port);
-      }
       if (struct.is_set_used_ports()) {
         {
           oprot.writeI32(struct.used_ports.size());
@@ -1433,7 +1390,7 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (struct.is_set_scheduler_meta()) {
         {
           oprot.writeI32(struct.scheduler_meta.size());
-          for (Map.Entry<String, String> _iter642 : 
struct.scheduler_meta.entrySet())
+          for (java.util.Map.Entry<java.lang.String, java.lang.String> 
_iter642 : struct.scheduler_meta.entrySet())
           {
             oprot.writeString(_iter642.getKey());
             oprot.writeString(_iter642.getValue());
@@ -1449,35 +1406,34 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
       if (struct.is_set_resources_map()) {
         {
           oprot.writeI32(struct.resources_map.size());
-          for (Map.Entry<String, Double> _iter643 : 
struct.resources_map.entrySet())
+          for (java.util.Map.Entry<java.lang.String, java.lang.Double> 
_iter643 : struct.resources_map.entrySet())
           {
             oprot.writeString(_iter643.getKey());
             oprot.writeDouble(_iter643.getValue());
           }
         }
       }
+      if (struct.is_set_server_port()) {
+        oprot.writeI32(struct.server_port);
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.time_secs = iprot.readI64();
       struct.set_time_secs_isSet(true);
       struct.hostname = iprot.readString();
       struct.set_hostname_isSet(true);
-      BitSet incoming = iprot.readBitSet(8);
+      java.util.BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         struct.assignment_id = iprot.readString();
         struct.set_assignment_id_isSet(true);
       }
       if (incoming.get(1)) {
-        struct.server_port = iprot.readI32();
-        struct.set_server_port_isSet(true);
-      }
-      if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list644 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, 
iprot.readI32());
-          struct.used_ports = new ArrayList<Long>(_list644.size);
+          struct.used_ports = new 
java.util.ArrayList<java.lang.Long>(_list644.size);
           long _elem645;
           for (int _i646 = 0; _i646 < _list644.size; ++_i646)
           {
@@ -1487,10 +1443,10 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         }
         struct.set_used_ports_isSet(true);
       }
-      if (incoming.get(3)) {
+      if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list647 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, 
iprot.readI32());
-          struct.meta = new ArrayList<Long>(_list647.size);
+          struct.meta = new java.util.ArrayList<java.lang.Long>(_list647.size);
           long _elem648;
           for (int _i649 = 0; _i649 < _list647.size; ++_i649)
           {
@@ -1500,12 +1456,12 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         }
         struct.set_meta_isSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(3)) {
         {
           org.apache.thrift.protocol.TMap _map650 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.scheduler_meta = new HashMap<String,String>(2*_map650.size);
-          String _key651;
-          String _val652;
+          struct.scheduler_meta = new 
java.util.HashMap<java.lang.String,java.lang.String>(2*_map650.size);
+          java.lang.String _key651;
+          java.lang.String _val652;
           for (int _i653 = 0; _i653 < _map650.size; ++_i653)
           {
             _key651 = iprot.readString();
@@ -1515,19 +1471,19 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         }
         struct.set_scheduler_meta_isSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(4)) {
         struct.uptime_secs = iprot.readI64();
         struct.set_uptime_secs_isSet(true);
       }
-      if (incoming.get(6)) {
+      if (incoming.get(5)) {
         struct.version = iprot.readString();
         struct.set_version_isSet(true);
       }
-      if (incoming.get(7)) {
+      if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TMap _map654 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
-          struct.resources_map = new HashMap<String,Double>(2*_map654.size);
-          String _key655;
+          struct.resources_map = new 
java.util.HashMap<java.lang.String,java.lang.Double>(2*_map654.size);
+          java.lang.String _key655;
           double _val656;
           for (int _i657 = 0; _i657 < _map654.size; ++_i657)
           {
@@ -1538,8 +1494,15 @@ public class SupervisorInfo implements 
org.apache.thrift.TBase<SupervisorInfo, S
         }
         struct.set_resources_map_isSet(true);
       }
+      if (incoming.get(7)) {
+        struct.server_port = iprot.readI32();
+        struct.set_server_port_isSet(true);
+      }
     }
   }
 
+  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();
+  }
 }
 

Reply via email to