http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java 
b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
index 7594220..8a7a931 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.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"})
[email protected](value = "Autogenerated by Thrift Compiler 
(0.11.0)")
 public class StormTopology implements org.apache.thrift.TBase<StormTopology, 
StormTopology._Fields>, java.io.Serializable, Cloneable, 
Comparable<StormTopology> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("StormTopology");
 
@@ -66,22 +39,19 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
   private static final org.apache.thrift.protocol.TField 
COMPONENT_TO_SHARED_MEMORY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("component_to_shared_memory", 
org.apache.thrift.protocol.TType.MAP, (short)9);
   private static final org.apache.thrift.protocol.TField 
SHARED_MEMORY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("shared_memory", 
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 
StormTopologyStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new StormTopologyTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new StormTopologyStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new StormTopologyTupleSchemeFactory();
 
-  private Map<String,SpoutSpec> spouts; // required
-  private Map<String,Bolt> bolts; // required
-  private Map<String,StateSpoutSpec> state_spouts; // required
-  private List<ByteBuffer> worker_hooks; // optional
-  private List<String> dependency_jars; // optional
-  private List<String> dependency_artifacts; // optional
-  private String storm_version; // optional
-  private String jdk_version; // optional
-  private Map<String,Set<String>> component_to_shared_memory; // optional
-  private Map<String,SharedMemory> shared_memory; // optional
+  private java.util.Map<java.lang.String,SpoutSpec> spouts; // required
+  private java.util.Map<java.lang.String,Bolt> bolts; // required
+  private java.util.Map<java.lang.String,StateSpoutSpec> state_spouts; // 
required
+  private java.util.List<java.nio.ByteBuffer> worker_hooks; // optional
+  private java.util.List<java.lang.String> dependency_jars; // optional
+  private java.util.List<java.lang.String> dependency_artifacts; // optional
+  private java.lang.String storm_version; // optional
+  private java.lang.String jdk_version; // optional
+  private java.util.Map<java.lang.String,java.util.Set<java.lang.String>> 
component_to_shared_memory; // optional
+  private java.util.Map<java.lang.String,SharedMemory> shared_memory; // 
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 {
@@ -96,10 +66,10 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     COMPONENT_TO_SHARED_MEMORY((short)9, "component_to_shared_memory"),
     SHARED_MEMORY((short)10, "shared_memory");
 
-    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);
       }
     }
@@ -140,21 +110,21 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
      */
     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,16 +133,16 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.WORKER_HOOKS,_Fields.DEPENDENCY_JARS,_Fields.DEPENDENCY_ARTIFACTS,_Fields.STORM_VERSION,_Fields.JDK_VERSION,_Fields.COMPONENT_TO_SHARED_MEMORY,_Fields.SHARED_MEMORY};
-  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.SPOUTS, new 
org.apache.thrift.meta_data.FieldMetaData("spouts", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         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),
 
@@ -207,7 +177,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         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,
 SharedMemory.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class,
 metaDataMap);
   }
 
@@ -215,9 +185,9 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
   }
 
   public StormTopology(
-    Map<String,SpoutSpec> spouts,
-    Map<String,Bolt> bolts,
-    Map<String,StateSpoutSpec> state_spouts)
+    java.util.Map<java.lang.String,SpoutSpec> spouts,
+    java.util.Map<java.lang.String,Bolt> bolts,
+    java.util.Map<java.lang.String,StateSpoutSpec> state_spouts)
   {
     this();
     this.spouts = spouts;
@@ -230,13 +200,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
    */
   public StormTopology(StormTopology other) {
     if (other.is_set_spouts()) {
-      Map<String,SpoutSpec> __this__spouts = new 
HashMap<String,SpoutSpec>(other.spouts.size());
-      for (Map.Entry<String, SpoutSpec> other_element : 
other.spouts.entrySet()) {
+      java.util.Map<java.lang.String,SpoutSpec> __this__spouts = new 
java.util.HashMap<java.lang.String,SpoutSpec>(other.spouts.size());
+      for (java.util.Map.Entry<java.lang.String, SpoutSpec> other_element : 
other.spouts.entrySet()) {
 
-        String other_element_key = other_element.getKey();
+        java.lang.String other_element_key = other_element.getKey();
         SpoutSpec other_element_value = other_element.getValue();
 
-        String __this__spouts_copy_key = other_element_key;
+        java.lang.String __this__spouts_copy_key = other_element_key;
 
         SpoutSpec __this__spouts_copy_value = new 
SpoutSpec(other_element_value);
 
@@ -245,13 +215,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       this.spouts = __this__spouts;
     }
     if (other.is_set_bolts()) {
-      Map<String,Bolt> __this__bolts = new 
HashMap<String,Bolt>(other.bolts.size());
-      for (Map.Entry<String, Bolt> other_element : other.bolts.entrySet()) {
+      java.util.Map<java.lang.String,Bolt> __this__bolts = new 
java.util.HashMap<java.lang.String,Bolt>(other.bolts.size());
+      for (java.util.Map.Entry<java.lang.String, Bolt> other_element : 
other.bolts.entrySet()) {
 
-        String other_element_key = other_element.getKey();
+        java.lang.String other_element_key = other_element.getKey();
         Bolt other_element_value = other_element.getValue();
 
-        String __this__bolts_copy_key = other_element_key;
+        java.lang.String __this__bolts_copy_key = other_element_key;
 
         Bolt __this__bolts_copy_value = new Bolt(other_element_value);
 
@@ -260,13 +230,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       this.bolts = __this__bolts;
     }
     if (other.is_set_state_spouts()) {
-      Map<String,StateSpoutSpec> __this__state_spouts = new 
HashMap<String,StateSpoutSpec>(other.state_spouts.size());
-      for (Map.Entry<String, StateSpoutSpec> other_element : 
other.state_spouts.entrySet()) {
+      java.util.Map<java.lang.String,StateSpoutSpec> __this__state_spouts = 
new 
java.util.HashMap<java.lang.String,StateSpoutSpec>(other.state_spouts.size());
+      for (java.util.Map.Entry<java.lang.String, StateSpoutSpec> other_element 
: other.state_spouts.entrySet()) {
 
-        String other_element_key = other_element.getKey();
+        java.lang.String other_element_key = other_element.getKey();
         StateSpoutSpec other_element_value = other_element.getValue();
 
-        String __this__state_spouts_copy_key = other_element_key;
+        java.lang.String __this__state_spouts_copy_key = other_element_key;
 
         StateSpoutSpec __this__state_spouts_copy_value = new 
StateSpoutSpec(other_element_value);
 
@@ -275,15 +245,15 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       this.state_spouts = __this__state_spouts;
     }
     if (other.is_set_worker_hooks()) {
-      List<ByteBuffer> __this__worker_hooks = new 
ArrayList<ByteBuffer>(other.worker_hooks);
+      java.util.List<java.nio.ByteBuffer> __this__worker_hooks = new 
java.util.ArrayList<java.nio.ByteBuffer>(other.worker_hooks);
       this.worker_hooks = __this__worker_hooks;
     }
     if (other.is_set_dependency_jars()) {
-      List<String> __this__dependency_jars = new 
ArrayList<String>(other.dependency_jars);
+      java.util.List<java.lang.String> __this__dependency_jars = new 
java.util.ArrayList<java.lang.String>(other.dependency_jars);
       this.dependency_jars = __this__dependency_jars;
     }
     if (other.is_set_dependency_artifacts()) {
-      List<String> __this__dependency_artifacts = new 
ArrayList<String>(other.dependency_artifacts);
+      java.util.List<java.lang.String> __this__dependency_artifacts = new 
java.util.ArrayList<java.lang.String>(other.dependency_artifacts);
       this.dependency_artifacts = __this__dependency_artifacts;
     }
     if (other.is_set_storm_version()) {
@@ -293,28 +263,28 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       this.jdk_version = other.jdk_version;
     }
     if (other.is_set_component_to_shared_memory()) {
-      Map<String,Set<String>> __this__component_to_shared_memory = new 
HashMap<String,Set<String>>(other.component_to_shared_memory.size());
-      for (Map.Entry<String, Set<String>> other_element : 
other.component_to_shared_memory.entrySet()) {
+      java.util.Map<java.lang.String,java.util.Set<java.lang.String>> 
__this__component_to_shared_memory = new 
java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>(other.component_to_shared_memory.size());
+      for (java.util.Map.Entry<java.lang.String, 
java.util.Set<java.lang.String>> other_element : 
other.component_to_shared_memory.entrySet()) {
 
-        String other_element_key = other_element.getKey();
-        Set<String> other_element_value = other_element.getValue();
+        java.lang.String other_element_key = other_element.getKey();
+        java.util.Set<java.lang.String> other_element_value = 
other_element.getValue();
 
-        String __this__component_to_shared_memory_copy_key = other_element_key;
+        java.lang.String __this__component_to_shared_memory_copy_key = 
other_element_key;
 
-        Set<String> __this__component_to_shared_memory_copy_value = new 
HashSet<String>(other_element_value);
+        java.util.Set<java.lang.String> 
__this__component_to_shared_memory_copy_value = new 
java.util.HashSet<java.lang.String>(other_element_value);
 
         
__this__component_to_shared_memory.put(__this__component_to_shared_memory_copy_key,
 __this__component_to_shared_memory_copy_value);
       }
       this.component_to_shared_memory = __this__component_to_shared_memory;
     }
     if (other.is_set_shared_memory()) {
-      Map<String,SharedMemory> __this__shared_memory = new 
HashMap<String,SharedMemory>(other.shared_memory.size());
-      for (Map.Entry<String, SharedMemory> other_element : 
other.shared_memory.entrySet()) {
+      java.util.Map<java.lang.String,SharedMemory> __this__shared_memory = new 
java.util.HashMap<java.lang.String,SharedMemory>(other.shared_memory.size());
+      for (java.util.Map.Entry<java.lang.String, SharedMemory> other_element : 
other.shared_memory.entrySet()) {
 
-        String other_element_key = other_element.getKey();
+        java.lang.String other_element_key = other_element.getKey();
         SharedMemory other_element_value = other_element.getValue();
 
-        String __this__shared_memory_copy_key = other_element_key;
+        java.lang.String __this__shared_memory_copy_key = other_element_key;
 
         SharedMemory __this__shared_memory_copy_value = new 
SharedMemory(other_element_value);
 
@@ -346,18 +316,18 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.spouts == null) ? 0 : this.spouts.size();
   }
 
-  public void put_to_spouts(String key, SpoutSpec val) {
+  public void put_to_spouts(java.lang.String key, SpoutSpec val) {
     if (this.spouts == null) {
-      this.spouts = new HashMap<String,SpoutSpec>();
+      this.spouts = new java.util.HashMap<java.lang.String,SpoutSpec>();
     }
     this.spouts.put(key, val);
   }
 
-  public Map<String,SpoutSpec> get_spouts() {
+  public java.util.Map<java.lang.String,SpoutSpec> get_spouts() {
     return this.spouts;
   }
 
-  public void set_spouts(Map<String,SpoutSpec> spouts) {
+  public void set_spouts(java.util.Map<java.lang.String,SpoutSpec> spouts) {
     this.spouts = spouts;
   }
 
@@ -380,18 +350,18 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.bolts == null) ? 0 : this.bolts.size();
   }
 
-  public void put_to_bolts(String key, Bolt val) {
+  public void put_to_bolts(java.lang.String key, Bolt val) {
     if (this.bolts == null) {
-      this.bolts = new HashMap<String,Bolt>();
+      this.bolts = new java.util.HashMap<java.lang.String,Bolt>();
     }
     this.bolts.put(key, val);
   }
 
-  public Map<String,Bolt> get_bolts() {
+  public java.util.Map<java.lang.String,Bolt> get_bolts() {
     return this.bolts;
   }
 
-  public void set_bolts(Map<String,Bolt> bolts) {
+  public void set_bolts(java.util.Map<java.lang.String,Bolt> bolts) {
     this.bolts = bolts;
   }
 
@@ -414,18 +384,18 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.state_spouts == null) ? 0 : this.state_spouts.size();
   }
 
-  public void put_to_state_spouts(String key, StateSpoutSpec val) {
+  public void put_to_state_spouts(java.lang.String key, StateSpoutSpec val) {
     if (this.state_spouts == null) {
-      this.state_spouts = new HashMap<String,StateSpoutSpec>();
+      this.state_spouts = new 
java.util.HashMap<java.lang.String,StateSpoutSpec>();
     }
     this.state_spouts.put(key, val);
   }
 
-  public Map<String,StateSpoutSpec> get_state_spouts() {
+  public java.util.Map<java.lang.String,StateSpoutSpec> get_state_spouts() {
     return this.state_spouts;
   }
 
-  public void set_state_spouts(Map<String,StateSpoutSpec> state_spouts) {
+  public void set_state_spouts(java.util.Map<java.lang.String,StateSpoutSpec> 
state_spouts) {
     this.state_spouts = state_spouts;
   }
 
@@ -448,22 +418,22 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.worker_hooks == null) ? 0 : this.worker_hooks.size();
   }
 
-  public java.util.Iterator<ByteBuffer> get_worker_hooks_iterator() {
+  public java.util.Iterator<java.nio.ByteBuffer> get_worker_hooks_iterator() {
     return (this.worker_hooks == null) ? null : this.worker_hooks.iterator();
   }
 
-  public void add_to_worker_hooks(ByteBuffer elem) {
+  public void add_to_worker_hooks(java.nio.ByteBuffer elem) {
     if (this.worker_hooks == null) {
-      this.worker_hooks = new ArrayList<ByteBuffer>();
+      this.worker_hooks = new java.util.ArrayList<java.nio.ByteBuffer>();
     }
     this.worker_hooks.add(elem);
   }
 
-  public List<ByteBuffer> get_worker_hooks() {
+  public java.util.List<java.nio.ByteBuffer> get_worker_hooks() {
     return this.worker_hooks;
   }
 
-  public void set_worker_hooks(List<ByteBuffer> worker_hooks) {
+  public void set_worker_hooks(java.util.List<java.nio.ByteBuffer> 
worker_hooks) {
     this.worker_hooks = worker_hooks;
   }
 
@@ -486,22 +456,22 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.dependency_jars == null) ? 0 : this.dependency_jars.size();
   }
 
-  public java.util.Iterator<String> get_dependency_jars_iterator() {
+  public java.util.Iterator<java.lang.String> get_dependency_jars_iterator() {
     return (this.dependency_jars == null) ? null : 
this.dependency_jars.iterator();
   }
 
-  public void add_to_dependency_jars(String elem) {
+  public void add_to_dependency_jars(java.lang.String elem) {
     if (this.dependency_jars == null) {
-      this.dependency_jars = new ArrayList<String>();
+      this.dependency_jars = new java.util.ArrayList<java.lang.String>();
     }
     this.dependency_jars.add(elem);
   }
 
-  public List<String> get_dependency_jars() {
+  public java.util.List<java.lang.String> get_dependency_jars() {
     return this.dependency_jars;
   }
 
-  public void set_dependency_jars(List<String> dependency_jars) {
+  public void set_dependency_jars(java.util.List<java.lang.String> 
dependency_jars) {
     this.dependency_jars = dependency_jars;
   }
 
@@ -524,22 +494,22 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.dependency_artifacts == null) ? 0 : 
this.dependency_artifacts.size();
   }
 
-  public java.util.Iterator<String> get_dependency_artifacts_iterator() {
+  public java.util.Iterator<java.lang.String> 
get_dependency_artifacts_iterator() {
     return (this.dependency_artifacts == null) ? null : 
this.dependency_artifacts.iterator();
   }
 
-  public void add_to_dependency_artifacts(String elem) {
+  public void add_to_dependency_artifacts(java.lang.String elem) {
     if (this.dependency_artifacts == null) {
-      this.dependency_artifacts = new ArrayList<String>();
+      this.dependency_artifacts = new java.util.ArrayList<java.lang.String>();
     }
     this.dependency_artifacts.add(elem);
   }
 
-  public List<String> get_dependency_artifacts() {
+  public java.util.List<java.lang.String> get_dependency_artifacts() {
     return this.dependency_artifacts;
   }
 
-  public void set_dependency_artifacts(List<String> dependency_artifacts) {
+  public void set_dependency_artifacts(java.util.List<java.lang.String> 
dependency_artifacts) {
     this.dependency_artifacts = dependency_artifacts;
   }
 
@@ -558,11 +528,11 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  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;
   }
 
@@ -581,11 +551,11 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  public String get_jdk_version() {
+  public java.lang.String get_jdk_version() {
     return this.jdk_version;
   }
 
-  public void set_jdk_version(String jdk_version) {
+  public void set_jdk_version(java.lang.String jdk_version) {
     this.jdk_version = jdk_version;
   }
 
@@ -608,18 +578,18 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.component_to_shared_memory == null) ? 0 : 
this.component_to_shared_memory.size();
   }
 
-  public void put_to_component_to_shared_memory(String key, Set<String> val) {
+  public void put_to_component_to_shared_memory(java.lang.String key, 
java.util.Set<java.lang.String> val) {
     if (this.component_to_shared_memory == null) {
-      this.component_to_shared_memory = new HashMap<String,Set<String>>();
+      this.component_to_shared_memory = new 
java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>();
     }
     this.component_to_shared_memory.put(key, val);
   }
 
-  public Map<String,Set<String>> get_component_to_shared_memory() {
+  public java.util.Map<java.lang.String,java.util.Set<java.lang.String>> 
get_component_to_shared_memory() {
     return this.component_to_shared_memory;
   }
 
-  public void set_component_to_shared_memory(Map<String,Set<String>> 
component_to_shared_memory) {
+  public void 
set_component_to_shared_memory(java.util.Map<java.lang.String,java.util.Set<java.lang.String>>
 component_to_shared_memory) {
     this.component_to_shared_memory = component_to_shared_memory;
   }
 
@@ -642,18 +612,18 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     return (this.shared_memory == null) ? 0 : this.shared_memory.size();
   }
 
-  public void put_to_shared_memory(String key, SharedMemory val) {
+  public void put_to_shared_memory(java.lang.String key, SharedMemory val) {
     if (this.shared_memory == null) {
-      this.shared_memory = new HashMap<String,SharedMemory>();
+      this.shared_memory = new 
java.util.HashMap<java.lang.String,SharedMemory>();
     }
     this.shared_memory.put(key, val);
   }
 
-  public Map<String,SharedMemory> get_shared_memory() {
+  public java.util.Map<java.lang.String,SharedMemory> get_shared_memory() {
     return this.shared_memory;
   }
 
-  public void set_shared_memory(Map<String,SharedMemory> shared_memory) {
+  public void set_shared_memory(java.util.Map<java.lang.String,SharedMemory> 
shared_memory) {
     this.shared_memory = shared_memory;
   }
 
@@ -672,13 +642,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case SPOUTS:
       if (value == null) {
         unset_spouts();
       } else {
-        set_spouts((Map<String,SpoutSpec>)value);
+        set_spouts((java.util.Map<java.lang.String,SpoutSpec>)value);
       }
       break;
 
@@ -686,7 +656,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_bolts();
       } else {
-        set_bolts((Map<String,Bolt>)value);
+        set_bolts((java.util.Map<java.lang.String,Bolt>)value);
       }
       break;
 
@@ -694,7 +664,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_state_spouts();
       } else {
-        set_state_spouts((Map<String,StateSpoutSpec>)value);
+        
set_state_spouts((java.util.Map<java.lang.String,StateSpoutSpec>)value);
       }
       break;
 
@@ -702,7 +672,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_worker_hooks();
       } else {
-        set_worker_hooks((List<ByteBuffer>)value);
+        set_worker_hooks((java.util.List<java.nio.ByteBuffer>)value);
       }
       break;
 
@@ -710,7 +680,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_dependency_jars();
       } else {
-        set_dependency_jars((List<String>)value);
+        set_dependency_jars((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -718,7 +688,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_dependency_artifacts();
       } else {
-        set_dependency_artifacts((List<String>)value);
+        set_dependency_artifacts((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -726,7 +696,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_storm_version();
       } else {
-        set_storm_version((String)value);
+        set_storm_version((java.lang.String)value);
       }
       break;
 
@@ -734,7 +704,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_jdk_version();
       } else {
-        set_jdk_version((String)value);
+        set_jdk_version((java.lang.String)value);
       }
       break;
 
@@ -742,7 +712,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_component_to_shared_memory();
       } else {
-        set_component_to_shared_memory((Map<String,Set<String>>)value);
+        
set_component_to_shared_memory((java.util.Map<java.lang.String,java.util.Set<java.lang.String>>)value);
       }
       break;
 
@@ -750,14 +720,14 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (value == null) {
         unset_shared_memory();
       } else {
-        set_shared_memory((Map<String,SharedMemory>)value);
+        set_shared_memory((java.util.Map<java.lang.String,SharedMemory>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SPOUTS:
       return get_spouts();
@@ -790,13 +760,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       return get_shared_memory();
 
     }
-    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) {
@@ -821,11 +791,11 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     case SHARED_MEMORY:
       return is_set_shared_memory();
     }
-    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 StormTopology)
@@ -836,6 +806,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
   public boolean equals(StormTopology that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_spouts = true && this.is_set_spouts();
     boolean that_present_spouts = true && that.is_set_spouts();
@@ -932,59 +904,49 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_spouts = true && (is_set_spouts());
-    list.add(present_spouts);
-    if (present_spouts)
-      list.add(spouts);
+    hashCode = hashCode * 8191 + ((is_set_spouts()) ? 131071 : 524287);
+    if (is_set_spouts())
+      hashCode = hashCode * 8191 + spouts.hashCode();
 
-    boolean present_bolts = true && (is_set_bolts());
-    list.add(present_bolts);
-    if (present_bolts)
-      list.add(bolts);
+    hashCode = hashCode * 8191 + ((is_set_bolts()) ? 131071 : 524287);
+    if (is_set_bolts())
+      hashCode = hashCode * 8191 + bolts.hashCode();
 
-    boolean present_state_spouts = true && (is_set_state_spouts());
-    list.add(present_state_spouts);
-    if (present_state_spouts)
-      list.add(state_spouts);
+    hashCode = hashCode * 8191 + ((is_set_state_spouts()) ? 131071 : 524287);
+    if (is_set_state_spouts())
+      hashCode = hashCode * 8191 + state_spouts.hashCode();
 
-    boolean present_worker_hooks = true && (is_set_worker_hooks());
-    list.add(present_worker_hooks);
-    if (present_worker_hooks)
-      list.add(worker_hooks);
+    hashCode = hashCode * 8191 + ((is_set_worker_hooks()) ? 131071 : 524287);
+    if (is_set_worker_hooks())
+      hashCode = hashCode * 8191 + worker_hooks.hashCode();
 
-    boolean present_dependency_jars = true && (is_set_dependency_jars());
-    list.add(present_dependency_jars);
-    if (present_dependency_jars)
-      list.add(dependency_jars);
+    hashCode = hashCode * 8191 + ((is_set_dependency_jars()) ? 131071 : 
524287);
+    if (is_set_dependency_jars())
+      hashCode = hashCode * 8191 + dependency_jars.hashCode();
 
-    boolean present_dependency_artifacts = true && 
(is_set_dependency_artifacts());
-    list.add(present_dependency_artifacts);
-    if (present_dependency_artifacts)
-      list.add(dependency_artifacts);
+    hashCode = hashCode * 8191 + ((is_set_dependency_artifacts()) ? 131071 : 
524287);
+    if (is_set_dependency_artifacts())
+      hashCode = hashCode * 8191 + dependency_artifacts.hashCode();
 
-    boolean present_storm_version = true && (is_set_storm_version());
-    list.add(present_storm_version);
-    if (present_storm_version)
-      list.add(storm_version);
+    hashCode = hashCode * 8191 + ((is_set_storm_version()) ? 131071 : 524287);
+    if (is_set_storm_version())
+      hashCode = hashCode * 8191 + storm_version.hashCode();
 
-    boolean present_jdk_version = true && (is_set_jdk_version());
-    list.add(present_jdk_version);
-    if (present_jdk_version)
-      list.add(jdk_version);
+    hashCode = hashCode * 8191 + ((is_set_jdk_version()) ? 131071 : 524287);
+    if (is_set_jdk_version())
+      hashCode = hashCode * 8191 + jdk_version.hashCode();
 
-    boolean present_component_to_shared_memory = true && 
(is_set_component_to_shared_memory());
-    list.add(present_component_to_shared_memory);
-    if (present_component_to_shared_memory)
-      list.add(component_to_shared_memory);
+    hashCode = hashCode * 8191 + ((is_set_component_to_shared_memory()) ? 
131071 : 524287);
+    if (is_set_component_to_shared_memory())
+      hashCode = hashCode * 8191 + component_to_shared_memory.hashCode();
 
-    boolean present_shared_memory = true && (is_set_shared_memory());
-    list.add(present_shared_memory);
-    if (present_shared_memory)
-      list.add(shared_memory);
+    hashCode = hashCode * 8191 + ((is_set_shared_memory()) ? 131071 : 524287);
+    if (is_set_shared_memory())
+      hashCode = hashCode * 8191 + shared_memory.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -995,7 +957,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(is_set_spouts()).compareTo(other.is_set_spouts());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_spouts()).compareTo(other.is_set_spouts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1005,7 +967,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_bolts()).compareTo(other.is_set_bolts());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_bolts()).compareTo(other.is_set_bolts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1015,7 +977,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_state_spouts()).compareTo(other.is_set_state_spouts());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_state_spouts()).compareTo(other.is_set_state_spouts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1025,7 +987,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_worker_hooks()).compareTo(other.is_set_worker_hooks());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_worker_hooks()).compareTo(other.is_set_worker_hooks());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1035,7 +997,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_dependency_jars()).compareTo(other.is_set_dependency_jars());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_dependency_jars()).compareTo(other.is_set_dependency_jars());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1045,7 +1007,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_dependency_artifacts()).compareTo(other.is_set_dependency_artifacts());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_dependency_artifacts()).compareTo(other.is_set_dependency_artifacts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1055,7 +1017,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         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;
     }
@@ -1065,7 +1027,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_jdk_version()).compareTo(other.is_set_jdk_version());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_jdk_version()).compareTo(other.is_set_jdk_version());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1075,7 +1037,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_component_to_shared_memory()).compareTo(other.is_set_component_to_shared_memory());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_component_to_shared_memory()).compareTo(other.is_set_component_to_shared_memory());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1085,7 +1047,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_shared_memory()).compareTo(other.is_set_shared_memory());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_shared_memory()).compareTo(other.is_set_shared_memory());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1103,16 +1065,16 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
   }
 
   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("StormTopology(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("StormTopology(");
     boolean first = true;
 
     sb.append("spouts:");
@@ -1237,7 +1199,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  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) {
@@ -1245,13 +1207,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  private static class StormTopologyStandardSchemeFactory implements 
SchemeFactory {
+  private static class StormTopologyStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public StormTopologyStandardScheme getScheme() {
       return new StormTopologyStandardScheme();
     }
   }
 
-  private static class StormTopologyStandardScheme extends 
StandardScheme<StormTopology> {
+  private static class StormTopologyStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<StormTopology> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, StormTopology 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1267,8 +1229,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map44 = iprot.readMapBegin();
-                struct.spouts = new HashMap<String,SpoutSpec>(2*_map44.size);
-                String _key45;
+                struct.spouts = new 
java.util.HashMap<java.lang.String,SpoutSpec>(2*_map44.size);
+                java.lang.String _key45;
                 SpoutSpec _val46;
                 for (int _i47 = 0; _i47 < _map44.size; ++_i47)
                 {
@@ -1288,8 +1250,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
-                struct.bolts = new HashMap<String,Bolt>(2*_map48.size);
-                String _key49;
+                struct.bolts = new 
java.util.HashMap<java.lang.String,Bolt>(2*_map48.size);
+                java.lang.String _key49;
                 Bolt _val50;
                 for (int _i51 = 0; _i51 < _map48.size; ++_i51)
                 {
@@ -1309,8 +1271,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin();
-                struct.state_spouts = new 
HashMap<String,StateSpoutSpec>(2*_map52.size);
-                String _key53;
+                struct.state_spouts = new 
java.util.HashMap<java.lang.String,StateSpoutSpec>(2*_map52.size);
+                java.lang.String _key53;
                 StateSpoutSpec _val54;
                 for (int _i55 = 0; _i55 < _map52.size; ++_i55)
                 {
@@ -1330,8 +1292,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list56 = 
iprot.readListBegin();
-                struct.worker_hooks = new ArrayList<ByteBuffer>(_list56.size);
-                ByteBuffer _elem57;
+                struct.worker_hooks = new 
java.util.ArrayList<java.nio.ByteBuffer>(_list56.size);
+                java.nio.ByteBuffer _elem57;
                 for (int _i58 = 0; _i58 < _list56.size; ++_i58)
                 {
                   _elem57 = iprot.readBinary();
@@ -1348,8 +1310,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list59 = 
iprot.readListBegin();
-                struct.dependency_jars = new ArrayList<String>(_list59.size);
-                String _elem60;
+                struct.dependency_jars = new 
java.util.ArrayList<java.lang.String>(_list59.size);
+                java.lang.String _elem60;
                 for (int _i61 = 0; _i61 < _list59.size; ++_i61)
                 {
                   _elem60 = iprot.readString();
@@ -1366,8 +1328,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list62 = 
iprot.readListBegin();
-                struct.dependency_artifacts = new 
ArrayList<String>(_list62.size);
-                String _elem63;
+                struct.dependency_artifacts = new 
java.util.ArrayList<java.lang.String>(_list62.size);
+                java.lang.String _elem63;
                 for (int _i64 = 0; _i64 < _list62.size; ++_i64)
                 {
                   _elem63 = iprot.readString();
@@ -1400,16 +1362,16 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
-                struct.component_to_shared_memory = new 
HashMap<String,Set<String>>(2*_map65.size);
-                String _key66;
-                Set<String> _val67;
+                struct.component_to_shared_memory = new 
java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>(2*_map65.size);
+                java.lang.String _key66;
+                java.util.Set<java.lang.String> _val67;
                 for (int _i68 = 0; _i68 < _map65.size; ++_i68)
                 {
                   _key66 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TSet _set69 = 
iprot.readSetBegin();
-                    _val67 = new HashSet<String>(2*_set69.size);
-                    String _elem70;
+                    _val67 = new 
java.util.HashSet<java.lang.String>(2*_set69.size);
+                    java.lang.String _elem70;
                     for (int _i71 = 0; _i71 < _set69.size; ++_i71)
                     {
                       _elem70 = iprot.readString();
@@ -1430,8 +1392,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin();
-                struct.shared_memory = new 
HashMap<String,SharedMemory>(2*_map72.size);
-                String _key73;
+                struct.shared_memory = new 
java.util.HashMap<java.lang.String,SharedMemory>(2*_map72.size);
+                java.lang.String _key73;
                 SharedMemory _val74;
                 for (int _i75 = 0; _i75 < _map72.size; ++_i75)
                 {
@@ -1464,7 +1426,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         oprot.writeFieldBegin(SPOUTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, struct.spouts.size()));
-          for (Map.Entry<String, SpoutSpec> _iter76 : struct.spouts.entrySet())
+          for (java.util.Map.Entry<java.lang.String, SpoutSpec> _iter76 : 
struct.spouts.entrySet())
           {
             oprot.writeString(_iter76.getKey());
             _iter76.getValue().write(oprot);
@@ -1477,7 +1439,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         oprot.writeFieldBegin(BOLTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, struct.bolts.size()));
-          for (Map.Entry<String, Bolt> _iter77 : struct.bolts.entrySet())
+          for (java.util.Map.Entry<java.lang.String, Bolt> _iter77 : 
struct.bolts.entrySet())
           {
             oprot.writeString(_iter77.getKey());
             _iter77.getValue().write(oprot);
@@ -1490,7 +1452,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, struct.state_spouts.size()));
-          for (Map.Entry<String, StateSpoutSpec> _iter78 : 
struct.state_spouts.entrySet())
+          for (java.util.Map.Entry<java.lang.String, StateSpoutSpec> _iter78 : 
struct.state_spouts.entrySet())
           {
             oprot.writeString(_iter78.getKey());
             _iter78.getValue().write(oprot);
@@ -1504,7 +1466,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
           oprot.writeFieldBegin(WORKER_HOOKS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.worker_hooks.size()));
-            for (ByteBuffer _iter79 : struct.worker_hooks)
+            for (java.nio.ByteBuffer _iter79 : struct.worker_hooks)
             {
               oprot.writeBinary(_iter79);
             }
@@ -1518,7 +1480,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
           oprot.writeFieldBegin(DEPENDENCY_JARS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.dependency_jars.size()));
-            for (String _iter80 : struct.dependency_jars)
+            for (java.lang.String _iter80 : struct.dependency_jars)
             {
               oprot.writeString(_iter80);
             }
@@ -1532,7 +1494,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
           oprot.writeFieldBegin(DEPENDENCY_ARTIFACTS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.dependency_artifacts.size()));
-            for (String _iter81 : struct.dependency_artifacts)
+            for (java.lang.String _iter81 : struct.dependency_artifacts)
             {
               oprot.writeString(_iter81);
             }
@@ -1560,12 +1522,12 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
           oprot.writeFieldBegin(COMPONENT_TO_SHARED_MEMORY_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.SET, 
struct.component_to_shared_memory.size()));
-            for (Map.Entry<String, Set<String>> _iter82 : 
struct.component_to_shared_memory.entrySet())
+            for (java.util.Map.Entry<java.lang.String, 
java.util.Set<java.lang.String>> _iter82 : 
struct.component_to_shared_memory.entrySet())
             {
               oprot.writeString(_iter82.getKey());
               {
                 oprot.writeSetBegin(new 
org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, 
_iter82.getValue().size()));
-                for (String _iter83 : _iter82.getValue())
+                for (java.lang.String _iter83 : _iter82.getValue())
                 {
                   oprot.writeString(_iter83);
                 }
@@ -1582,7 +1544,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
           oprot.writeFieldBegin(SHARED_MEMORY_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, struct.shared_memory.size()));
-            for (Map.Entry<String, SharedMemory> _iter84 : 
struct.shared_memory.entrySet())
+            for (java.util.Map.Entry<java.lang.String, SharedMemory> _iter84 : 
struct.shared_memory.entrySet())
             {
               oprot.writeString(_iter84.getKey());
               _iter84.getValue().write(oprot);
@@ -1598,20 +1560,20 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
 
   }
 
-  private static class StormTopologyTupleSchemeFactory implements 
SchemeFactory {
+  private static class StormTopologyTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public StormTopologyTupleScheme getScheme() {
       return new StormTopologyTupleScheme();
     }
   }
 
-  private static class StormTopologyTupleScheme extends 
TupleScheme<StormTopology> {
+  private static class StormTopologyTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<StormTopology> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, StormTopology 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.spouts.size());
-        for (Map.Entry<String, SpoutSpec> _iter85 : struct.spouts.entrySet())
+        for (java.util.Map.Entry<java.lang.String, SpoutSpec> _iter85 : 
struct.spouts.entrySet())
         {
           oprot.writeString(_iter85.getKey());
           _iter85.getValue().write(oprot);
@@ -1619,7 +1581,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       }
       {
         oprot.writeI32(struct.bolts.size());
-        for (Map.Entry<String, Bolt> _iter86 : struct.bolts.entrySet())
+        for (java.util.Map.Entry<java.lang.String, Bolt> _iter86 : 
struct.bolts.entrySet())
         {
           oprot.writeString(_iter86.getKey());
           _iter86.getValue().write(oprot);
@@ -1627,13 +1589,13 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       }
       {
         oprot.writeI32(struct.state_spouts.size());
-        for (Map.Entry<String, StateSpoutSpec> _iter87 : 
struct.state_spouts.entrySet())
+        for (java.util.Map.Entry<java.lang.String, StateSpoutSpec> _iter87 : 
struct.state_spouts.entrySet())
         {
           oprot.writeString(_iter87.getKey());
           _iter87.getValue().write(oprot);
         }
       }
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_worker_hooks()) {
         optionals.set(0);
       }
@@ -1659,7 +1621,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (struct.is_set_worker_hooks()) {
         {
           oprot.writeI32(struct.worker_hooks.size());
-          for (ByteBuffer _iter88 : struct.worker_hooks)
+          for (java.nio.ByteBuffer _iter88 : struct.worker_hooks)
           {
             oprot.writeBinary(_iter88);
           }
@@ -1668,7 +1630,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (struct.is_set_dependency_jars()) {
         {
           oprot.writeI32(struct.dependency_jars.size());
-          for (String _iter89 : struct.dependency_jars)
+          for (java.lang.String _iter89 : struct.dependency_jars)
           {
             oprot.writeString(_iter89);
           }
@@ -1677,7 +1639,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (struct.is_set_dependency_artifacts()) {
         {
           oprot.writeI32(struct.dependency_artifacts.size());
-          for (String _iter90 : struct.dependency_artifacts)
+          for (java.lang.String _iter90 : struct.dependency_artifacts)
           {
             oprot.writeString(_iter90);
           }
@@ -1692,12 +1654,12 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (struct.is_set_component_to_shared_memory()) {
         {
           oprot.writeI32(struct.component_to_shared_memory.size());
-          for (Map.Entry<String, Set<String>> _iter91 : 
struct.component_to_shared_memory.entrySet())
+          for (java.util.Map.Entry<java.lang.String, 
java.util.Set<java.lang.String>> _iter91 : 
struct.component_to_shared_memory.entrySet())
           {
             oprot.writeString(_iter91.getKey());
             {
               oprot.writeI32(_iter91.getValue().size());
-              for (String _iter92 : _iter91.getValue())
+              for (java.lang.String _iter92 : _iter91.getValue())
               {
                 oprot.writeString(_iter92);
               }
@@ -1708,7 +1670,7 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (struct.is_set_shared_memory()) {
         {
           oprot.writeI32(struct.shared_memory.size());
-          for (Map.Entry<String, SharedMemory> _iter93 : 
struct.shared_memory.entrySet())
+          for (java.util.Map.Entry<java.lang.String, SharedMemory> _iter93 : 
struct.shared_memory.entrySet())
           {
             oprot.writeString(_iter93.getKey());
             _iter93.getValue().write(oprot);
@@ -1719,11 +1681,11 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       {
         org.apache.thrift.protocol.TMap _map94 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.spouts = new HashMap<String,SpoutSpec>(2*_map94.size);
-        String _key95;
+        struct.spouts = new 
java.util.HashMap<java.lang.String,SpoutSpec>(2*_map94.size);
+        java.lang.String _key95;
         SpoutSpec _val96;
         for (int _i97 = 0; _i97 < _map94.size; ++_i97)
         {
@@ -1736,8 +1698,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       struct.set_spouts_isSet(true);
       {
         org.apache.thrift.protocol.TMap _map98 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.bolts = new HashMap<String,Bolt>(2*_map98.size);
-        String _key99;
+        struct.bolts = new 
java.util.HashMap<java.lang.String,Bolt>(2*_map98.size);
+        java.lang.String _key99;
         Bolt _val100;
         for (int _i101 = 0; _i101 < _map98.size; ++_i101)
         {
@@ -1750,8 +1712,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       struct.set_bolts_isSet(true);
       {
         org.apache.thrift.protocol.TMap _map102 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.state_spouts = new 
HashMap<String,StateSpoutSpec>(2*_map102.size);
-        String _key103;
+        struct.state_spouts = new 
java.util.HashMap<java.lang.String,StateSpoutSpec>(2*_map102.size);
+        java.lang.String _key103;
         StateSpoutSpec _val104;
         for (int _i105 = 0; _i105 < _map102.size; ++_i105)
         {
@@ -1762,12 +1724,12 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
         }
       }
       struct.set_state_spouts_isSet(true);
-      BitSet incoming = iprot.readBitSet(7);
+      java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list106 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.worker_hooks = new ArrayList<ByteBuffer>(_list106.size);
-          ByteBuffer _elem107;
+          struct.worker_hooks = new 
java.util.ArrayList<java.nio.ByteBuffer>(_list106.size);
+          java.nio.ByteBuffer _elem107;
           for (int _i108 = 0; _i108 < _list106.size; ++_i108)
           {
             _elem107 = iprot.readBinary();
@@ -1779,8 +1741,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list109 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.dependency_jars = new ArrayList<String>(_list109.size);
-          String _elem110;
+          struct.dependency_jars = new 
java.util.ArrayList<java.lang.String>(_list109.size);
+          java.lang.String _elem110;
           for (int _i111 = 0; _i111 < _list109.size; ++_i111)
           {
             _elem110 = iprot.readString();
@@ -1792,8 +1754,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list112 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.dependency_artifacts = new ArrayList<String>(_list112.size);
-          String _elem113;
+          struct.dependency_artifacts = new 
java.util.ArrayList<java.lang.String>(_list112.size);
+          java.lang.String _elem113;
           for (int _i114 = 0; _i114 < _list112.size; ++_i114)
           {
             _elem113 = iprot.readString();
@@ -1813,16 +1775,16 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (incoming.get(5)) {
         {
           org.apache.thrift.protocol.TMap _map115 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.SET, iprot.readI32());
-          struct.component_to_shared_memory = new 
HashMap<String,Set<String>>(2*_map115.size);
-          String _key116;
-          Set<String> _val117;
+          struct.component_to_shared_memory = new 
java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>(2*_map115.size);
+          java.lang.String _key116;
+          java.util.Set<java.lang.String> _val117;
           for (int _i118 = 0; _i118 < _map115.size; ++_i118)
           {
             _key116 = iprot.readString();
             {
               org.apache.thrift.protocol.TSet _set119 = new 
org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-              _val117 = new HashSet<String>(2*_set119.size);
-              String _elem120;
+              _val117 = new 
java.util.HashSet<java.lang.String>(2*_set119.size);
+              java.lang.String _elem120;
               for (int _i121 = 0; _i121 < _set119.size; ++_i121)
               {
                 _elem120 = iprot.readString();
@@ -1837,8 +1799,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
       if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TMap _map122 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.shared_memory = new 
HashMap<String,SharedMemory>(2*_map122.size);
-          String _key123;
+          struct.shared_memory = new 
java.util.HashMap<java.lang.String,SharedMemory>(2*_map122.size);
+          java.lang.String _key123;
           SharedMemory _val124;
           for (int _i125 = 0; _i125 < _map122.size; ++_i125)
           {
@@ -1853,5 +1815,8 @@ public class StormTopology implements 
org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
+  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/StreamInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java 
b/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
index bb78631..2f29b7c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
@@ -16,55 +16,25 @@
  * 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 StreamInfo implements org.apache.thrift.TBase<StreamInfo, 
StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("StreamInfo");
 
   private static final org.apache.thrift.protocol.TField 
OUTPUT_FIELDS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("output_fields", 
org.apache.thrift.protocol.TType.LIST, (short)1);
   private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("direct", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new StreamInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new StreamInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new StreamInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new StreamInfoTupleSchemeFactory();
 
-  private List<String> output_fields; // required
+  private java.util.List<java.lang.String> output_fields; // required
   private boolean direct; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -72,10 +42,10 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     OUTPUT_FIELDS((short)1, "output_fields"),
     DIRECT((short)2, "direct");
 
-    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);
       }
     }
@@ -100,21 +70,21 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
      */
     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;
     }
@@ -123,7 +93,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -131,15 +101,15 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   // isset id assignments
   private static final int __DIRECT_ISSET_ID = 0;
   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.OUTPUT_FIELDS, new 
org.apache.thrift.meta_data.FieldMetaData("output_fields", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         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.STRING))));
     tmpMap.put(_Fields.DIRECT, new 
org.apache.thrift.meta_data.FieldMetaData("direct", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StreamInfo.class,
 metaDataMap);
   }
 
@@ -147,7 +117,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   }
 
   public StreamInfo(
-    List<String> output_fields,
+    java.util.List<java.lang.String> output_fields,
     boolean direct)
   {
     this();
@@ -162,7 +132,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   public StreamInfo(StreamInfo other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.is_set_output_fields()) {
-      List<String> __this__output_fields = new 
ArrayList<String>(other.output_fields);
+      java.util.List<java.lang.String> __this__output_fields = new 
java.util.ArrayList<java.lang.String>(other.output_fields);
       this.output_fields = __this__output_fields;
     }
     this.direct = other.direct;
@@ -183,22 +153,22 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     return (this.output_fields == null) ? 0 : this.output_fields.size();
   }
 
-  public java.util.Iterator<String> get_output_fields_iterator() {
+  public java.util.Iterator<java.lang.String> get_output_fields_iterator() {
     return (this.output_fields == null) ? null : this.output_fields.iterator();
   }
 
-  public void add_to_output_fields(String elem) {
+  public void add_to_output_fields(java.lang.String elem) {
     if (this.output_fields == null) {
-      this.output_fields = new ArrayList<String>();
+      this.output_fields = new java.util.ArrayList<java.lang.String>();
     }
     this.output_fields.add(elem);
   }
 
-  public List<String> get_output_fields() {
+  public java.util.List<java.lang.String> get_output_fields() {
     return this.output_fields;
   }
 
-  public void set_output_fields(List<String> output_fields) {
+  public void set_output_fields(java.util.List<java.lang.String> 
output_fields) {
     this.output_fields = output_fields;
   }
 
@@ -227,25 +197,25 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   }
 
   public void unset_direct() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__DIRECT_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DIRECT_ISSET_ID);
   }
 
   /** Returns true if field direct is set (has been assigned a value) and 
false otherwise */
   public boolean is_set_direct() {
-    return EncodingUtils.testBit(__isset_bitfield, __DIRECT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__DIRECT_ISSET_ID);
   }
 
   public void set_direct_isSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__DIRECT_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DIRECT_ISSET_ID, 
value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case OUTPUT_FIELDS:
       if (value == null) {
         unset_output_fields();
       } else {
-        set_output_fields((List<String>)value);
+        set_output_fields((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -253,14 +223,14 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
       if (value == null) {
         unset_direct();
       } else {
-        set_direct((Boolean)value);
+        set_direct((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OUTPUT_FIELDS:
       return get_output_fields();
@@ -269,13 +239,13 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
       return is_direct();
 
     }
-    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) {
@@ -284,11 +254,11 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     case DIRECT:
       return is_set_direct();
     }
-    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 StreamInfo)
@@ -299,6 +269,8 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   public boolean equals(StreamInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_output_fields = true && this.is_set_output_fields();
     boolean that_present_output_fields = true && that.is_set_output_fields();
@@ -323,19 +295,15 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_output_fields = true && (is_set_output_fields());
-    list.add(present_output_fields);
-    if (present_output_fields)
-      list.add(output_fields);
+    hashCode = hashCode * 8191 + ((is_set_output_fields()) ? 131071 : 524287);
+    if (is_set_output_fields())
+      hashCode = hashCode * 8191 + output_fields.hashCode();
 
-    boolean present_direct = true;
-    list.add(present_direct);
-    if (present_direct)
-      list.add(direct);
+    hashCode = hashCode * 8191 + ((direct) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -346,7 +314,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(is_set_output_fields()).compareTo(other.is_set_output_fields());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_output_fields()).compareTo(other.is_set_output_fields());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -356,7 +324,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(is_set_direct()).compareTo(other.is_set_direct());
+    lastComparison = 
java.lang.Boolean.valueOf(is_set_direct()).compareTo(other.is_set_direct());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -374,16 +342,16 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
   }
 
   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("StreamInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("StreamInfo(");
     boolean first = true;
 
     sb.append("output_fields:");
@@ -422,7 +390,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     }
   }
 
-  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;
@@ -432,13 +400,13 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     }
   }
 
-  private static class StreamInfoStandardSchemeFactory implements 
SchemeFactory {
+  private static class StreamInfoStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public StreamInfoStandardScheme getScheme() {
       return new StreamInfoStandardScheme();
     }
   }
 
-  private static class StreamInfoStandardScheme extends 
StandardScheme<StreamInfo> {
+  private static class StreamInfoStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<StreamInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, StreamInfo 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -454,8 +422,8 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list16 = 
iprot.readListBegin();
-                struct.output_fields = new ArrayList<String>(_list16.size);
-                String _elem17;
+                struct.output_fields = new 
java.util.ArrayList<java.lang.String>(_list16.size);
+                java.lang.String _elem17;
                 for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                 {
                   _elem17 = iprot.readString();
@@ -493,7 +461,7 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
         oprot.writeFieldBegin(OUTPUT_FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.output_fields.size()));
-          for (String _iter19 : struct.output_fields)
+          for (java.lang.String _iter19 : struct.output_fields)
           {
             oprot.writeString(_iter19);
           }
@@ -510,20 +478,20 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
 
   }
 
-  private static class StreamInfoTupleSchemeFactory implements SchemeFactory {
+  private static class StreamInfoTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public StreamInfoTupleScheme getScheme() {
       return new StreamInfoTupleScheme();
     }
   }
 
-  private static class StreamInfoTupleScheme extends TupleScheme<StreamInfo> {
+  private static class StreamInfoTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<StreamInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, StreamInfo 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.output_fields.size());
-        for (String _iter20 : struct.output_fields)
+        for (java.lang.String _iter20 : struct.output_fields)
         {
           oprot.writeString(_iter20);
         }
@@ -533,11 +501,11 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StreamInfo 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       {
         org.apache.thrift.protocol.TList _list21 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-        struct.output_fields = new ArrayList<String>(_list21.size);
-        String _elem22;
+        struct.output_fields = new 
java.util.ArrayList<java.lang.String>(_list21.size);
+        java.lang.String _elem22;
         for (int _i23 = 0; _i23 < _list21.size; ++_i23)
         {
           _elem22 = iprot.readString();
@@ -550,5 +518,8 @@ public class StreamInfo implements 
org.apache.thrift.TBase<StreamInfo, StreamInf
     }
   }
 
+  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