You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/05/23 20:03:38 UTC

[08/43] storm git commit: STORM-3061: thrift 0.11

http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java b/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
index 48ed73c..19eccfd 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
@@ -16,42 +16,15 @@
  * 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"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary");
 
@@ -74,23 +47,20 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525);
   private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TopologySummaryStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TopologySummaryTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologySummaryStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologySummaryTupleSchemeFactory();
 
-  private String id; // required
-  private String name; // required
+  private java.lang.String id; // required
+  private java.lang.String name; // required
   private int num_tasks; // required
   private int num_executors; // required
   private int num_workers; // required
   private int uptime_secs; // required
-  private String status; // required
-  private String storm_version; // optional
-  private String topology_version; // optional
-  private String sched_status; // optional
-  private String owner; // optional
+  private java.lang.String status; // required
+  private java.lang.String storm_version; // optional
+  private java.lang.String topology_version; // optional
+  private java.lang.String sched_status; // optional
+  private java.lang.String owner; // optional
   private int replication_count; // optional
   private double requested_memonheap; // optional
   private double requested_memoffheap; // optional
@@ -120,10 +90,10 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     ASSIGNED_MEMOFFHEAP((short)525, "assigned_memoffheap"),
     ASSIGNED_CPU((short)526, "assigned_cpu");
 
-    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);
       }
     }
@@ -180,21 +150,21 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
      */
     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;
     }
@@ -203,7 +173,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -222,9 +192,9 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   private static final int __ASSIGNED_CPU_ISSET_ID = 10;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.STORM_VERSION,_Fields.TOPOLOGY_VERSION,_Fields.SCHED_STATUS,_Fields.OWNER,_Fields.REPLICATION_COUNT,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU};
-  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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -261,7 +231,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         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(TopologySummary.class, metaDataMap);
   }
 
@@ -269,13 +239,13 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public TopologySummary(
-    String id,
-    String name,
+    java.lang.String id,
+    java.lang.String name,
     int num_tasks,
     int num_executors,
     int num_workers,
     int uptime_secs,
-    String status)
+    java.lang.String status)
   {
     this();
     this.id = id;
@@ -367,11 +337,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     this.assigned_cpu = 0.0;
   }
 
-  public String get_id() {
+  public java.lang.String get_id() {
     return this.id;
   }
 
-  public void set_id(String id) {
+  public void set_id(java.lang.String id) {
     this.id = id;
   }
 
@@ -390,11 +360,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  public String get_name() {
+  public java.lang.String get_name() {
     return this.name;
   }
 
-  public void set_name(String name) {
+  public void set_name(java.lang.String name) {
     this.name = name;
   }
 
@@ -423,16 +393,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_tasks() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_tasks() {
-    return EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   public void set_num_tasks_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
   }
 
   public int get_num_executors() {
@@ -445,16 +415,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_num_workers() {
@@ -467,16 +437,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -489,23 +459,23 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   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_status() {
+  public java.lang.String get_status() {
     return this.status;
   }
 
-  public void set_status(String status) {
+  public void set_status(java.lang.String status) {
     this.status = status;
   }
 
@@ -524,11 +494,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  public String get_storm_version() {
+  public java.lang.String get_storm_version() {
     return this.storm_version;
   }
 
-  public void set_storm_version(String storm_version) {
+  public void set_storm_version(java.lang.String storm_version) {
     this.storm_version = storm_version;
   }
 
@@ -547,11 +517,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  public String get_topology_version() {
+  public java.lang.String get_topology_version() {
     return this.topology_version;
   }
 
-  public void set_topology_version(String topology_version) {
+  public void set_topology_version(java.lang.String topology_version) {
     this.topology_version = topology_version;
   }
 
@@ -570,11 +540,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  public String get_sched_status() {
+  public java.lang.String get_sched_status() {
     return this.sched_status;
   }
 
-  public void set_sched_status(String sched_status) {
+  public void set_sched_status(java.lang.String sched_status) {
     this.sched_status = sched_status;
   }
 
@@ -593,11 +563,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  public String get_owner() {
+  public java.lang.String get_owner() {
     return this.owner;
   }
 
-  public void set_owner(String owner) {
+  public void set_owner(java.lang.String owner) {
     this.owner = owner;
   }
 
@@ -626,16 +596,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_replication_count() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   /** Returns true if field replication_count is set (has been assigned a value) and false otherwise */
   public boolean is_set_replication_count() {
-    return EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   public void set_replication_count_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
   }
 
   public double get_requested_memonheap() {
@@ -648,16 +618,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_memonheap() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memonheap() {
-    return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_requested_memonheap_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_requested_memoffheap() {
@@ -670,16 +640,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_memoffheap() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memoffheap() {
-    return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_requested_memoffheap_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -692,16 +662,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_memonheap() {
@@ -714,16 +684,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_memonheap() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memonheap() {
-    return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_assigned_memonheap_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_memoffheap() {
@@ -736,16 +706,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_memoffheap() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memoffheap() {
-    return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_assigned_memoffheap_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_cpu() {
@@ -758,25 +728,25 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_cpu() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_cpu() {
-    return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   public void set_assigned_cpu_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case ID:
       if (value == null) {
         unset_id();
       } else {
-        set_id((String)value);
+        set_id((java.lang.String)value);
       }
       break;
 
@@ -784,7 +754,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_name();
       } else {
-        set_name((String)value);
+        set_name((java.lang.String)value);
       }
       break;
 
@@ -792,7 +762,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_num_tasks();
       } else {
-        set_num_tasks((Integer)value);
+        set_num_tasks((java.lang.Integer)value);
       }
       break;
 
@@ -800,7 +770,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_num_executors();
       } else {
-        set_num_executors((Integer)value);
+        set_num_executors((java.lang.Integer)value);
       }
       break;
 
@@ -808,7 +778,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_num_workers();
       } else {
-        set_num_workers((Integer)value);
+        set_num_workers((java.lang.Integer)value);
       }
       break;
 
@@ -816,7 +786,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_uptime_secs();
       } else {
-        set_uptime_secs((Integer)value);
+        set_uptime_secs((java.lang.Integer)value);
       }
       break;
 
@@ -824,7 +794,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_status();
       } else {
-        set_status((String)value);
+        set_status((java.lang.String)value);
       }
       break;
 
@@ -832,7 +802,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_storm_version();
       } else {
-        set_storm_version((String)value);
+        set_storm_version((java.lang.String)value);
       }
       break;
 
@@ -840,7 +810,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_topology_version();
       } else {
-        set_topology_version((String)value);
+        set_topology_version((java.lang.String)value);
       }
       break;
 
@@ -848,7 +818,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_sched_status();
       } else {
-        set_sched_status((String)value);
+        set_sched_status((java.lang.String)value);
       }
       break;
 
@@ -856,7 +826,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_owner();
       } else {
-        set_owner((String)value);
+        set_owner((java.lang.String)value);
       }
       break;
 
@@ -864,7 +834,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_replication_count();
       } else {
-        set_replication_count((Integer)value);
+        set_replication_count((java.lang.Integer)value);
       }
       break;
 
@@ -872,7 +842,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_requested_memonheap();
       } else {
-        set_requested_memonheap((Double)value);
+        set_requested_memonheap((java.lang.Double)value);
       }
       break;
 
@@ -880,7 +850,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_requested_memoffheap();
       } else {
-        set_requested_memoffheap((Double)value);
+        set_requested_memoffheap((java.lang.Double)value);
       }
       break;
 
@@ -888,7 +858,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_requested_cpu();
       } else {
-        set_requested_cpu((Double)value);
+        set_requested_cpu((java.lang.Double)value);
       }
       break;
 
@@ -896,7 +866,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_assigned_memonheap();
       } else {
-        set_assigned_memonheap((Double)value);
+        set_assigned_memonheap((java.lang.Double)value);
       }
       break;
 
@@ -904,7 +874,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_assigned_memoffheap();
       } else {
-        set_assigned_memoffheap((Double)value);
+        set_assigned_memoffheap((java.lang.Double)value);
       }
       break;
 
@@ -912,14 +882,14 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       if (value == null) {
         unset_assigned_cpu();
       } else {
-        set_assigned_cpu((Double)value);
+        set_assigned_cpu((java.lang.Double)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
       return get_id();
@@ -976,13 +946,13 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return get_assigned_cpu();
 
     }
-    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) {
@@ -1023,11 +993,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     case ASSIGNED_CPU:
       return is_set_assigned_cpu();
     }
-    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 TopologySummary)
@@ -1038,6 +1008,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   public boolean equals(TopologySummary that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_id = true && this.is_set_id();
     boolean that_present_id = true && that.is_set_id();
@@ -1206,99 +1178,73 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_id = true && (is_set_id());
-    list.add(present_id);
-    if (present_id)
-      list.add(id);
-
-    boolean present_name = true && (is_set_name());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
-
-    boolean present_num_tasks = true;
-    list.add(present_num_tasks);
-    if (present_num_tasks)
-      list.add(num_tasks);
-
-    boolean present_num_executors = true;
-    list.add(present_num_executors);
-    if (present_num_executors)
-      list.add(num_executors);
-
-    boolean present_num_workers = true;
-    list.add(present_num_workers);
-    if (present_num_workers)
-      list.add(num_workers);
-
-    boolean present_uptime_secs = true;
-    list.add(present_uptime_secs);
-    if (present_uptime_secs)
-      list.add(uptime_secs);
-
-    boolean present_status = true && (is_set_status());
-    list.add(present_status);
-    if (present_status)
-      list.add(status);
-
-    boolean present_storm_version = true && (is_set_storm_version());
-    list.add(present_storm_version);
-    if (present_storm_version)
-      list.add(storm_version);
-
-    boolean present_topology_version = true && (is_set_topology_version());
-    list.add(present_topology_version);
-    if (present_topology_version)
-      list.add(topology_version);
-
-    boolean present_sched_status = true && (is_set_sched_status());
-    list.add(present_sched_status);
-    if (present_sched_status)
-      list.add(sched_status);
-
-    boolean present_owner = true && (is_set_owner());
-    list.add(present_owner);
-    if (present_owner)
-      list.add(owner);
-
-    boolean present_replication_count = true && (is_set_replication_count());
-    list.add(present_replication_count);
-    if (present_replication_count)
-      list.add(replication_count);
-
-    boolean present_requested_memonheap = true && (is_set_requested_memonheap());
-    list.add(present_requested_memonheap);
-    if (present_requested_memonheap)
-      list.add(requested_memonheap);
-
-    boolean present_requested_memoffheap = true && (is_set_requested_memoffheap());
-    list.add(present_requested_memoffheap);
-    if (present_requested_memoffheap)
-      list.add(requested_memoffheap);
-
-    boolean present_requested_cpu = true && (is_set_requested_cpu());
-    list.add(present_requested_cpu);
-    if (present_requested_cpu)
-      list.add(requested_cpu);
-
-    boolean present_assigned_memonheap = true && (is_set_assigned_memonheap());
-    list.add(present_assigned_memonheap);
-    if (present_assigned_memonheap)
-      list.add(assigned_memonheap);
-
-    boolean present_assigned_memoffheap = true && (is_set_assigned_memoffheap());
-    list.add(present_assigned_memoffheap);
-    if (present_assigned_memoffheap)
-      list.add(assigned_memoffheap);
-
-    boolean present_assigned_cpu = true && (is_set_assigned_cpu());
-    list.add(present_assigned_cpu);
-    if (present_assigned_cpu)
-      list.add(assigned_cpu);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((is_set_id()) ? 131071 : 524287);
+    if (is_set_id())
+      hashCode = hashCode * 8191 + id.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_name()) ? 131071 : 524287);
+    if (is_set_name())
+      hashCode = hashCode * 8191 + name.hashCode();
+
+    hashCode = hashCode * 8191 + num_tasks;
+
+    hashCode = hashCode * 8191 + num_executors;
+
+    hashCode = hashCode * 8191 + num_workers;
+
+    hashCode = hashCode * 8191 + uptime_secs;
+
+    hashCode = hashCode * 8191 + ((is_set_status()) ? 131071 : 524287);
+    if (is_set_status())
+      hashCode = hashCode * 8191 + status.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_storm_version()) ? 131071 : 524287);
+    if (is_set_storm_version())
+      hashCode = hashCode * 8191 + storm_version.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_topology_version()) ? 131071 : 524287);
+    if (is_set_topology_version())
+      hashCode = hashCode * 8191 + topology_version.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_sched_status()) ? 131071 : 524287);
+    if (is_set_sched_status())
+      hashCode = hashCode * 8191 + sched_status.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_owner()) ? 131071 : 524287);
+    if (is_set_owner())
+      hashCode = hashCode * 8191 + owner.hashCode();
+
+    hashCode = hashCode * 8191 + ((is_set_replication_count()) ? 131071 : 524287);
+    if (is_set_replication_count())
+      hashCode = hashCode * 8191 + replication_count;
+
+    hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287);
+    if (is_set_requested_memonheap())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap);
+
+    hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287);
+    if (is_set_requested_memoffheap())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap);
+
+    hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
+    if (is_set_requested_cpu())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+
+    hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287);
+    if (is_set_assigned_memonheap())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap);
+
+    hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287);
+    if (is_set_assigned_memoffheap())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap);
+
+    hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287);
+    if (is_set_assigned_cpu())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu);
+
+    return hashCode;
   }
 
   @Override
@@ -1309,7 +1255,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+    lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1319,7 +1265,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_name()).compareTo(other.is_set_name());
+    lastComparison = java.lang.Boolean.valueOf(is_set_name()).compareTo(other.is_set_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1329,7 +1275,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks());
+    lastComparison = java.lang.Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1339,7 +1285,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
+    lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1349,7 +1295,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers());
+    lastComparison = java.lang.Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1359,7 +1305,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         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;
     }
@@ -1369,7 +1315,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_status()).compareTo(other.is_set_status());
+    lastComparison = java.lang.Boolean.valueOf(is_set_status()).compareTo(other.is_set_status());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1379,7 +1325,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_storm_version()).compareTo(other.is_set_storm_version());
+    lastComparison = java.lang.Boolean.valueOf(is_set_storm_version()).compareTo(other.is_set_storm_version());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1389,7 +1335,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_topology_version()).compareTo(other.is_set_topology_version());
+    lastComparison = java.lang.Boolean.valueOf(is_set_topology_version()).compareTo(other.is_set_topology_version());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1399,7 +1345,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_sched_status()).compareTo(other.is_set_sched_status());
+    lastComparison = java.lang.Boolean.valueOf(is_set_sched_status()).compareTo(other.is_set_sched_status());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1409,7 +1355,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
+    lastComparison = java.lang.Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1419,7 +1365,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_replication_count()).compareTo(other.is_set_replication_count());
+    lastComparison = java.lang.Boolean.valueOf(is_set_replication_count()).compareTo(other.is_set_replication_count());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1429,7 +1375,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_requested_memonheap()).compareTo(other.is_set_requested_memonheap());
+    lastComparison = java.lang.Boolean.valueOf(is_set_requested_memonheap()).compareTo(other.is_set_requested_memonheap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1439,7 +1385,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_requested_memoffheap()).compareTo(other.is_set_requested_memoffheap());
+    lastComparison = java.lang.Boolean.valueOf(is_set_requested_memoffheap()).compareTo(other.is_set_requested_memoffheap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1449,7 +1395,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_requested_cpu()).compareTo(other.is_set_requested_cpu());
+    lastComparison = java.lang.Boolean.valueOf(is_set_requested_cpu()).compareTo(other.is_set_requested_cpu());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1459,7 +1405,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_assigned_memonheap()).compareTo(other.is_set_assigned_memonheap());
+    lastComparison = java.lang.Boolean.valueOf(is_set_assigned_memonheap()).compareTo(other.is_set_assigned_memonheap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1469,7 +1415,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_assigned_memoffheap()).compareTo(other.is_set_assigned_memoffheap());
+    lastComparison = java.lang.Boolean.valueOf(is_set_assigned_memoffheap()).compareTo(other.is_set_assigned_memoffheap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1479,7 +1425,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_assigned_cpu()).compareTo(other.is_set_assigned_cpu());
+    lastComparison = java.lang.Boolean.valueOf(is_set_assigned_cpu()).compareTo(other.is_set_assigned_cpu());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1497,16 +1443,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   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("TopologySummary(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TopologySummary(");
     boolean first = true;
 
     sb.append("id:");
@@ -1675,7 +1621,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  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;
@@ -1685,13 +1631,13 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  private static class TopologySummaryStandardSchemeFactory implements SchemeFactory {
+  private static class TopologySummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TopologySummaryStandardScheme getScheme() {
       return new TopologySummaryStandardScheme();
     }
   }
 
-  private static class TopologySummaryStandardScheme extends StandardScheme<TopologySummary> {
+  private static class TopologySummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologySummary> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TopologySummary struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1956,17 +1902,17 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
   }
 
-  private static class TopologySummaryTupleSchemeFactory implements SchemeFactory {
+  private static class TopologySummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TopologySummaryTupleScheme getScheme() {
       return new TopologySummaryTupleScheme();
     }
   }
 
-  private static class TopologySummaryTupleScheme extends TupleScheme<TopologySummary> {
+  private static class TopologySummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<TopologySummary> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TopologySummary struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.id);
       oprot.writeString(struct.name);
       oprot.writeI32(struct.num_tasks);
@@ -1974,7 +1920,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       oprot.writeI32(struct.num_workers);
       oprot.writeI32(struct.uptime_secs);
       oprot.writeString(struct.status);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_storm_version()) {
         optionals.set(0);
       }
@@ -2046,7 +1992,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TopologySummary struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.id = iprot.readString();
       struct.set_id_isSet(true);
       struct.name = iprot.readString();
@@ -2061,7 +2007,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       struct.set_uptime_secs_isSet(true);
       struct.status = iprot.readString();
       struct.set_status_isSet(true);
-      BitSet incoming = iprot.readBitSet(11);
+      java.util.BitSet incoming = iprot.readBitSet(11);
       if (incoming.get(0)) {
         struct.storm_version = iprot.readString();
         struct.set_storm_version_isSet(true);
@@ -2109,5 +2055,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
+  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/WorkerMetricList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java
index 764a4f9..a61ad9a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.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"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricList, WorkerMetricList._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricList> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerMetricList");
 
   private static final org.apache.thrift.protocol.TField METRICS_FIELD_DESC = new org.apache.thrift.protocol.TField("metrics", org.apache.thrift.protocol.TType.LIST, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new WorkerMetricListStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new WorkerMetricListTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricListStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricListTupleSchemeFactory();
 
-  private List<WorkerMetricPoint> metrics; // required
+  private java.util.List<WorkerMetricPoint> metrics; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     METRICS((short)1, "metrics");
 
-    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 WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
      */
     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,19 +88,19 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
       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.METRICS, new org.apache.thrift.meta_data.FieldMetaData("metrics", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkerMetricPoint.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricList.class, metaDataMap);
   }
 
@@ -138,7 +108,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
   }
 
   public WorkerMetricList(
-    List<WorkerMetricPoint> metrics)
+    java.util.List<WorkerMetricPoint> metrics)
   {
     this();
     this.metrics = metrics;
@@ -149,7 +119,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
    */
   public WorkerMetricList(WorkerMetricList other) {
     if (other.is_set_metrics()) {
-      List<WorkerMetricPoint> __this__metrics = new ArrayList<WorkerMetricPoint>(other.metrics.size());
+      java.util.List<WorkerMetricPoint> __this__metrics = new java.util.ArrayList<WorkerMetricPoint>(other.metrics.size());
       for (WorkerMetricPoint other_element : other.metrics) {
         __this__metrics.add(new WorkerMetricPoint(other_element));
       }
@@ -176,16 +146,16 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
   public void add_to_metrics(WorkerMetricPoint elem) {
     if (this.metrics == null) {
-      this.metrics = new ArrayList<WorkerMetricPoint>();
+      this.metrics = new java.util.ArrayList<WorkerMetricPoint>();
     }
     this.metrics.add(elem);
   }
 
-  public List<WorkerMetricPoint> get_metrics() {
+  public java.util.List<WorkerMetricPoint> get_metrics() {
     return this.metrics;
   }
 
-  public void set_metrics(List<WorkerMetricPoint> metrics) {
+  public void set_metrics(java.util.List<WorkerMetricPoint> metrics) {
     this.metrics = metrics;
   }
 
@@ -204,43 +174,43 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case METRICS:
       if (value == null) {
         unset_metrics();
       } else {
-        set_metrics((List<WorkerMetricPoint>)value);
+        set_metrics((java.util.List<WorkerMetricPoint>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case METRICS:
       return get_metrics();
 
     }
-    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 METRICS:
       return is_set_metrics();
     }
-    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 WorkerMetricList)
@@ -251,6 +221,8 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
   public boolean equals(WorkerMetricList that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_metrics = true && this.is_set_metrics();
     boolean that_present_metrics = true && that.is_set_metrics();
@@ -266,14 +238,13 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_metrics = true && (is_set_metrics());
-    list.add(present_metrics);
-    if (present_metrics)
-      list.add(metrics);
+    hashCode = hashCode * 8191 + ((is_set_metrics()) ? 131071 : 524287);
+    if (is_set_metrics())
+      hashCode = hashCode * 8191 + metrics.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -284,7 +255,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(is_set_metrics()).compareTo(other.is_set_metrics());
+    lastComparison = java.lang.Boolean.valueOf(is_set_metrics()).compareTo(other.is_set_metrics());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -302,16 +273,16 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
   }
 
   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("WorkerMetricList(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkerMetricList(");
     boolean first = true;
 
     sb.append("metrics:");
@@ -338,7 +309,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
   }
 
-  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) {
@@ -346,13 +317,13 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
   }
 
-  private static class WorkerMetricListStandardSchemeFactory implements SchemeFactory {
+  private static class WorkerMetricListStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WorkerMetricListStandardScheme getScheme() {
       return new WorkerMetricListStandardScheme();
     }
   }
 
-  private static class WorkerMetricListStandardScheme extends StandardScheme<WorkerMetricList> {
+  private static class WorkerMetricListStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerMetricList> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerMetricList struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -368,7 +339,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list896 = iprot.readListBegin();
-                struct.metrics = new ArrayList<WorkerMetricPoint>(_list896.size);
+                struct.metrics = new java.util.ArrayList<WorkerMetricPoint>(_list896.size);
                 WorkerMetricPoint _elem897;
                 for (int _i898 = 0; _i898 < _list896.size; ++_i898)
                 {
@@ -414,18 +385,18 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
   }
 
-  private static class WorkerMetricListTupleSchemeFactory implements SchemeFactory {
+  private static class WorkerMetricListTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WorkerMetricListTupleScheme getScheme() {
       return new WorkerMetricListTupleScheme();
     }
   }
 
-  private static class WorkerMetricListTupleScheme extends TupleScheme<WorkerMetricList> {
+  private static class WorkerMetricListTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerMetricList> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, WorkerMetricList 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_metrics()) {
         optionals.set(0);
       }
@@ -443,12 +414,12 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WorkerMetricList 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.TList _list901 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.metrics = new ArrayList<WorkerMetricPoint>(_list901.size);
+          struct.metrics = new java.util.ArrayList<WorkerMetricPoint>(_list901.size);
           WorkerMetricPoint _elem902;
           for (int _i903 = 0; _i903 < _list901.size; ++_i903)
           {
@@ -462,5 +433,8 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
   }
 
+  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/WorkerMetricPoint.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
index 719277a..c4633a5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
@@ -16,42 +16,15 @@
  * 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"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPoint, WorkerMetricPoint._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricPoint> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerMetricPoint");
 
@@ -62,18 +35,15 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   private static final org.apache.thrift.protocol.TField EXECUTOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("executorId", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", org.apache.thrift.protocol.TType.STRING, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new WorkerMetricPointStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new WorkerMetricPointTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricPointStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricPointTupleSchemeFactory();
 
-  private String metricName; // required
+  private java.lang.String metricName; // required
   private long timestamp; // required
   private double metricValue; // required
-  private String componentId; // required
-  private String executorId; // required
-  private String streamId; // required
+  private java.lang.String componentId; // required
+  private java.lang.String executorId; // required
+  private java.lang.String streamId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -84,10 +54,10 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     EXECUTOR_ID((short)5, "executorId"),
     STREAM_ID((short)6, "streamId");
 
-    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);
       }
     }
@@ -120,21 +90,21 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
      */
     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;
     }
@@ -143,7 +113,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -152,9 +122,9 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private static final int __METRICVALUE_ISSET_ID = 1;
   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.METRIC_NAME, new org.apache.thrift.meta_data.FieldMetaData("metricName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -167,7 +137,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.STREAM_ID, new org.apache.thrift.meta_data.FieldMetaData("streamId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricPoint.class, metaDataMap);
   }
 
@@ -175,12 +145,12 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   public WorkerMetricPoint(
-    String metricName,
+    java.lang.String metricName,
     long timestamp,
     double metricValue,
-    String componentId,
-    String executorId,
-    String streamId)
+    java.lang.String componentId,
+    java.lang.String executorId,
+    java.lang.String streamId)
   {
     this();
     this.metricName = metricName;
@@ -230,11 +200,11 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     this.streamId = null;
   }
 
-  public String get_metricName() {
+  public java.lang.String get_metricName() {
     return this.metricName;
   }
 
-  public void set_metricName(String metricName) {
+  public void set_metricName(java.lang.String metricName) {
     this.metricName = metricName;
   }
 
@@ -263,16 +233,16 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   public void unset_timestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
   public boolean is_set_timestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   public void set_timestamp_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
   public double get_metricValue() {
@@ -285,23 +255,23 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   public void unset_metricValue() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
   }
 
   /** Returns true if field metricValue is set (has been assigned a value) and false otherwise */
   public boolean is_set_metricValue() {
-    return EncodingUtils.testBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
   }
 
   public void set_metricValue_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __METRICVALUE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __METRICVALUE_ISSET_ID, value);
   }
 
-  public String get_componentId() {
+  public java.lang.String get_componentId() {
     return this.componentId;
   }
 
-  public void set_componentId(String componentId) {
+  public void set_componentId(java.lang.String componentId) {
     this.componentId = componentId;
   }
 
@@ -320,11 +290,11 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  public String get_executorId() {
+  public java.lang.String get_executorId() {
     return this.executorId;
   }
 
-  public void set_executorId(String executorId) {
+  public void set_executorId(java.lang.String executorId) {
     this.executorId = executorId;
   }
 
@@ -343,11 +313,11 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  public String get_streamId() {
+  public java.lang.String get_streamId() {
     return this.streamId;
   }
 
-  public void set_streamId(String streamId) {
+  public void set_streamId(java.lang.String streamId) {
     this.streamId = streamId;
   }
 
@@ -366,13 +336,13 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case METRIC_NAME:
       if (value == null) {
         unset_metricName();
       } else {
-        set_metricName((String)value);
+        set_metricName((java.lang.String)value);
       }
       break;
 
@@ -380,7 +350,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       if (value == null) {
         unset_timestamp();
       } else {
-        set_timestamp((Long)value);
+        set_timestamp((java.lang.Long)value);
       }
       break;
 
@@ -388,7 +358,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       if (value == null) {
         unset_metricValue();
       } else {
-        set_metricValue((Double)value);
+        set_metricValue((java.lang.Double)value);
       }
       break;
 
@@ -396,7 +366,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       if (value == null) {
         unset_componentId();
       } else {
-        set_componentId((String)value);
+        set_componentId((java.lang.String)value);
       }
       break;
 
@@ -404,7 +374,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       if (value == null) {
         unset_executorId();
       } else {
-        set_executorId((String)value);
+        set_executorId((java.lang.String)value);
       }
       break;
 
@@ -412,14 +382,14 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       if (value == null) {
         unset_streamId();
       } else {
-        set_streamId((String)value);
+        set_streamId((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case METRIC_NAME:
       return get_metricName();
@@ -440,13 +410,13 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return get_streamId();
 
     }
-    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) {
@@ -463,11 +433,11 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     case STREAM_ID:
       return is_set_streamId();
     }
-    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 WorkerMetricPoint)
@@ -478,6 +448,8 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   public boolean equals(WorkerMetricPoint that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_metricName = true && this.is_set_metricName();
     boolean that_present_metricName = true && that.is_set_metricName();
@@ -538,39 +510,29 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_metricName = true && (is_set_metricName());
-    list.add(present_metricName);
-    if (present_metricName)
-      list.add(metricName);
+    hashCode = hashCode * 8191 + ((is_set_metricName()) ? 131071 : 524287);
+    if (is_set_metricName())
+      hashCode = hashCode * 8191 + metricName.hashCode();
 
-    boolean present_timestamp = true;
-    list.add(present_timestamp);
-    if (present_timestamp)
-      list.add(timestamp);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timestamp);
 
-    boolean present_metricValue = true;
-    list.add(present_metricValue);
-    if (present_metricValue)
-      list.add(metricValue);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(metricValue);
 
-    boolean present_componentId = true && (is_set_componentId());
-    list.add(present_componentId);
-    if (present_componentId)
-      list.add(componentId);
+    hashCode = hashCode * 8191 + ((is_set_componentId()) ? 131071 : 524287);
+    if (is_set_componentId())
+      hashCode = hashCode * 8191 + componentId.hashCode();
 
-    boolean present_executorId = true && (is_set_executorId());
-    list.add(present_executorId);
-    if (present_executorId)
-      list.add(executorId);
+    hashCode = hashCode * 8191 + ((is_set_executorId()) ? 131071 : 524287);
+    if (is_set_executorId())
+      hashCode = hashCode * 8191 + executorId.hashCode();
 
-    boolean present_streamId = true && (is_set_streamId());
-    list.add(present_streamId);
-    if (present_streamId)
-      list.add(streamId);
+    hashCode = hashCode * 8191 + ((is_set_streamId()) ? 131071 : 524287);
+    if (is_set_streamId())
+      hashCode = hashCode * 8191 + streamId.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -581,7 +543,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(is_set_metricName()).compareTo(other.is_set_metricName());
+    lastComparison = java.lang.Boolean.valueOf(is_set_metricName()).compareTo(other.is_set_metricName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -591,7 +553,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_timestamp()).compareTo(other.is_set_timestamp());
+    lastComparison = java.lang.Boolean.valueOf(is_set_timestamp()).compareTo(other.is_set_timestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -601,7 +563,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_metricValue()).compareTo(other.is_set_metricValue());
+    lastComparison = java.lang.Boolean.valueOf(is_set_metricValue()).compareTo(other.is_set_metricValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -611,7 +573,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_componentId()).compareTo(other.is_set_componentId());
+    lastComparison = java.lang.Boolean.valueOf(is_set_componentId()).compareTo(other.is_set_componentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -621,7 +583,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_executorId()).compareTo(other.is_set_executorId());
+    lastComparison = java.lang.Boolean.valueOf(is_set_executorId()).compareTo(other.is_set_executorId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -631,7 +593,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_streamId()).compareTo(other.is_set_streamId());
+    lastComparison = java.lang.Boolean.valueOf(is_set_streamId()).compareTo(other.is_set_streamId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -649,16 +611,16 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   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("WorkerMetricPoint(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkerMetricPoint(");
     boolean first = true;
 
     sb.append("metricName:");
@@ -741,7 +703,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  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;
@@ -751,13 +713,13 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  private static class WorkerMetricPointStandardSchemeFactory implements SchemeFactory {
+  private static class WorkerMetricPointStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WorkerMetricPointStandardScheme getScheme() {
       return new WorkerMetricPointStandardScheme();
     }
   }
 
-  private static class WorkerMetricPointStandardScheme extends StandardScheme<WorkerMetricPoint> {
+  private static class WorkerMetricPointStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerMetricPoint> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerMetricPoint struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -862,17 +824,17 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
   }
 
-  private static class WorkerMetricPointTupleSchemeFactory implements SchemeFactory {
+  private static class WorkerMetricPointTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WorkerMetricPointTupleScheme getScheme() {
       return new WorkerMetricPointTupleScheme();
     }
   }
 
-  private static class WorkerMetricPointTupleScheme extends TupleScheme<WorkerMetricPoint> {
+  private static class WorkerMetricPointTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerMetricPoint> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, WorkerMetricPoint struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.metricName);
       oprot.writeI64(struct.timestamp);
       oprot.writeDouble(struct.metricValue);
@@ -883,7 +845,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WorkerMetricPoint struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.metricName = iprot.readString();
       struct.set_metricName_isSet(true);
       struct.timestamp = iprot.readI64();
@@ -899,5 +861,8 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
+  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();
+  }
 }