You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by rz...@apache.org on 2023/12/06 13:38:51 UTC

(storm) 01/01: STORM-4009 - Regenerate using thrift 0.18.1

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch STORM-4009
in repository https://gitbox.apache.org/repos/asf/storm.git

commit eb6de8157c66d1e265c9a00d5cdf7c41f67913d5
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Wed Dec 6 14:38:41 2023 +0100

    STORM-4009 - Regenerate using thrift 0.18.1
---
 .../org/apache/storm/generated/AccessControl.java  |   25 +-
 .../apache/storm/generated/AccessControlType.java  |    5 +-
 .../storm/generated/AlreadyAliveException.java     |   21 +-
 .../jvm/org/apache/storm/generated/Assignment.java |   47 +-
 .../storm/generated/AuthorizationException.java    |   21 +-
 .../storm/generated/BeginDownloadResult.java       |   25 +-
 .../src/jvm/org/apache/storm/generated/Bolt.java   |   23 +-
 .../apache/storm/generated/BoltAggregateStats.java |   27 +-
 .../jvm/org/apache/storm/generated/BoltStats.java  |   49 +-
 .../org/apache/storm/generated/ClusterSummary.java |   31 +-
 .../storm/generated/ClusterWorkerHeartbeat.java    |   29 +-
 .../storm/generated/CommonAggregateStats.java      |   35 +-
 .../storm/generated/ComponentAggregateStats.java   |   27 +-
 .../apache/storm/generated/ComponentCommon.java    |   31 +-
 .../apache/storm/generated/ComponentObject.java    |   17 +-
 .../apache/storm/generated/ComponentPageInfo.java  |   63 +-
 .../org/apache/storm/generated/ComponentType.java  |    5 +-
 .../org/apache/storm/generated/Credentials.java    |   25 +-
 .../apache/storm/generated/DRPCExceptionType.java  |    5 +-
 .../storm/generated/DRPCExecutionException.java    |   23 +-
 .../org/apache/storm/generated/DRPCRequest.java    |   23 +-
 .../org/apache/storm/generated/DebugOptions.java   |   23 +-
 .../org/apache/storm/generated/DistributedRPC.java |   61 +-
 .../storm/generated/DistributedRPCInvocations.java |  208 +-
 .../jvm/org/apache/storm/generated/ErrorInfo.java  |   27 +-
 .../storm/generated/ExecutorAggregateStats.java    |   23 +-
 .../org/apache/storm/generated/ExecutorInfo.java   |   23 +-
 .../storm/generated/ExecutorSpecificStats.java     |   14 +-
 .../org/apache/storm/generated/ExecutorStats.java  |   35 +-
 .../apache/storm/generated/ExecutorSummary.java    |   31 +-
 .../org/apache/storm/generated/GetInfoOptions.java |   21 +-
 .../org/apache/storm/generated/GlobalStreamId.java |   23 +-
 .../jvm/org/apache/storm/generated/Grouping.java   |   32 +-
 .../storm/generated/HBAuthorizationException.java  |   21 +-
 .../storm/generated/HBExecutionException.java      |   21 +-
 .../jvm/org/apache/storm/generated/HBMessage.java  |   25 +-
 .../org/apache/storm/generated/HBMessageData.java  |   23 +-
 .../jvm/org/apache/storm/generated/HBNodes.java    |   23 +-
 .../jvm/org/apache/storm/generated/HBPulse.java    |   23 +-
 .../jvm/org/apache/storm/generated/HBRecords.java  |   23 +-
 .../storm/generated/HBServerMessageType.java       |    5 +-
 .../storm/generated/IllegalStateException.java     |   21 +-
 .../storm/generated/InvalidTopologyException.java  |   21 +-
 .../jvm/org/apache/storm/generated/JavaObject.java |   25 +-
 .../org/apache/storm/generated/JavaObjectArg.java  |   14 +-
 .../storm/generated/KeyAlreadyExistsException.java |   21 +-
 .../storm/generated/KeyNotFoundException.java      |   21 +-
 .../org/apache/storm/generated/KillOptions.java    |   21 +-
 .../apache/storm/generated/LSApprovedWorkers.java  |   23 +-
 .../storm/generated/LSSupervisorAssignments.java   |   23 +-
 .../org/apache/storm/generated/LSSupervisorId.java |   21 +-
 .../org/apache/storm/generated/LSTopoHistory.java  |   31 +-
 .../apache/storm/generated/LSTopoHistoryList.java  |   23 +-
 .../apache/storm/generated/LSWorkerHeartbeat.java  |   29 +-
 .../apache/storm/generated/ListBlobsResult.java    |   25 +-
 .../apache/storm/generated/LocalAssignment.java    |   31 +-
 .../org/apache/storm/generated/LocalStateData.java |   23 +-
 .../jvm/org/apache/storm/generated/LogConfig.java  |   23 +-
 .../jvm/org/apache/storm/generated/LogLevel.java   |   29 +-
 .../org/apache/storm/generated/LogLevelAction.java |    5 +-
 .../src/jvm/org/apache/storm/generated/Nimbus.java | 2849 +++++++++++++++++---
 .../org/apache/storm/generated/NimbusSummary.java  |   29 +-
 .../jvm/org/apache/storm/generated/NodeInfo.java   |   25 +-
 .../apache/storm/generated/NotAliveException.java  |   21 +-
 .../jvm/org/apache/storm/generated/NullStruct.java |   19 +-
 .../apache/storm/generated/NumErrorsChoice.java    |    5 +-
 .../storm/generated/OwnerResourceSummary.java      |   55 +-
 .../apache/storm/generated/PrivateWorkerKey.java   |   25 +-
 .../org/apache/storm/generated/ProfileAction.java  |    5 +-
 .../org/apache/storm/generated/ProfileRequest.java |   25 +-
 .../apache/storm/generated/ReadableBlobMeta.java   |   23 +-
 .../apache/storm/generated/RebalanceOptions.java   |   37 +-
 .../apache/storm/generated/SettableBlobMeta.java   |   25 +-
 .../org/apache/storm/generated/SharedMemory.java   |   27 +-
 .../org/apache/storm/generated/ShellComponent.java |   23 +-
 .../storm/generated/SpecificAggregateStats.java    |   14 +-
 .../storm/generated/SpoutAggregateStats.java       |   21 +-
 .../jvm/org/apache/storm/generated/SpoutSpec.java  |   23 +-
 .../jvm/org/apache/storm/generated/SpoutStats.java |   37 +-
 .../org/apache/storm/generated/StateSpoutSpec.java |   23 +-
 .../jvm/org/apache/storm/generated/StormBase.java  |   45 +-
 .../org/apache/storm/generated/StormTopology.java  |   57 +-
 .../jvm/org/apache/storm/generated/StreamInfo.java |   25 +-
 .../org/apache/storm/generated/SubmitOptions.java  |   23 +-
 .../jvm/org/apache/storm/generated/Supervisor.java |  157 +-
 .../storm/generated/SupervisorAssignments.java     |   23 +-
 .../org/apache/storm/generated/SupervisorInfo.java |   47 +-
 .../apache/storm/generated/SupervisorPageInfo.java |   27 +-
 .../apache/storm/generated/SupervisorSummary.java  |   49 +-
 .../storm/generated/SupervisorWorkerHeartbeat.java |   27 +-
 .../generated/SupervisorWorkerHeartbeats.java      |   25 +-
 .../storm/generated/ThriftSerializedObject.java    |   23 +-
 .../storm/generated/TopologyActionOptions.java     |   14 +-
 .../storm/generated/TopologyHistoryInfo.java       |   23 +-
 .../org/apache/storm/generated/TopologyInfo.java   |   61 +-
 .../storm/generated/TopologyInitialStatus.java     |    5 +-
 .../apache/storm/generated/TopologyPageInfo.java   |   97 +-
 .../org/apache/storm/generated/TopologyStats.java  |   39 +-
 .../org/apache/storm/generated/TopologyStatus.java |    5 +-
 .../apache/storm/generated/TopologySummary.java    |   63 +-
 .../apache/storm/generated/WorkerMetricList.java   |   23 +-
 .../apache/storm/generated/WorkerMetricPoint.java  |   31 +-
 .../org/apache/storm/generated/WorkerMetrics.java  |   27 +-
 .../apache/storm/generated/WorkerResources.java    |   37 +-
 .../org/apache/storm/generated/WorkerSummary.java  |   53 +-
 .../org/apache/storm/generated/WorkerToken.java    |   25 +-
 .../apache/storm/generated/WorkerTokenInfo.java    |   27 +-
 .../storm/generated/WorkerTokenServiceType.java    |    5 +-
 storm-client/src/py/storm/DistributedRPC-remote    |    2 +-
 storm-client/src/py/storm/DistributedRPC.py        |   15 +-
 .../src/py/storm/DistributedRPCInvocations-remote  |    2 +-
 .../src/py/storm/DistributedRPCInvocations.py      |   28 +-
 storm-client/src/py/storm/Nimbus-remote            |    2 +-
 storm-client/src/py/storm/Nimbus.py                |  376 +--
 storm-client/src/py/storm/Supervisor-remote        |    2 +-
 storm-client/src/py/storm/Supervisor.py            |   17 +-
 storm-client/src/py/storm/constants.py             |    2 +-
 storm-client/src/py/storm/ttypes.py                |  580 ++--
 118 files changed, 5192 insertions(+), 1880 deletions(-)

diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
index 1077051f7..214f5db2a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class AccessControl implements org.apache.storm.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AccessControl");
 
@@ -100,10 +100,12 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -153,6 +155,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
     this.access = other.access;
   }
 
+  @Override
   public AccessControl deepCopy() {
     return new AccessControl(this);
   }
@@ -243,6 +246,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -273,6 +277,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -289,6 +294,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,8 +313,6 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AccessControl)
       return this.equals((AccessControl)that);
     return false;
@@ -375,7 +379,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_type()).compareTo(other.is_set_type());
+    lastComparison = java.lang.Boolean.compare(is_set_type(), other.is_set_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -385,7 +389,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_name()).compareTo(other.is_set_name());
+    lastComparison = java.lang.Boolean.compare(is_set_name(), other.is_set_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -395,7 +399,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_access()).compareTo(other.is_set_access());
+    lastComparison = java.lang.Boolean.compare(is_set_access(), other.is_set_access());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -409,14 +413,17 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -483,6 +490,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
   }
 
   private static class AccessControlStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AccessControlStandardScheme getScheme() {
       return new AccessControlStandardScheme();
     }
@@ -490,6 +498,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
 
   private static class AccessControlStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AccessControl> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AccessControl struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -533,6 +542,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AccessControl struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -559,6 +569,7 @@ public class AccessControl implements org.apache.storm.thrift.TBase<AccessContro
   }
 
   private static class AccessControlTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AccessControlTupleScheme getScheme() {
       return new AccessControlTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
index 3d2415d23..a00435092 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public enum AccessControlType implements org.apache.storm.thrift.TEnum {
   OTHER(1),
   USER(2);
@@ -38,6 +38,7 @@ public enum AccessControlType implements org.apache.storm.thrift.TEnum {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
index 9d5736163..7af4364bf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class AlreadyAliveException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AlreadyAliveException");
 
@@ -86,10 +86,12 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
     }
   }
 
+  @Override
   public AlreadyAliveException deepCopy() {
     return new AlreadyAliveException(this);
   }
@@ -157,6 +160,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AlreadyAliveException)
       return this.equals((AlreadyAliveException)that);
     return false;
@@ -239,7 +243,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
   }
 
   private static class AlreadyAliveExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AlreadyAliveExceptionStandardScheme getScheme() {
       return new AlreadyAliveExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
 
   private static class AlreadyAliveExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AlreadyAliveException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class AlreadyAliveException extends org.apache.storm.thrift.TException im
   }
 
   private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AlreadyAliveExceptionTupleScheme getScheme() {
       return new AlreadyAliveExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
index d62618c43..2b639b850 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Assignment");
 
@@ -116,10 +116,12 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -245,6 +247,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
     }
   }
 
+  @Override
   public Assignment deepCopy() {
     return new Assignment(this);
   }
@@ -488,6 +491,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MASTER_CODE_DIR:
@@ -550,6 +554,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MASTER_CODE_DIR:
@@ -578,6 +583,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -604,8 +610,6 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof Assignment)
       return this.equals((Assignment)that);
     return false;
@@ -726,7 +730,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_master_code_dir()).compareTo(other.is_set_master_code_dir());
+    lastComparison = java.lang.Boolean.compare(is_set_master_code_dir(), other.is_set_master_code_dir());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -736,7 +740,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_node_host()).compareTo(other.is_set_node_host());
+    lastComparison = java.lang.Boolean.compare(is_set_node_host(), other.is_set_node_host());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -746,7 +750,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executor_node_port()).compareTo(other.is_set_executor_node_port());
+    lastComparison = java.lang.Boolean.compare(is_set_executor_node_port(), other.is_set_executor_node_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -756,7 +760,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executor_start_time_secs()).compareTo(other.is_set_executor_start_time_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_executor_start_time_secs(), other.is_set_executor_start_time_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -766,7 +770,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_worker_resources()).compareTo(other.is_set_worker_resources());
+    lastComparison = java.lang.Boolean.compare(is_set_worker_resources(), other.is_set_worker_resources());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -776,7 +780,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_total_shared_off_heap()).compareTo(other.is_set_total_shared_off_heap());
+    lastComparison = java.lang.Boolean.compare(is_set_total_shared_off_heap(), other.is_set_total_shared_off_heap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -786,7 +790,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
+    lastComparison = java.lang.Boolean.compare(is_set_owner(), other.is_set_owner());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -800,14 +804,17 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -914,6 +921,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
   }
 
   private static class AssignmentStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AssignmentStandardScheme getScheme() {
       return new AssignmentStandardScheme();
     }
@@ -921,6 +929,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
 
   private static class AssignmentStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Assignment> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Assignment struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -1079,6 +1088,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Assignment struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -1191,6 +1201,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
   }
 
   private static class AssignmentTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AssignmentTupleScheme getScheme() {
       return new AssignmentTupleScheme();
     }
@@ -1297,7 +1308,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map776 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map776 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING); 
           struct.node_host = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map776.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key777;
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _val778;
@@ -1312,14 +1323,14 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       }
       if (incoming.get(1)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map780 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map780 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.STRUCT); 
           struct.executor_node_port = new java.util.HashMap<java.util.List<java.lang.Long>,NodeInfo>(2*_map780.size);
           @org.apache.storm.thrift.annotation.Nullable java.util.List<java.lang.Long> _key781;
           @org.apache.storm.thrift.annotation.Nullable NodeInfo _val782;
           for (int _i783 = 0; _i783 < _map780.size; ++_i783)
           {
             {
-              org.apache.storm.thrift.protocol.TList _list784 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+              org.apache.storm.thrift.protocol.TList _list784 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.I64);
               _key781 = new java.util.ArrayList<java.lang.Long>(_list784.size);
               long _elem785;
               for (int _i786 = 0; _i786 < _list784.size; ++_i786)
@@ -1337,14 +1348,14 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       }
       if (incoming.get(2)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map787 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map787 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.I64); 
           struct.executor_start_time_secs = new java.util.HashMap<java.util.List<java.lang.Long>,java.lang.Long>(2*_map787.size);
           @org.apache.storm.thrift.annotation.Nullable java.util.List<java.lang.Long> _key788;
           long _val789;
           for (int _i790 = 0; _i790 < _map787.size; ++_i790)
           {
             {
-              org.apache.storm.thrift.protocol.TList _list791 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+              org.apache.storm.thrift.protocol.TList _list791 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.I64);
               _key788 = new java.util.ArrayList<java.lang.Long>(_list791.size);
               long _elem792;
               for (int _i793 = 0; _i793 < _list791.size; ++_i793)
@@ -1361,7 +1372,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       }
       if (incoming.get(3)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map794 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map794 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT); 
           struct.worker_resources = new java.util.HashMap<NodeInfo,WorkerResources>(2*_map794.size);
           @org.apache.storm.thrift.annotation.Nullable NodeInfo _key795;
           @org.apache.storm.thrift.annotation.Nullable WorkerResources _val796;
@@ -1378,7 +1389,7 @@ public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Ass
       }
       if (incoming.get(4)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map798 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map798 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE); 
           struct.total_shared_off_heap = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map798.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key799;
           double _val800;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java b/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
index 29efde392..1eac1d41f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class AuthorizationException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AuthorizationException");
 
@@ -86,10 +86,12 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
     }
   }
 
+  @Override
   public AuthorizationException deepCopy() {
     return new AuthorizationException(this);
   }
@@ -157,6 +160,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AuthorizationException)
       return this.equals((AuthorizationException)that);
     return false;
@@ -239,7 +243,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
   }
 
   private static class AuthorizationExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AuthorizationExceptionStandardScheme getScheme() {
       return new AuthorizationExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
 
   private static class AuthorizationExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AuthorizationException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AuthorizationException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class AuthorizationException extends org.apache.storm.thrift.TException i
   }
 
   private static class AuthorizationExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public AuthorizationExceptionTupleScheme getScheme() {
       return new AuthorizationExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java b/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java
index 540246a21..b197a5848 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginDownloadResult, BeginDownloadResult._Fields>, java.io.Serializable, Cloneable, Comparable<BeginDownloadResult> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BeginDownloadResult");
 
@@ -96,10 +96,12 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -148,6 +150,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
     this.data_size = other.data_size;
   }
 
+  @Override
   public BeginDownloadResult deepCopy() {
     return new BeginDownloadResult(this);
   }
@@ -229,6 +232,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __DATA_SIZE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VERSION:
@@ -259,6 +263,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VERSION:
@@ -275,6 +280,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -293,8 +299,6 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof BeginDownloadResult)
       return this.equals((BeginDownloadResult)that);
     return false;
@@ -361,7 +365,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
+    lastComparison = java.lang.Boolean.compare(is_set_version(), other.is_set_version());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -371,7 +375,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_session()).compareTo(other.is_set_session());
+    lastComparison = java.lang.Boolean.compare(is_set_session(), other.is_set_session());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -381,7 +385,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_data_size()).compareTo(other.is_set_data_size());
+    lastComparison = java.lang.Boolean.compare(is_set_data_size(), other.is_set_data_size());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -395,14 +399,17 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -465,6 +472,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
   }
 
   private static class BeginDownloadResultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BeginDownloadResultStandardScheme getScheme() {
       return new BeginDownloadResultStandardScheme();
     }
@@ -472,6 +480,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
 
   private static class BeginDownloadResultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BeginDownloadResult> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BeginDownloadResult struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -515,6 +524,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BeginDownloadResult struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -539,6 +549,7 @@ public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginD
   }
 
   private static class BeginDownloadResultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BeginDownloadResultTupleScheme getScheme() {
       return new BeginDownloadResultTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Bolt.java b/storm-client/src/jvm/org/apache/storm/generated/Bolt.java
index 23cdf63eb..a07f19f8d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Bolt.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Bolt.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable, Comparable<Bolt> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Bolt");
 
@@ -91,10 +91,12 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -136,6 +138,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
     }
   }
 
+  @Override
   public Bolt deepCopy() {
     return new Bolt(this);
   }
@@ -194,6 +197,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case BOLT_OBJECT:
@@ -216,6 +220,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case BOLT_OBJECT:
@@ -229,6 +234,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -245,8 +251,6 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof Bolt)
       return this.equals((Bolt)that);
     return false;
@@ -302,7 +306,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_bolt_object()).compareTo(other.is_set_bolt_object());
+    lastComparison = java.lang.Boolean.compare(is_set_bolt_object(), other.is_set_bolt_object());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -312,7 +316,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_common()).compareTo(other.is_set_common());
+    lastComparison = java.lang.Boolean.compare(is_set_common(), other.is_set_common());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -326,14 +330,17 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -395,6 +402,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
   }
 
   private static class BoltStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltStandardScheme getScheme() {
       return new BoltStandardScheme();
     }
@@ -402,6 +410,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
 
   private static class BoltStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Bolt> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Bolt struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -439,6 +448,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Bolt struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -460,6 +470,7 @@ public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>,
   }
 
   private static class BoltTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltTupleScheme getScheme() {
       return new BoltTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
index 56f601e2b..aad058406 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAggregateStats, BoltAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltAggregateStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BoltAggregateStats");
 
@@ -101,10 +101,12 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -146,6 +148,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
     this.capacity = other.capacity;
   }
 
+  @Override
   public BoltAggregateStats deepCopy() {
     return new BoltAggregateStats(this);
   }
@@ -250,6 +253,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CAPACITY_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EXECUTE_LATENCY_MS:
@@ -288,6 +292,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXECUTE_LATENCY_MS:
@@ -307,6 +312,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,8 +333,6 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof BoltAggregateStats)
       return this.equals((BoltAggregateStats)that);
     return false;
@@ -410,7 +414,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_execute_latency_ms()).compareTo(other.is_set_execute_latency_ms());
+    lastComparison = java.lang.Boolean.compare(is_set_execute_latency_ms(), other.is_set_execute_latency_ms());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -420,7 +424,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_process_latency_ms()).compareTo(other.is_set_process_latency_ms());
+    lastComparison = java.lang.Boolean.compare(is_set_process_latency_ms(), other.is_set_process_latency_ms());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -430,7 +434,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executed()).compareTo(other.is_set_executed());
+    lastComparison = java.lang.Boolean.compare(is_set_executed(), other.is_set_executed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -440,7 +444,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_capacity()).compareTo(other.is_set_capacity());
+    lastComparison = java.lang.Boolean.compare(is_set_capacity(), other.is_set_capacity());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -454,14 +458,17 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -522,6 +529,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
   }
 
   private static class BoltAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltAggregateStatsStandardScheme getScheme() {
       return new BoltAggregateStatsStandardScheme();
     }
@@ -529,6 +537,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
 
   private static class BoltAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BoltAggregateStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BoltAggregateStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -580,6 +589,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BoltAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -611,6 +621,7 @@ public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAgg
   }
 
   private static class BoltAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltAggregateStatsTupleScheme getScheme() {
       return new BoltAggregateStatsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java b/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
index dbf7f06c9..010bced9b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BoltStats");
 
@@ -106,10 +106,12 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -307,6 +309,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
     }
   }
 
+  @Override
   public BoltStats deepCopy() {
     return new BoltStats(this);
   }
@@ -495,6 +498,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ACKED:
@@ -541,6 +545,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ACKED:
@@ -563,6 +568,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -585,8 +591,6 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof BoltStats)
       return this.equals((BoltStats)that);
     return false;
@@ -681,7 +685,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_acked()).compareTo(other.is_set_acked());
+    lastComparison = java.lang.Boolean.compare(is_set_acked(), other.is_set_acked());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -691,7 +695,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_failed()).compareTo(other.is_set_failed());
+    lastComparison = java.lang.Boolean.compare(is_set_failed(), other.is_set_failed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -701,7 +705,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_process_ms_avg()).compareTo(other.is_set_process_ms_avg());
+    lastComparison = java.lang.Boolean.compare(is_set_process_ms_avg(), other.is_set_process_ms_avg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -711,7 +715,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executed()).compareTo(other.is_set_executed());
+    lastComparison = java.lang.Boolean.compare(is_set_executed(), other.is_set_executed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -721,7 +725,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_execute_ms_avg()).compareTo(other.is_set_execute_ms_avg());
+    lastComparison = java.lang.Boolean.compare(is_set_execute_ms_avg(), other.is_set_execute_ms_avg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -735,14 +739,17 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -837,6 +844,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
   }
 
   private static class BoltStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltStatsStandardScheme getScheme() {
       return new BoltStatsStandardScheme();
     }
@@ -844,6 +852,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
 
   private static class BoltStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BoltStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BoltStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -1028,6 +1037,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BoltStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -1144,6 +1154,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
   }
 
   private static class BoltStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public BoltStatsTupleScheme getScheme() {
       return new BoltStatsTupleScheme();
     }
@@ -1235,7 +1246,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, BoltStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map250 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map250 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.acked = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map250.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key251;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<GlobalStreamId,java.lang.Long> _val252;
@@ -1243,7 +1254,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         {
           _key251 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map254 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map254 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64); 
             _val252 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map254.size);
             @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key255;
             long _val256;
@@ -1260,7 +1271,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       }
       struct.set_acked_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map258 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map258 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.failed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map258.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key259;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<GlobalStreamId,java.lang.Long> _val260;
@@ -1268,7 +1279,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         {
           _key259 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map262 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map262 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64); 
             _val260 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map262.size);
             @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key263;
             long _val264;
@@ -1285,7 +1296,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       }
       struct.set_failed_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map266 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map266 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.process_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map266.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key267;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<GlobalStreamId,java.lang.Double> _val268;
@@ -1293,7 +1304,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         {
           _key267 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map270 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map270 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE); 
             _val268 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map270.size);
             @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key271;
             double _val272;
@@ -1310,7 +1321,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       }
       struct.set_process_ms_avg_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map274 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map274 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.executed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map274.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key275;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<GlobalStreamId,java.lang.Long> _val276;
@@ -1318,7 +1329,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         {
           _key275 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map278 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map278 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64); 
             _val276 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map278.size);
             @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key279;
             long _val280;
@@ -1335,7 +1346,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
       }
       struct.set_executed_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map282 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map282 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.execute_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map282.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key283;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<GlobalStreamId,java.lang.Double> _val284;
@@ -1343,7 +1354,7 @@ public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltS
         {
           _key283 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map286 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map286 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE); 
             _val284 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map286.size);
             @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key287;
             double _val288;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java b/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
index 7e47b4f1c..75eac8a82 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ClusterSummary");
 
@@ -96,10 +96,12 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -163,6 +165,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
     }
   }
 
+  @Override
   public ClusterSummary deepCopy() {
     return new ClusterSummary(this);
   }
@@ -294,6 +297,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SUPERVISORS:
@@ -324,6 +328,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUPERVISORS:
@@ -340,6 +345,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -358,8 +364,6 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ClusterSummary)
       return this.equals((ClusterSummary)that);
     return false;
@@ -428,7 +432,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_supervisors()).compareTo(other.is_set_supervisors());
+    lastComparison = java.lang.Boolean.compare(is_set_supervisors(), other.is_set_supervisors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -438,7 +442,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topologies()).compareTo(other.is_set_topologies());
+    lastComparison = java.lang.Boolean.compare(is_set_topologies(), other.is_set_topologies());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +452,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_nimbuses()).compareTo(other.is_set_nimbuses());
+    lastComparison = java.lang.Boolean.compare(is_set_nimbuses(), other.is_set_nimbuses());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -462,14 +466,17 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -540,6 +547,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
   }
 
   private static class ClusterSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ClusterSummaryStandardScheme getScheme() {
       return new ClusterSummaryStandardScheme();
     }
@@ -547,6 +555,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
 
   private static class ClusterSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ClusterSummary> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ClusterSummary struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -623,6 +632,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ClusterSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -670,6 +680,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
   }
 
   private static class ClusterSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ClusterSummaryTupleScheme getScheme() {
       return new ClusterSummaryTupleScheme();
     }
@@ -707,7 +718,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TList _list181 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list181 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.supervisors = new java.util.ArrayList<SupervisorSummary>(_list181.size);
         @org.apache.storm.thrift.annotation.Nullable SupervisorSummary _elem182;
         for (int _i183 = 0; _i183 < _list181.size; ++_i183)
@@ -719,7 +730,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
       }
       struct.set_supervisors_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list184 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list184 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.topologies = new java.util.ArrayList<TopologySummary>(_list184.size);
         @org.apache.storm.thrift.annotation.Nullable TopologySummary _elem185;
         for (int _i186 = 0; _i186 < _list184.size; ++_i186)
@@ -731,7 +742,7 @@ public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSumm
       }
       struct.set_topologies_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list187 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list187 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.nimbuses = new java.util.ArrayList<NimbusSummary>(_list187.size);
         @org.apache.storm.thrift.annotation.Nullable NimbusSummary _elem188;
         for (int _i189 = 0; _i189 < _list187.size; ++_i189)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
index ef3d01662..3217e3cdc 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
 
@@ -101,10 +101,12 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -176,6 +178,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
     this.uptime_secs = other.uptime_secs;
   }
 
+  @Override
   public ClusterWorkerHeartbeat deepCopy() {
     return new ClusterWorkerHeartbeat(this);
   }
@@ -293,6 +296,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STORM_ID:
@@ -331,6 +335,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STORM_ID:
@@ -350,6 +355,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -370,8 +376,6 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ClusterWorkerHeartbeat)
       return this.equals((ClusterWorkerHeartbeat)that);
     return false;
@@ -449,7 +453,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_storm_id()).compareTo(other.is_set_storm_id());
+    lastComparison = java.lang.Boolean.compare(is_set_storm_id(), other.is_set_storm_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -459,7 +463,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executor_stats()).compareTo(other.is_set_executor_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_executor_stats(), other.is_set_executor_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -469,7 +473,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_time_secs(), other.is_set_time_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -479,7 +483,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_uptime_secs(), other.is_set_uptime_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -493,14 +497,17 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -577,6 +584,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
   }
 
   private static class ClusterWorkerHeartbeatStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ClusterWorkerHeartbeatStandardScheme getScheme() {
       return new ClusterWorkerHeartbeatStandardScheme();
     }
@@ -584,6 +592,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
 
   private static class ClusterWorkerHeartbeatStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ClusterWorkerHeartbeat> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ClusterWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -649,6 +658,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ClusterWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -684,6 +694,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
   }
 
   private static class ClusterWorkerHeartbeatTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ClusterWorkerHeartbeatTupleScheme getScheme() {
       return new ClusterWorkerHeartbeatTupleScheme();
     }
@@ -713,7 +724,7 @@ public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<Clu
       struct.storm_id = iprot.readString();
       struct.set_storm_id_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map828 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map828 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT); 
         struct.executor_stats = new java.util.HashMap<ExecutorInfo,ExecutorStats>(2*_map828.size);
         @org.apache.storm.thrift.annotation.Nullable ExecutorInfo _key829;
         @org.apache.storm.thrift.annotation.Nullable ExecutorStats _val830;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
index 4f889e6f9..45bdefd6f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class CommonAggregateStats implements org.apache.storm.thrift.TBase<CommonAggregateStats, CommonAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<CommonAggregateStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("CommonAggregateStats");
 
@@ -116,10 +116,12 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -177,6 +179,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
     }
   }
 
+  @Override
   public CommonAggregateStats deepCopy() {
     return new CommonAggregateStats(this);
   }
@@ -365,6 +368,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUM_EXECUTORS:
@@ -427,6 +431,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUM_EXECUTORS:
@@ -455,6 +460,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -481,8 +487,6 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof CommonAggregateStats)
       return this.equals((CommonAggregateStats)that);
     return false;
@@ -603,7 +607,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
+    lastComparison = java.lang.Boolean.compare(is_set_num_executors(), other.is_set_num_executors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -613,7 +617,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks());
+    lastComparison = java.lang.Boolean.compare(is_set_num_tasks(), other.is_set_num_tasks());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -623,7 +627,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_emitted()).compareTo(other.is_set_emitted());
+    lastComparison = java.lang.Boolean.compare(is_set_emitted(), other.is_set_emitted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -633,7 +637,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_transferred()).compareTo(other.is_set_transferred());
+    lastComparison = java.lang.Boolean.compare(is_set_transferred(), other.is_set_transferred());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -643,7 +647,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_acked()).compareTo(other.is_set_acked());
+    lastComparison = java.lang.Boolean.compare(is_set_acked(), other.is_set_acked());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -653,7 +657,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_failed()).compareTo(other.is_set_failed());
+    lastComparison = java.lang.Boolean.compare(is_set_failed(), other.is_set_failed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -663,7 +667,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map());
+    lastComparison = java.lang.Boolean.compare(is_set_resources_map(), other.is_set_resources_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -677,14 +681,17 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -767,6 +774,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
   }
 
   private static class CommonAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public CommonAggregateStatsStandardScheme getScheme() {
       return new CommonAggregateStatsStandardScheme();
     }
@@ -774,6 +782,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
 
   private static class CommonAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<CommonAggregateStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, CommonAggregateStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -861,6 +870,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, CommonAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -917,6 +927,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
   }
 
   private static class CommonAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public CommonAggregateStatsTupleScheme getScheme() {
       return new CommonAggregateStatsTupleScheme();
     }
@@ -1010,7 +1021,7 @@ public class CommonAggregateStats implements org.apache.storm.thrift.TBase<Commo
       }
       if (incoming.get(6)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map432 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map432 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE); 
           struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map432.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key433;
           double _val434;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
index fda320580..ceee55df9 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<ComponentAggregateStats, ComponentAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentAggregateStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentAggregateStats");
 
@@ -105,10 +105,12 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -152,6 +154,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
     }
   }
 
+  @Override
   public ComponentAggregateStats deepCopy() {
     return new ComponentAggregateStats(this);
   }
@@ -268,6 +271,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -306,6 +310,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -325,6 +330,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -345,8 +351,6 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ComponentAggregateStats)
       return this.equals((ComponentAggregateStats)that);
     return false;
@@ -428,7 +432,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_type()).compareTo(other.is_set_type());
+    lastComparison = java.lang.Boolean.compare(is_set_type(), other.is_set_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -438,7 +442,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_common_stats()).compareTo(other.is_set_common_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_common_stats(), other.is_set_common_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +452,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_specific_stats()).compareTo(other.is_set_specific_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_specific_stats(), other.is_set_specific_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -458,7 +462,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_last_error()).compareTo(other.is_set_last_error());
+    lastComparison = java.lang.Boolean.compare(is_set_last_error(), other.is_set_last_error());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -472,14 +476,17 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -560,6 +567,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
   }
 
   private static class ComponentAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentAggregateStatsStandardScheme getScheme() {
       return new ComponentAggregateStatsStandardScheme();
     }
@@ -567,6 +575,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
 
   private static class ComponentAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentAggregateStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentAggregateStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -621,6 +630,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -660,6 +670,7 @@ public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<Co
   }
 
   private static class ComponentAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentAggregateStatsTupleScheme getScheme() {
       return new ComponentAggregateStatsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
index 5ba55568a..9b2de401a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentCommon");
 
@@ -101,10 +101,12 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -186,6 +188,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
     }
   }
 
+  @Override
   public ComponentCommon deepCopy() {
     return new ComponentCommon(this);
   }
@@ -315,6 +318,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case INPUTS:
@@ -353,6 +357,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case INPUTS:
@@ -372,6 +377,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -392,8 +398,6 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ComponentCommon)
       return this.equals((ComponentCommon)that);
     return false;
@@ -475,7 +479,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_inputs()).compareTo(other.is_set_inputs());
+    lastComparison = java.lang.Boolean.compare(is_set_inputs(), other.is_set_inputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -485,7 +489,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_streams()).compareTo(other.is_set_streams());
+    lastComparison = java.lang.Boolean.compare(is_set_streams(), other.is_set_streams());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -495,7 +499,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_parallelism_hint()).compareTo(other.is_set_parallelism_hint());
+    lastComparison = java.lang.Boolean.compare(is_set_parallelism_hint(), other.is_set_parallelism_hint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -505,7 +509,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_json_conf()).compareTo(other.is_set_json_conf());
+    lastComparison = java.lang.Boolean.compare(is_set_json_conf(), other.is_set_json_conf());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -519,14 +523,17 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -603,6 +610,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
   }
 
   private static class ComponentCommonStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentCommonStandardScheme getScheme() {
       return new ComponentCommonStandardScheme();
     }
@@ -610,6 +618,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
 
   private static class ComponentCommonStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentCommon> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentCommon struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -688,6 +697,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentCommon struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -737,6 +747,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
   }
 
   private static class ComponentCommonTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentCommonTupleScheme getScheme() {
       return new ComponentCommonTupleScheme();
     }
@@ -783,7 +794,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, ComponentCommon struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map36 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map36 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT); 
         struct.inputs = new java.util.HashMap<GlobalStreamId,Grouping>(2*_map36.size);
         @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key37;
         @org.apache.storm.thrift.annotation.Nullable Grouping _val38;
@@ -798,7 +809,7 @@ public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentC
       }
       struct.set_inputs_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map40 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map40 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT); 
         struct.streams = new java.util.HashMap<java.lang.String,StreamInfo>(2*_map40.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key41;
         @org.apache.storm.thrift.annotation.Nullable StreamInfo _val42;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
index 599df7b04..491d95d62 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObject, ComponentObject._Fields> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentObject");
   private static final org.apache.storm.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("serialized_java", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
@@ -88,10 +88,12 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
   public ComponentObject(ComponentObject other) {
     super(other);
   }
+  @Override
   public ComponentObject deepCopy() {
     return new ComponentObject(this);
   }
@@ -308,6 +311,7 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -332,9 +336,8 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
   }
 
   public void set_serialized_java(java.nio.ByteBuffer value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.SERIALIZED_JAVA;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.SERIALIZED_JAVA");
   }
 
   public ShellComponent get_shell() {
@@ -346,9 +349,8 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
   }
 
   public void set_shell(ShellComponent value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.SHELL;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.SHELL");
   }
 
   public JavaObject get_java_object() {
@@ -360,9 +362,8 @@ public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObj
   }
 
   public void set_java_object(JavaObject value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.JAVA_OBJECT;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.JAVA_OBJECT");
   }
 
   public boolean is_set_serialized_java() {
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
index 44700bb31..a719e087c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ComponentPageInfo implements org.apache.storm.thrift.TBase<ComponentPageInfo, ComponentPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentPageInfo> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentPageInfo");
 
@@ -165,10 +165,12 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -335,6 +337,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
     }
   }
 
+  @Override
   public ComponentPageInfo deepCopy() {
     return new ComponentPageInfo(this);
   }
@@ -824,6 +827,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPONENT_ID:
@@ -958,6 +962,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPONENT_ID:
@@ -1013,6 +1018,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1057,8 +1063,6 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ComponentPageInfo)
       return this.equals((ComponentPageInfo)that);
     return false;
@@ -1296,7 +1300,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id());
+    lastComparison = java.lang.Boolean.compare(is_set_component_id(), other.is_set_component_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1306,7 +1310,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_component_type()).compareTo(other.is_set_component_type());
+    lastComparison = java.lang.Boolean.compare(is_set_component_type(), other.is_set_component_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1316,7 +1320,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_id(), other.is_set_topology_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1326,7 +1330,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_name()).compareTo(other.is_set_topology_name());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_name(), other.is_set_topology_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1336,7 +1340,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
+    lastComparison = java.lang.Boolean.compare(is_set_num_executors(), other.is_set_num_executors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1346,7 +1350,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks());
+    lastComparison = java.lang.Boolean.compare(is_set_num_tasks(), other.is_set_num_tasks());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1356,7 +1360,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_window_to_stats()).compareTo(other.is_set_window_to_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_window_to_stats(), other.is_set_window_to_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1366,7 +1370,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_gsid_to_input_stats()).compareTo(other.is_set_gsid_to_input_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_gsid_to_input_stats(), other.is_set_gsid_to_input_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1376,7 +1380,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_sid_to_output_stats()).compareTo(other.is_set_sid_to_output_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_sid_to_output_stats(), other.is_set_sid_to_output_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1386,7 +1390,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_exec_stats()).compareTo(other.is_set_exec_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_exec_stats(), other.is_set_exec_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1396,7 +1400,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_errors()).compareTo(other.is_set_errors());
+    lastComparison = java.lang.Boolean.compare(is_set_errors(), other.is_set_errors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1406,7 +1410,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_eventlog_host()).compareTo(other.is_set_eventlog_host());
+    lastComparison = java.lang.Boolean.compare(is_set_eventlog_host(), other.is_set_eventlog_host());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1416,7 +1420,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_eventlog_port()).compareTo(other.is_set_eventlog_port());
+    lastComparison = java.lang.Boolean.compare(is_set_eventlog_port(), other.is_set_eventlog_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1426,7 +1430,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_debug_options()).compareTo(other.is_set_debug_options());
+    lastComparison = java.lang.Boolean.compare(is_set_debug_options(), other.is_set_debug_options());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1436,7 +1440,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_status()).compareTo(other.is_set_topology_status());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_status(), other.is_set_topology_status());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1446,7 +1450,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map());
+    lastComparison = java.lang.Boolean.compare(is_set_resources_map(), other.is_set_resources_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1460,14 +1464,17 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1659,6 +1666,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
   }
 
   private static class ComponentPageInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentPageInfoStandardScheme getScheme() {
       return new ComponentPageInfoStandardScheme();
     }
@@ -1666,6 +1674,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
 
   private static class ComponentPageInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentPageInfo> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentPageInfo struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -1888,6 +1897,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentPageInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -2047,6 +2057,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
   }
 
   private static class ComponentPageInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ComponentPageInfoTupleScheme getScheme() {
       return new ComponentPageInfoTupleScheme();
     }
@@ -2213,7 +2224,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(4)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map594 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map594 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT); 
           struct.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map594.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key595;
           @org.apache.storm.thrift.annotation.Nullable ComponentAggregateStats _val596;
@@ -2229,7 +2240,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(5)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map598 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map598 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT); 
           struct.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map598.size);
           @org.apache.storm.thrift.annotation.Nullable GlobalStreamId _key599;
           @org.apache.storm.thrift.annotation.Nullable ComponentAggregateStats _val600;
@@ -2246,7 +2257,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(6)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map602 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map602 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT); 
           struct.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map602.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key603;
           @org.apache.storm.thrift.annotation.Nullable ComponentAggregateStats _val604;
@@ -2262,7 +2273,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(7)) {
         {
-          org.apache.storm.thrift.protocol.TList _list606 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list606 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
           struct.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(_list606.size);
           @org.apache.storm.thrift.annotation.Nullable ExecutorAggregateStats _elem607;
           for (int _i608 = 0; _i608 < _list606.size; ++_i608)
@@ -2276,7 +2287,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(8)) {
         {
-          org.apache.storm.thrift.protocol.TList _list609 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list609 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
           struct.errors = new java.util.ArrayList<ErrorInfo>(_list609.size);
           @org.apache.storm.thrift.annotation.Nullable ErrorInfo _elem610;
           for (int _i611 = 0; _i611 < _list609.size; ++_i611)
@@ -2307,7 +2318,7 @@ public class ComponentPageInfo implements org.apache.storm.thrift.TBase<Componen
       }
       if (incoming.get(13)) {
         {
-          org.apache.storm.thrift.protocol.TMap _map612 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map612 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE); 
           struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map612.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _key613;
           double _val614;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
index d9b6f39ba..008d9788a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public enum ComponentType implements org.apache.storm.thrift.TEnum {
   BOLT(1),
   SPOUT(2);
@@ -38,6 +38,7 @@ public enum ComponentType implements org.apache.storm.thrift.TEnum {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java b/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
index e249607cc..0cfc3b10e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class Credentials implements org.apache.storm.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Credentials");
 
@@ -91,10 +91,12 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
     }
   }
 
+  @Override
   public Credentials deepCopy() {
     return new Credentials(this);
   }
@@ -207,6 +210,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CREDS:
@@ -229,6 +233,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CREDS:
@@ -242,6 +247,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -258,8 +264,6 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof Credentials)
       return this.equals((Credentials)that);
     return false;
@@ -315,7 +319,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds());
+    lastComparison = java.lang.Boolean.compare(is_set_creds(), other.is_set_creds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -325,7 +329,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topoOwner()).compareTo(other.is_set_topoOwner());
+    lastComparison = java.lang.Boolean.compare(is_set_topoOwner(), other.is_set_topoOwner());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -339,14 +343,17 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +410,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
   }
 
   private static class CredentialsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public CredentialsStandardScheme getScheme() {
       return new CredentialsStandardScheme();
     }
@@ -410,6 +418,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
 
   private static class CredentialsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Credentials> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Credentials struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -457,6 +466,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Credentials struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -488,6 +498,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
   }
 
   private static class CredentialsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public CredentialsTupleScheme getScheme() {
       return new CredentialsTupleScheme();
     }
@@ -520,7 +531,7 @@ public class Credentials implements org.apache.storm.thrift.TBase<Credentials, C
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map652 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map652 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING); 
         struct.creds = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map652.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key653;
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _val654;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
index 8cf25c3a2..f1a015d7a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public enum DRPCExceptionType implements org.apache.storm.thrift.TEnum {
   INTERNAL_ERROR(0),
   SERVER_SHUTDOWN(1),
@@ -40,6 +40,7 @@ public enum DRPCExceptionType implements org.apache.storm.thrift.TEnum {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
index 142235877..394d617d5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class DRPCExecutionException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DRPCExecutionException");
 
@@ -95,10 +95,12 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -139,6 +141,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
     }
   }
 
+  @Override
   public DRPCExecutionException deepCopy() {
     return new DRPCExecutionException(this);
   }
@@ -205,6 +208,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -227,6 +231,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -240,6 +245,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -256,8 +262,6 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof DRPCExecutionException)
       return this.equals((DRPCExecutionException)that);
     return false;
@@ -313,7 +317,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -323,7 +327,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_type()).compareTo(other.is_set_type());
+    lastComparison = java.lang.Boolean.compare(is_set_type(), other.is_set_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -337,14 +341,17 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -401,6 +408,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
   }
 
   private static class DRPCExecutionExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DRPCExecutionExceptionStandardScheme getScheme() {
       return new DRPCExecutionExceptionStandardScheme();
     }
@@ -408,6 +416,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
 
   private static class DRPCExecutionExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DRPCExecutionException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DRPCExecutionException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -443,6 +452,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -466,6 +476,7 @@ public class DRPCExecutionException extends org.apache.storm.thrift.TException i
   }
 
   private static class DRPCExecutionExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DRPCExecutionExceptionTupleScheme getScheme() {
       return new DRPCExecutionExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java
index d46aac982..d15811594 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DRPCRequest");
 
@@ -91,10 +91,12 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -136,6 +138,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
     }
   }
 
+  @Override
   public DRPCRequest deepCopy() {
     return new DRPCRequest(this);
   }
@@ -194,6 +197,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FUNC_ARGS:
@@ -216,6 +220,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FUNC_ARGS:
@@ -229,6 +234,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -245,8 +251,6 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof DRPCRequest)
       return this.equals((DRPCRequest)that);
     return false;
@@ -302,7 +306,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_func_args()).compareTo(other.is_set_func_args());
+    lastComparison = java.lang.Boolean.compare(is_set_func_args(), other.is_set_func_args());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -312,7 +316,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_request_id()).compareTo(other.is_set_request_id());
+    lastComparison = java.lang.Boolean.compare(is_set_request_id(), other.is_set_request_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -326,14 +330,17 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -392,6 +399,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
   }
 
   private static class DRPCRequestStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DRPCRequestStandardScheme getScheme() {
       return new DRPCRequestStandardScheme();
     }
@@ -399,6 +407,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
 
   private static class DRPCRequestStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DRPCRequest> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DRPCRequest struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -434,6 +443,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DRPCRequest struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -455,6 +465,7 @@ public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, D
   }
 
   private static class DRPCRequestTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DRPCRequestTupleScheme getScheme() {
       return new DRPCRequestTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java b/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java
index c59335829..7f24bfdf3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions, DebugOptions._Fields>, java.io.Serializable, Cloneable, Comparable<DebugOptions> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DebugOptions");
 
@@ -91,10 +91,12 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,6 +130,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
     this.samplingpct = other.samplingpct;
   }
 
+  @Override
   public DebugOptions deepCopy() {
     return new DebugOptions(this);
   }
@@ -184,6 +187,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ENABLE:
@@ -206,6 +210,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ENABLE:
@@ -219,6 +224,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -235,8 +241,6 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof DebugOptions)
       return this.equals((DebugOptions)that);
     return false;
@@ -292,7 +296,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_enable()).compareTo(other.is_set_enable());
+    lastComparison = java.lang.Boolean.compare(is_set_enable(), other.is_set_enable());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -302,7 +306,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_samplingpct()).compareTo(other.is_set_samplingpct());
+    lastComparison = java.lang.Boolean.compare(is_set_samplingpct(), other.is_set_samplingpct());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -316,14 +320,17 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -372,6 +379,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
   }
 
   private static class DebugOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DebugOptionsStandardScheme getScheme() {
       return new DebugOptionsStandardScheme();
     }
@@ -379,6 +387,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
 
   private static class DebugOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DebugOptions> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DebugOptions struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -414,6 +423,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DebugOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -435,6 +445,7 @@ public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions,
   }
 
   private static class DebugOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public DebugOptionsTupleScheme getScheme() {
       return new DebugOptionsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
index 064c6258b..33a74d3f3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.storm.generated;
 
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
 public class DistributedRPC {
 
   public interface Iface {
@@ -42,9 +42,11 @@ public class DistributedRPC {
   public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
+      @Override
       public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
+      @Override
       public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
@@ -59,6 +61,7 @@ public class DistributedRPC {
       super(iprot, oprot);
     }
 
+    @Override
     public java.lang.String execute(java.lang.String functionName, java.lang.String funcArgs) throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_execute(functionName, funcArgs);
@@ -98,6 +101,7 @@ public class DistributedRPC {
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
+    @Override
       public AsyncClient getAsyncClient(org.apache.storm.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
@@ -107,6 +111,7 @@ public class DistributedRPC {
       super(protocolFactory, clientManager, transport);
     }
 
+    @Override
     public void execute(java.lang.String functionName, java.lang.String funcArgs, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       execute_call method_call = new execute_call(functionName, funcArgs, resultHandler, this, ___protocolFactory, ___transport);
@@ -123,6 +128,7 @@ public class DistributedRPC {
         this.funcArgs = funcArgs;
       }
 
+      @Override
       public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
         prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("execute", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         execute_args args = new execute_args();
@@ -132,6 +138,7 @@ public class DistributedRPC {
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException {
         if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -164,10 +171,12 @@ public class DistributedRPC {
         super("execute");
       }
 
+      @Override
       public execute_args getEmptyArgsInstance() {
         return new execute_args();
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
@@ -177,6 +186,7 @@ public class DistributedRPC {
         return false;
       }
 
+      @Override
       public execute_result getResult(I iface, execute_args args) throws org.apache.storm.thrift.TException {
         execute_result result = new execute_result();
         try {
@@ -212,13 +222,16 @@ public class DistributedRPC {
         super("execute");
       }
 
+      @Override
       public execute_args getEmptyArgsInstance() {
         return new execute_args();
       }
 
+      @Override
       public org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             execute_result result = new execute_result();
             result.success = o;
@@ -232,6 +245,7 @@ public class DistributedRPC {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
             org.apache.storm.thrift.TSerializable msg;
@@ -267,10 +281,12 @@ public class DistributedRPC {
         };
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, execute_args args, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException {
         iface.execute(args.functionName, args.funcArgs,resultHandler);
       }
@@ -278,6 +294,7 @@ public class DistributedRPC {
 
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class execute_args implements org.apache.storm.thrift.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable, Comparable<execute_args>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("execute_args");
 
@@ -344,10 +361,12 @@ public class DistributedRPC {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -389,6 +408,7 @@ public class DistributedRPC {
       }
     }
 
+    @Override
     public execute_args deepCopy() {
       return new execute_args(this);
     }
@@ -447,6 +467,7 @@ public class DistributedRPC {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case FUNCTION_NAME:
@@ -469,6 +490,7 @@ public class DistributedRPC {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case FUNCTION_NAME:
@@ -482,6 +504,7 @@ public class DistributedRPC {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -498,8 +521,6 @@ public class DistributedRPC {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof execute_args)
         return this.equals((execute_args)that);
       return false;
@@ -555,7 +576,7 @@ public class DistributedRPC {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_functionName()).compareTo(other.is_set_functionName());
+      lastComparison = java.lang.Boolean.compare(is_set_functionName(), other.is_set_functionName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -565,7 +586,7 @@ public class DistributedRPC {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_funcArgs()).compareTo(other.is_set_funcArgs());
+      lastComparison = java.lang.Boolean.compare(is_set_funcArgs(), other.is_set_funcArgs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -579,14 +600,17 @@ public class DistributedRPC {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -637,6 +661,7 @@ public class DistributedRPC {
     }
 
     private static class execute_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public execute_argsStandardScheme getScheme() {
         return new execute_argsStandardScheme();
       }
@@ -644,6 +669,7 @@ public class DistributedRPC {
 
     private static class execute_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<execute_args> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, execute_args struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -679,6 +705,7 @@ public class DistributedRPC {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, execute_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -700,6 +727,7 @@ public class DistributedRPC {
     }
 
     private static class execute_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public execute_argsTupleScheme getScheme() {
         return new execute_argsTupleScheme();
       }
@@ -746,6 +774,7 @@ public class DistributedRPC {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class execute_result implements org.apache.storm.thrift.TBase<execute_result, execute_result._Fields>, java.io.Serializable, Cloneable, Comparable<execute_result>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("execute_result");
 
@@ -817,10 +846,12 @@ public class DistributedRPC {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -869,6 +900,7 @@ public class DistributedRPC {
       }
     }
 
+    @Override
     public execute_result deepCopy() {
       return new execute_result(this);
     }
@@ -952,6 +984,7 @@ public class DistributedRPC {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -982,6 +1015,7 @@ public class DistributedRPC {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -998,6 +1032,7 @@ public class DistributedRPC {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -1016,8 +1051,6 @@ public class DistributedRPC {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof execute_result)
         return this.equals((execute_result)that);
       return false;
@@ -1086,7 +1119,7 @@ public class DistributedRPC {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_success()).compareTo(other.is_set_success());
+      lastComparison = java.lang.Boolean.compare(is_set_success(), other.is_set_success());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1096,7 +1129,7 @@ public class DistributedRPC {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_e()).compareTo(other.is_set_e());
+      lastComparison = java.lang.Boolean.compare(is_set_e(), other.is_set_e());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1106,7 +1139,7 @@ public class DistributedRPC {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+      lastComparison = java.lang.Boolean.compare(is_set_aze(), other.is_set_aze());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1120,10 +1153,12 @@ public class DistributedRPC {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -1186,6 +1221,7 @@ public class DistributedRPC {
     }
 
     private static class execute_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public execute_resultStandardScheme getScheme() {
         return new execute_resultStandardScheme();
       }
@@ -1193,6 +1229,7 @@ public class DistributedRPC {
 
     private static class execute_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<execute_result> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, execute_result struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -1238,6 +1275,7 @@ public class DistributedRPC {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, execute_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -1264,6 +1302,7 @@ public class DistributedRPC {
     }
 
     private static class execute_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public execute_resultTupleScheme getScheme() {
         return new execute_resultTupleScheme();
       }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
index b9ef78fef..1bfbb0ae3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.storm.generated;
 
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
 public class DistributedRPCInvocations {
 
   public interface Iface {
@@ -54,9 +54,11 @@ public class DistributedRPCInvocations {
   public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
+      @Override
       public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
+      @Override
       public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
@@ -71,6 +73,7 @@ public class DistributedRPCInvocations {
       super(iprot, oprot);
     }
 
+    @Override
     public void result(java.lang.String id, java.lang.String result) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_result(id, result);
@@ -95,6 +98,7 @@ public class DistributedRPCInvocations {
       return;
     }
 
+    @Override
     public DRPCRequest fetchRequest(java.lang.String functionName) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_fetchRequest(functionName);
@@ -121,6 +125,7 @@ public class DistributedRPCInvocations {
       throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result");
     }
 
+    @Override
     public void failRequest(java.lang.String id) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_failRequest(id);
@@ -144,6 +149,7 @@ public class DistributedRPCInvocations {
       return;
     }
 
+    @Override
     public void failRequestV2(java.lang.String id, DRPCExecutionException e) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_failRequestV2(id, e);
@@ -177,6 +183,7 @@ public class DistributedRPCInvocations {
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
+    @Override
       public AsyncClient getAsyncClient(org.apache.storm.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
@@ -186,6 +193,7 @@ public class DistributedRPCInvocations {
       super(protocolFactory, clientManager, transport);
     }
 
+    @Override
     public void result(java.lang.String id, java.lang.String result, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       result_call method_call = new result_call(id, result, resultHandler, this, ___protocolFactory, ___transport);
@@ -202,6 +210,7 @@ public class DistributedRPCInvocations {
         this.result = result;
       }
 
+      @Override
       public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
         prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("result", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         result_args args = new result_args();
@@ -211,16 +220,19 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
         if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_result();
         return null;
       }
     }
 
+    @Override
     public void fetchRequest(java.lang.String functionName, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       fetchRequest_call method_call = new fetchRequest_call(functionName, resultHandler, this, ___protocolFactory, ___transport);
@@ -235,6 +247,7 @@ public class DistributedRPCInvocations {
         this.functionName = functionName;
       }
 
+      @Override
       public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
         prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("fetchRequest", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         fetchRequest_args args = new fetchRequest_args();
@@ -243,6 +256,7 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
+      @Override
       public DRPCRequest getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
         if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -253,6 +267,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void failRequest(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       failRequest_call method_call = new failRequest_call(id, resultHandler, this, ___protocolFactory, ___transport);
@@ -267,6 +282,7 @@ public class DistributedRPCInvocations {
         this.id = id;
       }
 
+      @Override
       public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
         prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("failRequest", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         failRequest_args args = new failRequest_args();
@@ -275,16 +291,19 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
         if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_failRequest();
         return null;
       }
     }
 
+    @Override
     public void failRequestV2(java.lang.String id, DRPCExecutionException e, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       failRequestV2_call method_call = new failRequestV2_call(id, e, resultHandler, this, ___protocolFactory, ___transport);
@@ -301,6 +320,7 @@ public class DistributedRPCInvocations {
         this.e = e;
       }
 
+      @Override
       public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
         prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("failRequestV2", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         failRequestV2_args args = new failRequestV2_args();
@@ -310,12 +330,14 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
         if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_failRequestV2();
         return null;
       }
     }
@@ -345,10 +367,12 @@ public class DistributedRPCInvocations {
         super("result");
       }
 
+      @Override
       public result_args getEmptyArgsInstance() {
         return new result_args();
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
@@ -358,6 +382,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
+      @Override
       public result_result getResult(I iface, result_args args) throws org.apache.storm.thrift.TException {
         result_result result = new result_result();
         try {
@@ -374,10 +399,12 @@ public class DistributedRPCInvocations {
         super("fetchRequest");
       }
 
+      @Override
       public fetchRequest_args getEmptyArgsInstance() {
         return new fetchRequest_args();
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
@@ -387,6 +414,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
+      @Override
       public fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.storm.thrift.TException {
         fetchRequest_result result = new fetchRequest_result();
         try {
@@ -403,10 +431,12 @@ public class DistributedRPCInvocations {
         super("failRequest");
       }
 
+      @Override
       public failRequest_args getEmptyArgsInstance() {
         return new failRequest_args();
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
@@ -416,6 +446,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
+      @Override
       public failRequest_result getResult(I iface, failRequest_args args) throws org.apache.storm.thrift.TException {
         failRequest_result result = new failRequest_result();
         try {
@@ -432,10 +463,12 @@ public class DistributedRPCInvocations {
         super("failRequestV2");
       }
 
+      @Override
       public failRequestV2_args getEmptyArgsInstance() {
         return new failRequestV2_args();
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
@@ -445,6 +478,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
+      @Override
       public failRequestV2_result getResult(I iface, failRequestV2_args args) throws org.apache.storm.thrift.TException {
         failRequestV2_result result = new failRequestV2_result();
         try {
@@ -481,13 +515,16 @@ public class DistributedRPCInvocations {
         super("result");
       }
 
+      @Override
       public result_args getEmptyArgsInstance() {
         return new result_args();
       }
 
+      @Override
       public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
+          @Override
           public void onComplete(Void o) {
             result_result result = new result_result();
             try {
@@ -500,6 +537,7 @@ public class DistributedRPCInvocations {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
             org.apache.storm.thrift.TSerializable msg;
@@ -531,10 +569,12 @@ public class DistributedRPCInvocations {
         };
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, result_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.result(args.id, args.result,resultHandler);
       }
@@ -545,13 +585,16 @@ public class DistributedRPCInvocations {
         super("fetchRequest");
       }
 
+      @Override
       public fetchRequest_args getEmptyArgsInstance() {
         return new fetchRequest_args();
       }
 
+      @Override
       public org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest>() { 
+          @Override
           public void onComplete(DRPCRequest o) {
             fetchRequest_result result = new fetchRequest_result();
             result.success = o;
@@ -565,6 +608,7 @@ public class DistributedRPCInvocations {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
             org.apache.storm.thrift.TSerializable msg;
@@ -596,10 +640,12 @@ public class DistributedRPCInvocations {
         };
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, fetchRequest_args args, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.storm.thrift.TException {
         iface.fetchRequest(args.functionName,resultHandler);
       }
@@ -610,13 +656,16 @@ public class DistributedRPCInvocations {
         super("failRequest");
       }
 
+      @Override
       public failRequest_args getEmptyArgsInstance() {
         return new failRequest_args();
       }
 
+      @Override
       public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
+          @Override
           public void onComplete(Void o) {
             failRequest_result result = new failRequest_result();
             try {
@@ -629,6 +678,7 @@ public class DistributedRPCInvocations {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
             org.apache.storm.thrift.TSerializable msg;
@@ -660,10 +710,12 @@ public class DistributedRPCInvocations {
         };
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, failRequest_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.failRequest(args.id,resultHandler);
       }
@@ -674,13 +726,16 @@ public class DistributedRPCInvocations {
         super("failRequestV2");
       }
 
+      @Override
       public failRequestV2_args getEmptyArgsInstance() {
         return new failRequestV2_args();
       }
 
+      @Override
       public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
+          @Override
           public void onComplete(Void o) {
             failRequestV2_result result = new failRequestV2_result();
             try {
@@ -693,6 +748,7 @@ public class DistributedRPCInvocations {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
             org.apache.storm.thrift.TSerializable msg;
@@ -724,10 +780,12 @@ public class DistributedRPCInvocations {
         };
       }
 
+      @Override
       protected boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, failRequestV2_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.failRequestV2(args.id, args.e,resultHandler);
       }
@@ -735,6 +793,7 @@ public class DistributedRPCInvocations {
 
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class result_args implements org.apache.storm.thrift.TBase<result_args, result_args._Fields>, java.io.Serializable, Cloneable, Comparable<result_args>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("result_args");
 
@@ -801,10 +860,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -846,6 +907,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public result_args deepCopy() {
       return new result_args(this);
     }
@@ -904,6 +966,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ID:
@@ -926,6 +989,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ID:
@@ -939,6 +1003,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -955,8 +1020,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof result_args)
         return this.equals((result_args)that);
       return false;
@@ -1012,7 +1075,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+      lastComparison = java.lang.Boolean.compare(is_set_id(), other.is_set_id());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1022,7 +1085,7 @@ public class DistributedRPCInvocations {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_result()).compareTo(other.is_set_result());
+      lastComparison = java.lang.Boolean.compare(is_set_result(), other.is_set_result());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1036,14 +1099,17 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -1094,6 +1160,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class result_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public result_argsStandardScheme getScheme() {
         return new result_argsStandardScheme();
       }
@@ -1101,6 +1168,7 @@ public class DistributedRPCInvocations {
 
     private static class result_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<result_args> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, result_args struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -1136,6 +1204,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, result_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -1157,6 +1226,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class result_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public result_argsTupleScheme getScheme() {
         return new result_argsTupleScheme();
       }
@@ -1203,6 +1273,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class result_result implements org.apache.storm.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable, Comparable<result_result>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("result_result");
 
@@ -1264,10 +1335,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -1302,6 +1375,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public result_result deepCopy() {
       return new result_result(this);
     }
@@ -1335,6 +1409,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AZE:
@@ -1349,6 +1424,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AZE:
@@ -1359,6 +1435,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -1373,8 +1450,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof result_result)
         return this.equals((result_result)that);
       return false;
@@ -1417,7 +1492,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+      lastComparison = java.lang.Boolean.compare(is_set_aze(), other.is_set_aze());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1431,10 +1506,12 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -1481,6 +1558,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class result_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public result_resultStandardScheme getScheme() {
         return new result_resultStandardScheme();
       }
@@ -1488,6 +1566,7 @@ public class DistributedRPCInvocations {
 
     private static class result_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<result_result> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, result_result struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -1516,6 +1595,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, result_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -1532,6 +1612,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class result_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public result_resultTupleScheme getScheme() {
         return new result_resultTupleScheme();
       }
@@ -1569,6 +1650,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class fetchRequest_args implements org.apache.storm.thrift.TBase<fetchRequest_args, fetchRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_args>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("fetchRequest_args");
 
@@ -1630,10 +1712,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -1668,6 +1752,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public fetchRequest_args deepCopy() {
       return new fetchRequest_args(this);
     }
@@ -1701,6 +1786,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case FUNCTION_NAME:
@@ -1715,6 +1801,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case FUNCTION_NAME:
@@ -1725,6 +1812,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -1739,8 +1827,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof fetchRequest_args)
         return this.equals((fetchRequest_args)that);
       return false;
@@ -1783,7 +1869,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_functionName()).compareTo(other.is_set_functionName());
+      lastComparison = java.lang.Boolean.compare(is_set_functionName(), other.is_set_functionName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1797,14 +1883,17 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -1847,6 +1936,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class fetchRequest_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public fetchRequest_argsStandardScheme getScheme() {
         return new fetchRequest_argsStandardScheme();
       }
@@ -1854,6 +1944,7 @@ public class DistributedRPCInvocations {
 
     private static class fetchRequest_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<fetchRequest_args> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, fetchRequest_args struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -1881,6 +1972,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, fetchRequest_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -1897,6 +1989,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class fetchRequest_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public fetchRequest_argsTupleScheme getScheme() {
         return new fetchRequest_argsTupleScheme();
       }
@@ -1933,6 +2026,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class fetchRequest_result implements org.apache.storm.thrift.TBase<fetchRequest_result, fetchRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_result>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("fetchRequest_result");
 
@@ -1999,10 +2093,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -2044,6 +2140,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public fetchRequest_result deepCopy() {
       return new fetchRequest_result(this);
     }
@@ -2102,6 +2199,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -2124,6 +2222,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -2137,6 +2236,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -2153,8 +2253,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof fetchRequest_result)
         return this.equals((fetchRequest_result)that);
       return false;
@@ -2210,7 +2308,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_success()).compareTo(other.is_set_success());
+      lastComparison = java.lang.Boolean.compare(is_set_success(), other.is_set_success());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2220,7 +2318,7 @@ public class DistributedRPCInvocations {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+      lastComparison = java.lang.Boolean.compare(is_set_aze(), other.is_set_aze());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2234,10 +2332,12 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -2295,6 +2395,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class fetchRequest_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public fetchRequest_resultStandardScheme getScheme() {
         return new fetchRequest_resultStandardScheme();
       }
@@ -2302,6 +2403,7 @@ public class DistributedRPCInvocations {
 
     private static class fetchRequest_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<fetchRequest_result> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, fetchRequest_result struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -2339,6 +2441,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, fetchRequest_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -2360,6 +2463,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class fetchRequest_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public fetchRequest_resultTupleScheme getScheme() {
         return new fetchRequest_resultTupleScheme();
       }
@@ -2408,6 +2512,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class failRequest_args implements org.apache.storm.thrift.TBase<failRequest_args, failRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<failRequest_args>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("failRequest_args");
 
@@ -2469,10 +2574,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -2507,6 +2614,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public failRequest_args deepCopy() {
       return new failRequest_args(this);
     }
@@ -2540,6 +2648,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ID:
@@ -2554,6 +2663,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ID:
@@ -2564,6 +2674,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -2578,8 +2689,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof failRequest_args)
         return this.equals((failRequest_args)that);
       return false;
@@ -2622,7 +2731,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+      lastComparison = java.lang.Boolean.compare(is_set_id(), other.is_set_id());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2636,14 +2745,17 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -2686,6 +2798,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequest_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequest_argsStandardScheme getScheme() {
         return new failRequest_argsStandardScheme();
       }
@@ -2693,6 +2806,7 @@ public class DistributedRPCInvocations {
 
     private static class failRequest_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<failRequest_args> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, failRequest_args struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -2720,6 +2834,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, failRequest_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -2736,6 +2851,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequest_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequest_argsTupleScheme getScheme() {
         return new failRequest_argsTupleScheme();
       }
@@ -2772,6 +2888,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class failRequest_result implements org.apache.storm.thrift.TBase<failRequest_result, failRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<failRequest_result>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("failRequest_result");
 
@@ -2833,10 +2950,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -2871,6 +2990,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public failRequest_result deepCopy() {
       return new failRequest_result(this);
     }
@@ -2904,6 +3024,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AZE:
@@ -2918,6 +3039,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AZE:
@@ -2928,6 +3050,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -2942,8 +3065,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof failRequest_result)
         return this.equals((failRequest_result)that);
       return false;
@@ -2986,7 +3107,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+      lastComparison = java.lang.Boolean.compare(is_set_aze(), other.is_set_aze());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3000,10 +3121,12 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -3050,6 +3173,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequest_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequest_resultStandardScheme getScheme() {
         return new failRequest_resultStandardScheme();
       }
@@ -3057,6 +3181,7 @@ public class DistributedRPCInvocations {
 
     private static class failRequest_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<failRequest_result> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, failRequest_result struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -3085,6 +3210,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, failRequest_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -3101,6 +3227,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequest_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequest_resultTupleScheme getScheme() {
         return new failRequest_resultTupleScheme();
       }
@@ -3138,6 +3265,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class failRequestV2_args implements org.apache.storm.thrift.TBase<failRequestV2_args, failRequestV2_args._Fields>, java.io.Serializable, Cloneable, Comparable<failRequestV2_args>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("failRequestV2_args");
 
@@ -3204,10 +3332,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -3249,6 +3379,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public failRequestV2_args deepCopy() {
       return new failRequestV2_args(this);
     }
@@ -3307,6 +3438,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ID:
@@ -3329,6 +3461,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ID:
@@ -3342,6 +3475,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -3358,8 +3492,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof failRequestV2_args)
         return this.equals((failRequestV2_args)that);
       return false;
@@ -3415,7 +3547,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+      lastComparison = java.lang.Boolean.compare(is_set_id(), other.is_set_id());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3425,7 +3557,7 @@ public class DistributedRPCInvocations {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(is_set_e()).compareTo(other.is_set_e());
+      lastComparison = java.lang.Boolean.compare(is_set_e(), other.is_set_e());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3439,14 +3571,17 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -3497,6 +3632,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequestV2_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequestV2_argsStandardScheme getScheme() {
         return new failRequestV2_argsStandardScheme();
       }
@@ -3504,6 +3640,7 @@ public class DistributedRPCInvocations {
 
     private static class failRequestV2_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<failRequestV2_args> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, failRequestV2_args struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -3540,6 +3677,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, failRequestV2_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -3561,6 +3699,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequestV2_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequestV2_argsTupleScheme getScheme() {
         return new failRequestV2_argsTupleScheme();
       }
@@ -3608,6 +3747,7 @@ public class DistributedRPCInvocations {
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   public static class failRequestV2_result implements org.apache.storm.thrift.TBase<failRequestV2_result, failRequestV2_result._Fields>, java.io.Serializable, Cloneable, Comparable<failRequestV2_result>   {
     private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("failRequestV2_result");
 
@@ -3669,10 +3809,12 @@ public class DistributedRPCInvocations {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -3707,6 +3849,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public failRequestV2_result deepCopy() {
       return new failRequestV2_result(this);
     }
@@ -3740,6 +3883,7 @@ public class DistributedRPCInvocations {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AZE:
@@ -3754,6 +3898,7 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AZE:
@@ -3764,6 +3909,7 @@ public class DistributedRPCInvocations {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -3778,8 +3924,6 @@ public class DistributedRPCInvocations {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof failRequestV2_result)
         return this.equals((failRequestV2_result)that);
       return false;
@@ -3822,7 +3966,7 @@ public class DistributedRPCInvocations {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+      lastComparison = java.lang.Boolean.compare(is_set_aze(), other.is_set_aze());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3836,10 +3980,12 @@ public class DistributedRPCInvocations {
     }
 
     @org.apache.storm.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -3886,6 +4032,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequestV2_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequestV2_resultStandardScheme getScheme() {
         return new failRequestV2_resultStandardScheme();
       }
@@ -3893,6 +4040,7 @@ public class DistributedRPCInvocations {
 
     private static class failRequestV2_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<failRequestV2_result> {
 
+      @Override
       public void read(org.apache.storm.thrift.protocol.TProtocol iprot, failRequestV2_result struct) throws org.apache.storm.thrift.TException {
         org.apache.storm.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
@@ -3921,6 +4069,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
+      @Override
       public void write(org.apache.storm.thrift.protocol.TProtocol oprot, failRequestV2_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
@@ -3937,6 +4086,7 @@ public class DistributedRPCInvocations {
     }
 
     private static class failRequestV2_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+      @Override
       public failRequestV2_resultTupleScheme getScheme() {
         return new failRequestV2_resultTupleScheme();
       }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
index 9715dbc46..edfb7b321 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ErrorInfo");
 
@@ -101,10 +101,12 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -158,6 +160,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
     this.port = other.port;
   }
 
+  @Override
   public ErrorInfo deepCopy() {
     return new ErrorInfo(this);
   }
@@ -264,6 +267,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ERROR:
@@ -302,6 +306,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ERROR:
@@ -321,6 +326,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -341,8 +347,6 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ErrorInfo)
       return this.equals((ErrorInfo)that);
     return false;
@@ -422,7 +426,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_error()).compareTo(other.is_set_error());
+    lastComparison = java.lang.Boolean.compare(is_set_error(), other.is_set_error());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -432,7 +436,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_error_time_secs()).compareTo(other.is_set_error_time_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_error_time_secs(), other.is_set_error_time_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -442,7 +446,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
+    lastComparison = java.lang.Boolean.compare(is_set_host(), other.is_set_host());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,7 +456,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
+    lastComparison = java.lang.Boolean.compare(is_set_port(), other.is_set_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -466,14 +470,17 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -546,6 +553,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
   }
 
   private static class ErrorInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ErrorInfoStandardScheme getScheme() {
       return new ErrorInfoStandardScheme();
     }
@@ -553,6 +561,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
 
   private static class ErrorInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ErrorInfo> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ErrorInfo struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -604,6 +613,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ErrorInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -635,6 +645,7 @@ public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, Error
   }
 
   private static class ErrorInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ErrorInfoTupleScheme getScheme() {
       return new ErrorInfoTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java
index f6257e898..519bc6119 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<ExecutorAggregateStats, ExecutorAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorAggregateStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorAggregateStats");
 
@@ -91,10 +91,12 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,6 +130,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
     }
   }
 
+  @Override
   public ExecutorAggregateStats deepCopy() {
     return new ExecutorAggregateStats(this);
   }
@@ -186,6 +189,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EXEC_SUMMARY:
@@ -208,6 +212,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXEC_SUMMARY:
@@ -221,6 +226,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -237,8 +243,6 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ExecutorAggregateStats)
       return this.equals((ExecutorAggregateStats)that);
     return false;
@@ -294,7 +298,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_exec_summary()).compareTo(other.is_set_exec_summary());
+    lastComparison = java.lang.Boolean.compare(is_set_exec_summary(), other.is_set_exec_summary());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -304,7 +308,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_stats()).compareTo(other.is_set_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_stats(), other.is_set_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -318,14 +322,17 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -386,6 +393,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
   }
 
   private static class ExecutorAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorAggregateStatsStandardScheme getScheme() {
       return new ExecutorAggregateStatsStandardScheme();
     }
@@ -393,6 +401,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
 
   private static class ExecutorAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorAggregateStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorAggregateStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -430,6 +439,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -455,6 +465,7 @@ public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<Exe
   }
 
   private static class ExecutorAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorAggregateStatsTupleScheme getScheme() {
       return new ExecutorAggregateStatsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java
index 55b09f82e..bf1eda758 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorInfo");
 
@@ -91,10 +91,12 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
     this.task_end = other.task_end;
   }
 
+  @Override
   public ExecutorInfo deepCopy() {
     return new ExecutorInfo(this);
   }
@@ -194,6 +197,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TASK_END_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TASK_START:
@@ -216,6 +220,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TASK_START:
@@ -229,6 +234,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -245,8 +251,6 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ExecutorInfo)
       return this.equals((ExecutorInfo)that);
     return false;
@@ -298,7 +302,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_task_start()).compareTo(other.is_set_task_start());
+    lastComparison = java.lang.Boolean.compare(is_set_task_start(), other.is_set_task_start());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -308,7 +312,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_task_end()).compareTo(other.is_set_task_end());
+    lastComparison = java.lang.Boolean.compare(is_set_task_end(), other.is_set_task_end());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -322,14 +326,17 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -382,6 +389,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
   }
 
   private static class ExecutorInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorInfoStandardScheme getScheme() {
       return new ExecutorInfoStandardScheme();
     }
@@ -389,6 +397,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
 
   private static class ExecutorInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorInfo> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorInfo struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -424,6 +433,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -441,6 +451,7 @@ public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo,
   }
 
   private static class ExecutorInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorInfoTupleScheme getScheme() {
       return new ExecutorInfoTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
index 29778e9be..d2e43f87c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<ExecutorSpecificStats, ExecutorSpecificStats._Fields> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorSpecificStats");
   private static final org.apache.storm.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bolt", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
@@ -84,10 +84,12 @@ public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<Execut
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -115,6 +117,7 @@ public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<Execut
   public ExecutorSpecificStats(ExecutorSpecificStats other) {
     super(other);
   }
+  @Override
   public ExecutorSpecificStats deepCopy() {
     return new ExecutorSpecificStats(this);
   }
@@ -262,6 +265,7 @@ public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<Execut
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -276,9 +280,8 @@ public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<Execut
   }
 
   public void set_bolt(BoltStats value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.BOLT;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.BOLT");
   }
 
   public SpoutStats get_spout() {
@@ -290,9 +293,8 @@ public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<Execut
   }
 
   public void set_spout(SpoutStats value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.SPOUT;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.SPOUT");
   }
 
   public boolean is_set_bolt() {
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
index 7e7345ca2..24ac5c784 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorStats");
 
@@ -101,10 +101,12 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -194,6 +196,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
     this.rate = other.rate;
   }
 
+  @Override
   public ExecutorStats deepCopy() {
     return new ExecutorStats(this);
   }
@@ -323,6 +326,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __RATE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EMITTED:
@@ -361,6 +365,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EMITTED:
@@ -380,6 +385,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -400,8 +406,6 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ExecutorStats)
       return this.equals((ExecutorStats)that);
     return false;
@@ -481,7 +485,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_emitted()).compareTo(other.is_set_emitted());
+    lastComparison = java.lang.Boolean.compare(is_set_emitted(), other.is_set_emitted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -491,7 +495,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_transferred()).compareTo(other.is_set_transferred());
+    lastComparison = java.lang.Boolean.compare(is_set_transferred(), other.is_set_transferred());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -501,7 +505,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_specific()).compareTo(other.is_set_specific());
+    lastComparison = java.lang.Boolean.compare(is_set_specific(), other.is_set_specific());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -511,7 +515,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_rate()).compareTo(other.is_set_rate());
+    lastComparison = java.lang.Boolean.compare(is_set_rate(), other.is_set_rate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -525,14 +529,17 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -613,6 +620,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
   }
 
   private static class ExecutorStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorStatsStandardScheme getScheme() {
       return new ExecutorStatsStandardScheme();
     }
@@ -620,6 +628,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
 
   private static class ExecutorStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorStats> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -720,6 +729,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -781,6 +791,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
   }
 
   private static class ExecutorStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorStatsTupleScheme getScheme() {
       return new ExecutorStatsTupleScheme();
     }
@@ -829,7 +840,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map374 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map374 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.emitted = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map374.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key375;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Long> _val376;
@@ -837,7 +848,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
         {
           _key375 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map378 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map378 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64); 
             _val376 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map378.size);
             @org.apache.storm.thrift.annotation.Nullable java.lang.String _key379;
             long _val380;
@@ -853,7 +864,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
       }
       struct.set_emitted_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TMap _map382 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map382 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP); 
         struct.transferred = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map382.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key383;
         @org.apache.storm.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Long> _val384;
@@ -861,7 +872,7 @@ public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStat
         {
           _key383 = iprot.readString();
           {
-            org.apache.storm.thrift.protocol.TMap _map386 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map386 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64); 
             _val384 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map386.size);
             @org.apache.storm.thrift.annotation.Nullable java.lang.String _key387;
             long _val388;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
index 77267dd72..64840f7c3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorSummary");
 
@@ -111,10 +111,12 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -185,6 +187,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
     }
   }
 
+  @Override
   public ExecutorSummary deepCopy() {
     return new ExecutorSummary(this);
   }
@@ -341,6 +344,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EXECUTOR_INFO:
@@ -395,6 +399,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXECUTOR_INFO:
@@ -420,6 +425,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -444,8 +450,6 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ExecutorSummary)
       return this.equals((ExecutorSummary)that);
     return false;
@@ -549,7 +553,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_executor_info()).compareTo(other.is_set_executor_info());
+    lastComparison = java.lang.Boolean.compare(is_set_executor_info(), other.is_set_executor_info());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -559,7 +563,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id());
+    lastComparison = java.lang.Boolean.compare(is_set_component_id(), other.is_set_component_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -569,7 +573,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
+    lastComparison = java.lang.Boolean.compare(is_set_host(), other.is_set_host());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -579,7 +583,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
+    lastComparison = java.lang.Boolean.compare(is_set_port(), other.is_set_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -589,7 +593,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_uptime_secs(), other.is_set_uptime_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -599,7 +603,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_stats()).compareTo(other.is_set_stats());
+    lastComparison = java.lang.Boolean.compare(is_set_stats(), other.is_set_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -613,14 +617,17 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -725,6 +732,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
   }
 
   private static class ExecutorSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorSummaryStandardScheme getScheme() {
       return new ExecutorSummaryStandardScheme();
     }
@@ -732,6 +740,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
 
   private static class ExecutorSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorSummary> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorSummary struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -801,6 +810,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -840,6 +850,7 @@ public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSu
   }
 
   private static class ExecutorSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ExecutorSummaryTupleScheme getScheme() {
       return new ExecutorSummaryTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java b/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
index d6c3dc73f..43ffd7112 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfoOptions> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("GetInfoOptions");
 
@@ -90,10 +90,12 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,6 +124,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
     }
   }
 
+  @Override
   public GetInfoOptions deepCopy() {
     return new GetInfoOptions(this);
   }
@@ -163,6 +166,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUM_ERR_CHOICE:
@@ -177,6 +181,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUM_ERR_CHOICE:
@@ -187,6 +192,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -201,8 +207,6 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof GetInfoOptions)
       return this.equals((GetInfoOptions)that);
     return false;
@@ -245,7 +249,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_num_err_choice()).compareTo(other.is_set_num_err_choice());
+    lastComparison = java.lang.Boolean.compare(is_set_num_err_choice(), other.is_set_num_err_choice());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -259,14 +263,17 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -311,6 +318,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
   }
 
   private static class GetInfoOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public GetInfoOptionsStandardScheme getScheme() {
       return new GetInfoOptionsStandardScheme();
     }
@@ -318,6 +326,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
 
   private static class GetInfoOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<GetInfoOptions> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, GetInfoOptions struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -345,6 +354,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, GetInfoOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -363,6 +373,7 @@ public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOpti
   }
 
   private static class GetInfoOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public GetInfoOptionsTupleScheme getScheme() {
       return new GetInfoOptionsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java b/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java
index e4a70624e..a383a23e9 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("GlobalStreamId");
 
@@ -91,10 +91,12 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -136,6 +138,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
     }
   }
 
+  @Override
   public GlobalStreamId deepCopy() {
     return new GlobalStreamId(this);
   }
@@ -194,6 +197,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPONENT_ID:
@@ -216,6 +220,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPONENT_ID:
@@ -229,6 +234,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -245,8 +251,6 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof GlobalStreamId)
       return this.equals((GlobalStreamId)that);
     return false;
@@ -302,7 +306,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_componentId()).compareTo(other.is_set_componentId());
+    lastComparison = java.lang.Boolean.compare(is_set_componentId(), other.is_set_componentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -312,7 +316,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_streamId()).compareTo(other.is_set_streamId());
+    lastComparison = java.lang.Boolean.compare(is_set_streamId(), other.is_set_streamId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -326,14 +330,17 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -392,6 +399,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
   }
 
   private static class GlobalStreamIdStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public GlobalStreamIdStandardScheme getScheme() {
       return new GlobalStreamIdStandardScheme();
     }
@@ -399,6 +407,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
 
   private static class GlobalStreamIdStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<GlobalStreamId> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, GlobalStreamId struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -434,6 +443,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -455,6 +465,7 @@ public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStrea
   }
 
   private static class GlobalStreamIdTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public GlobalStreamIdTupleScheme getScheme() {
       return new GlobalStreamIdTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Grouping.java b/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
index 01c3544b1..6c21e05cf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping._Fields> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Grouping");
   private static final org.apache.storm.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("fields", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
@@ -108,10 +108,12 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -152,6 +154,7 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   public Grouping(Grouping other) {
     super(other);
   }
+  @Override
   public Grouping deepCopy() {
     return new Grouping(this);
   }
@@ -551,6 +554,7 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -565,9 +569,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_fields(java.util.List<java.lang.String> value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.FIELDS;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.FIELDS");
   }
 
   public NullStruct get_shuffle() {
@@ -579,9 +582,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_shuffle(NullStruct value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.SHUFFLE;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.SHUFFLE");
   }
 
   public NullStruct get_all() {
@@ -593,9 +595,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_all(NullStruct value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.ALL;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.ALL");
   }
 
   public NullStruct get_none() {
@@ -607,9 +608,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_none(NullStruct value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.NONE;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.NONE");
   }
 
   public NullStruct get_direct() {
@@ -621,9 +621,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_direct(NullStruct value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.DIRECT;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.DIRECT");
   }
 
   public JavaObject get_custom_object() {
@@ -635,9 +634,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_custom_object(JavaObject value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.CUSTOM_OBJECT;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.CUSTOM_OBJECT");
   }
 
   public byte[] get_custom_serialized() {
@@ -659,9 +657,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_custom_serialized(java.nio.ByteBuffer value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.CUSTOM_SERIALIZED;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.CUSTOM_SERIALIZED");
   }
 
   public NullStruct get_local_or_shuffle() {
@@ -673,9 +670,8 @@ public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping.
   }
 
   public void set_local_or_shuffle(NullStruct value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.LOCAL_OR_SHUFFLE;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.LOCAL_OR_SHUFFLE");
   }
 
   public boolean is_set_fields() {
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java b/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
index 515699696..a64b146af 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBAuthorizationException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<HBAuthorizationException, HBAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<HBAuthorizationException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBAuthorizationException");
 
@@ -86,10 +86,12 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
     }
   }
 
+  @Override
   public HBAuthorizationException deepCopy() {
     return new HBAuthorizationException(this);
   }
@@ -157,6 +160,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBAuthorizationException)
       return this.equals((HBAuthorizationException)that);
     return false;
@@ -239,7 +243,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
   }
 
   private static class HBAuthorizationExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBAuthorizationExceptionStandardScheme getScheme() {
       return new HBAuthorizationExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
 
   private static class HBAuthorizationExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBAuthorizationException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBAuthorizationException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBAuthorizationException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class HBAuthorizationException extends org.apache.storm.thrift.TException
   }
 
   private static class HBAuthorizationExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBAuthorizationExceptionTupleScheme getScheme() {
       return new HBAuthorizationExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java b/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
index 8c8037473..1c4e81a16 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBExecutionException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<HBExecutionException, HBExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<HBExecutionException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBExecutionException");
 
@@ -86,10 +86,12 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
     }
   }
 
+  @Override
   public HBExecutionException deepCopy() {
     return new HBExecutionException(this);
   }
@@ -157,6 +160,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBExecutionException)
       return this.equals((HBExecutionException)that);
     return false;
@@ -239,7 +243,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
   }
 
   private static class HBExecutionExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBExecutionExceptionStandardScheme getScheme() {
       return new HBExecutionExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
 
   private static class HBExecutionExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBExecutionException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBExecutionException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBExecutionException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class HBExecutionException extends org.apache.storm.thrift.TException imp
   }
 
   private static class HBExecutionExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBExecutionExceptionTupleScheme getScheme() {
       return new HBExecutionExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java b/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java
index 0c5e1da08..61aadec50 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMessage._Fields>, java.io.Serializable, Cloneable, Comparable<HBMessage> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBMessage");
 
@@ -100,10 +100,12 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -154,6 +156,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
     this.message_id = other.message_id;
   }
 
+  @Override
   public HBMessage deepCopy() {
     return new HBMessage(this);
   }
@@ -244,6 +247,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -274,6 +278,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -290,6 +295,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -308,8 +314,6 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBMessage)
       return this.equals((HBMessage)that);
     return false;
@@ -378,7 +382,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_type()).compareTo(other.is_set_type());
+    lastComparison = java.lang.Boolean.compare(is_set_type(), other.is_set_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +392,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_data()).compareTo(other.is_set_data());
+    lastComparison = java.lang.Boolean.compare(is_set_data(), other.is_set_data());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +402,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_message_id()).compareTo(other.is_set_message_id());
+    lastComparison = java.lang.Boolean.compare(is_set_message_id(), other.is_set_message_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -412,14 +416,17 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -478,6 +485,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
   }
 
   private static class HBMessageStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBMessageStandardScheme getScheme() {
       return new HBMessageStandardScheme();
     }
@@ -485,6 +493,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
 
   private static class HBMessageStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBMessage> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBMessage struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -529,6 +538,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBMessage struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -555,6 +565,7 @@ public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMes
   }
 
   private static class HBMessageTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBMessageTupleScheme getScheme() {
       return new HBMessageTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java b/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
index 8af692716..8382ac2f7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData, HBMessageData._Fields> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBMessageData");
   private static final org.apache.storm.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("path", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
@@ -100,10 +100,12 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -139,6 +141,7 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   public HBMessageData(HBMessageData other) {
     super(other);
   }
+  @Override
   public HBMessageData deepCopy() {
     return new HBMessageData(this);
   }
@@ -430,6 +433,7 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -444,9 +448,8 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   public void set_path(java.lang.String value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.PATH;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.PATH");
   }
 
   public HBPulse get_pulse() {
@@ -458,9 +461,8 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   public void set_pulse(HBPulse value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.PULSE;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.PULSE");
   }
 
   public boolean get_boolval() {
@@ -485,9 +487,8 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   public void set_records(HBRecords value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.RECORDS;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.RECORDS");
   }
 
   public HBNodes get_nodes() {
@@ -499,9 +500,8 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   public void set_nodes(HBNodes value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.NODES;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.NODES");
   }
 
   public byte[] get_message_blob() {
@@ -523,9 +523,8 @@ public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData,
   }
 
   public void set_message_blob(java.nio.ByteBuffer value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.MESSAGE_BLOB;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.MESSAGE_BLOB");
   }
 
   public boolean is_set_path() {
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
index 4b4a84cc2..f79259f05 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._Fields>, java.io.Serializable, Cloneable, Comparable<HBNodes> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBNodes");
 
@@ -86,10 +86,12 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -126,6 +128,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
     }
   }
 
+  @Override
   public HBNodes deepCopy() {
     return new HBNodes(this);
   }
@@ -175,6 +178,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PULSE_IDS:
@@ -189,6 +193,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PULSE_IDS:
@@ -199,6 +204,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -213,8 +219,6 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBNodes)
       return this.equals((HBNodes)that);
     return false;
@@ -257,7 +261,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_pulseIds()).compareTo(other.is_set_pulseIds());
+    lastComparison = java.lang.Boolean.compare(is_set_pulseIds(), other.is_set_pulseIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -271,14 +275,17 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -321,6 +328,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
   }
 
   private static class HBNodesStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBNodesStandardScheme getScheme() {
       return new HBNodesStandardScheme();
     }
@@ -328,6 +336,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
 
   private static class HBNodesStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBNodes> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBNodes struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -365,6 +374,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBNodes struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -388,6 +398,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
   }
 
   private static class HBNodesTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBNodesTupleScheme getScheme() {
       return new HBNodesTupleScheme();
     }
@@ -420,7 +431,7 @@ public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.storm.thrift.protocol.TList _list967 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list967 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRING);
           struct.pulseIds = new java.util.ArrayList<java.lang.String>(_list967.size);
           @org.apache.storm.thrift.annotation.Nullable java.lang.String _elem968;
           for (int _i969 = 0; _i969 < _list967.size; ++_i969)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java b/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java
index a2d3c1242..113b1b65d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._Fields>, java.io.Serializable, Cloneable, Comparable<HBPulse> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBPulse");
 
@@ -91,10 +91,12 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -136,6 +138,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
     }
   }
 
+  @Override
   public HBPulse deepCopy() {
     return new HBPulse(this);
   }
@@ -202,6 +205,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -228,6 +232,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -241,6 +246,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -257,8 +263,6 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBPulse)
       return this.equals((HBPulse)that);
     return false;
@@ -314,7 +318,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+    lastComparison = java.lang.Boolean.compare(is_set_id(), other.is_set_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -324,7 +328,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_details()).compareTo(other.is_set_details());
+    lastComparison = java.lang.Boolean.compare(is_set_details(), other.is_set_details());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -338,14 +342,17 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -400,6 +407,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
   }
 
   private static class HBPulseStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBPulseStandardScheme getScheme() {
       return new HBPulseStandardScheme();
     }
@@ -407,6 +415,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
 
   private static class HBPulseStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBPulse> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBPulse struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -442,6 +451,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBPulse struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -463,6 +473,7 @@ public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._
   }
 
   private static class HBPulseTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBPulseTupleScheme getScheme() {
       return new HBPulseTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
index dcf95ced8..208b237ee 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRecords._Fields>, java.io.Serializable, Cloneable, Comparable<HBRecords> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBRecords");
 
@@ -86,10 +86,12 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -129,6 +131,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
     }
   }
 
+  @Override
   public HBRecords deepCopy() {
     return new HBRecords(this);
   }
@@ -178,6 +181,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PULSES:
@@ -192,6 +196,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PULSES:
@@ -202,6 +207,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -216,8 +222,6 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof HBRecords)
       return this.equals((HBRecords)that);
     return false;
@@ -260,7 +264,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_pulses()).compareTo(other.is_set_pulses());
+    lastComparison = java.lang.Boolean.compare(is_set_pulses(), other.is_set_pulses());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -274,14 +278,17 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -324,6 +331,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
   }
 
   private static class HBRecordsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBRecordsStandardScheme getScheme() {
       return new HBRecordsStandardScheme();
     }
@@ -331,6 +339,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
 
   private static class HBRecordsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBRecords> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBRecords struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -369,6 +378,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBRecords struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -392,6 +402,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
   }
 
   private static class HBRecordsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public HBRecordsTupleScheme getScheme() {
       return new HBRecordsTupleScheme();
     }
@@ -424,7 +435,7 @@ public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRec
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.storm.thrift.protocol.TList _list959 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list959 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
           struct.pulses = new java.util.ArrayList<HBPulse>(_list959.size);
           @org.apache.storm.thrift.annotation.Nullable HBPulse _elem960;
           for (int _i961 = 0; _i961 < _list959.size; ++_i961)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java b/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
index 926271940..a898f4a7f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public enum HBServerMessageType implements org.apache.storm.thrift.TEnum {
   CREATE_PATH(0),
   CREATE_PATH_RESPONSE(1),
@@ -55,6 +55,7 @@ public enum HBServerMessageType implements org.apache.storm.thrift.TEnum {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/IllegalStateException.java b/storm-client/src/jvm/org/apache/storm/generated/IllegalStateException.java
index 94d8f22d9..af8e77156 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/IllegalStateException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/IllegalStateException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class IllegalStateException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<IllegalStateException, IllegalStateException._Fields>, java.io.Serializable, Cloneable, Comparable<IllegalStateException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("IllegalStateException");
 
@@ -86,10 +86,12 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
     }
   }
 
+  @Override
   public IllegalStateException deepCopy() {
     return new IllegalStateException(this);
   }
@@ -157,6 +160,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof IllegalStateException)
       return this.equals((IllegalStateException)that);
     return false;
@@ -239,7 +243,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
   }
 
   private static class IllegalStateExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public IllegalStateExceptionStandardScheme getScheme() {
       return new IllegalStateExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
 
   private static class IllegalStateExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<IllegalStateException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, IllegalStateException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, IllegalStateException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class IllegalStateException extends org.apache.storm.thrift.TException im
   }
 
   private static class IllegalStateExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public IllegalStateExceptionTupleScheme getScheme() {
       return new IllegalStateExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java b/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
index 4320fd54c..65fca383f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class InvalidTopologyException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTopologyException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("InvalidTopologyException");
 
@@ -86,10 +86,12 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
     }
   }
 
+  @Override
   public InvalidTopologyException deepCopy() {
     return new InvalidTopologyException(this);
   }
@@ -157,6 +160,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InvalidTopologyException)
       return this.equals((InvalidTopologyException)that);
     return false;
@@ -239,7 +243,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
   }
 
   private static class InvalidTopologyExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidTopologyExceptionStandardScheme getScheme() {
       return new InvalidTopologyExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
 
   private static class InvalidTopologyExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<InvalidTopologyException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, InvalidTopologyException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class InvalidTopologyException extends org.apache.storm.thrift.TException
   }
 
   private static class InvalidTopologyExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidTopologyExceptionTupleScheme getScheme() {
       return new InvalidTopologyExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java
index 420e3e890..acfc43c22 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable, Comparable<JavaObject> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("JavaObject");
 
@@ -91,10 +91,12 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -141,6 +143,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
     }
   }
 
+  @Override
   public JavaObject deepCopy() {
     return new JavaObject(this);
   }
@@ -215,6 +218,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FULL_CLASS_NAME:
@@ -237,6 +241,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FULL_CLASS_NAME:
@@ -250,6 +255,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -266,8 +272,6 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof JavaObject)
       return this.equals((JavaObject)that);
     return false;
@@ -323,7 +327,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_full_class_name()).compareTo(other.is_set_full_class_name());
+    lastComparison = java.lang.Boolean.compare(is_set_full_class_name(), other.is_set_full_class_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -333,7 +337,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_args_list()).compareTo(other.is_set_args_list());
+    lastComparison = java.lang.Boolean.compare(is_set_args_list(), other.is_set_args_list());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -347,14 +351,17 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -413,6 +420,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
   }
 
   private static class JavaObjectStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public JavaObjectStandardScheme getScheme() {
       return new JavaObjectStandardScheme();
     }
@@ -420,6 +428,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
 
   private static class JavaObjectStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<JavaObject> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, JavaObject struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -466,6 +475,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, JavaObject struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -494,6 +504,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
   }
 
   private static class JavaObjectTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public JavaObjectTupleScheme getScheme() {
       return new JavaObjectTupleScheme();
     }
@@ -520,7 +531,7 @@ public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, Jav
       struct.full_class_name = iprot.readString();
       struct.set_full_class_name_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list5 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.args_list = new java.util.ArrayList<JavaObjectArg>(_list5.size);
         @org.apache.storm.thrift.annotation.Nullable JavaObjectArg _elem6;
         for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
index 1bed24ccc..dc9334fd2 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg, JavaObjectArg._Fields> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("JavaObjectArg");
   private static final org.apache.storm.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("int_arg", org.apache.storm.thrift.protocol.TType.I32, (short)1);
@@ -100,10 +100,12 @@ public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg,
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -139,6 +141,7 @@ public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg,
   public JavaObjectArg(JavaObjectArg other) {
     super(other);
   }
+  @Override
   public JavaObjectArg deepCopy() {
     return new JavaObjectArg(this);
   }
@@ -424,6 +427,7 @@ public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg,
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -464,9 +468,8 @@ public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg,
   }
 
   public void set_string_arg(java.lang.String value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.STRING_ARG;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.STRING_ARG");
   }
 
   public boolean get_bool_arg() {
@@ -501,9 +504,8 @@ public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg,
   }
 
   public void set_binary_arg(java.nio.ByteBuffer value) {
-    if (value == null) throw new java.lang.NullPointerException();
     setField_ = _Fields.BINARY_ARG;
-    value_ = value;
+    value_ = java.util.Objects.requireNonNull(value,"_Fields.BINARY_ARG");
   }
 
   public double get_double_arg() {
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
index 2baf8e348..d54d067cf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class KeyAlreadyExistsException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<KeyAlreadyExistsException, KeyAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyAlreadyExistsException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KeyAlreadyExistsException");
 
@@ -86,10 +86,12 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
     }
   }
 
+  @Override
   public KeyAlreadyExistsException deepCopy() {
     return new KeyAlreadyExistsException(this);
   }
@@ -157,6 +160,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof KeyAlreadyExistsException)
       return this.equals((KeyAlreadyExistsException)that);
     return false;
@@ -239,7 +243,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
   }
 
   private static class KeyAlreadyExistsExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KeyAlreadyExistsExceptionStandardScheme getScheme() {
       return new KeyAlreadyExistsExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
 
   private static class KeyAlreadyExistsExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KeyAlreadyExistsException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KeyAlreadyExistsException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KeyAlreadyExistsException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class KeyAlreadyExistsException extends org.apache.storm.thrift.TExceptio
   }
 
   private static class KeyAlreadyExistsExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KeyAlreadyExistsExceptionTupleScheme getScheme() {
       return new KeyAlreadyExistsExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
index a2d9d816e..3dcc19b3b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class KeyNotFoundException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<KeyNotFoundException, KeyNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyNotFoundException> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KeyNotFoundException");
 
@@ -86,10 +86,12 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
     }
   }
 
+  @Override
   public KeyNotFoundException deepCopy() {
     return new KeyNotFoundException(this);
   }
@@ -157,6 +160,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MSG:
@@ -171,6 +175,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MSG:
@@ -181,6 +186,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof KeyNotFoundException)
       return this.equals((KeyNotFoundException)that);
     return false;
@@ -239,7 +243,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
+    lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
   }
 
   private static class KeyNotFoundExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KeyNotFoundExceptionStandardScheme getScheme() {
       return new KeyNotFoundExceptionStandardScheme();
     }
@@ -314,6 +322,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
 
   private static class KeyNotFoundExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KeyNotFoundException> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KeyNotFoundException struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KeyNotFoundException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class KeyNotFoundException extends org.apache.storm.thrift.TException imp
   }
 
   private static class KeyNotFoundExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KeyNotFoundExceptionTupleScheme getScheme() {
       return new KeyNotFoundExceptionTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
index c4b9580ac..7dc59c3ff 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable, Comparable<KillOptions> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KillOptions");
 
@@ -86,10 +86,12 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
     this.wait_secs = other.wait_secs;
   }
 
+  @Override
   public KillOptions deepCopy() {
     return new KillOptions(this);
   }
@@ -151,6 +154,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case WAIT_SECS:
@@ -165,6 +169,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case WAIT_SECS:
@@ -175,6 +180,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -189,8 +195,6 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof KillOptions)
       return this.equals((KillOptions)that);
     return false;
@@ -233,7 +237,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_wait_secs()).compareTo(other.is_set_wait_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_wait_secs(), other.is_set_wait_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -247,14 +251,17 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -297,6 +304,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
   }
 
   private static class KillOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KillOptionsStandardScheme getScheme() {
       return new KillOptionsStandardScheme();
     }
@@ -304,6 +312,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
 
   private static class KillOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KillOptions> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KillOptions struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -331,6 +340,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KillOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -347,6 +357,7 @@ public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, K
   }
 
   private static class KillOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public KillOptionsTupleScheme getScheme() {
       return new KillOptionsTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
index 1c905d8c0..7e09c6469 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSApprovedWorkers");
 
@@ -86,10 +86,12 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -127,6 +129,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
     }
   }
 
+  @Override
   public LSApprovedWorkers deepCopy() {
     return new LSApprovedWorkers(this);
   }
@@ -171,6 +174,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case APPROVED_WORKERS:
@@ -185,6 +189,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case APPROVED_WORKERS:
@@ -195,6 +200,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -209,8 +215,6 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSApprovedWorkers)
       return this.equals((LSApprovedWorkers)that);
     return false;
@@ -253,7 +257,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_approved_workers()).compareTo(other.is_set_approved_workers());
+    lastComparison = java.lang.Boolean.compare(is_set_approved_workers(), other.is_set_approved_workers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -267,14 +271,17 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -321,6 +328,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
   }
 
   private static class LSApprovedWorkersStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSApprovedWorkersStandardScheme getScheme() {
       return new LSApprovedWorkersStandardScheme();
     }
@@ -328,6 +336,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
 
   private static class LSApprovedWorkersStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSApprovedWorkers> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSApprovedWorkers struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -367,6 +376,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSApprovedWorkers struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -391,6 +401,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
   }
 
   private static class LSApprovedWorkersTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSApprovedWorkersTupleScheme getScheme() {
       return new LSApprovedWorkersTupleScheme();
     }
@@ -415,7 +426,7 @@ public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprov
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map856 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map856 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32); 
         struct.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map856.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key857;
         int _val858;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
index e9a7f1046..36fad883c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSSupervisorAssignments");
 
@@ -86,10 +86,12 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
     }
   }
 
+  @Override
   public LSSupervisorAssignments deepCopy() {
     return new LSSupervisorAssignments(this);
   }
@@ -182,6 +185,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ASSIGNMENTS:
@@ -196,6 +200,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ASSIGNMENTS:
@@ -206,6 +211,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -220,8 +226,6 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSSupervisorAssignments)
       return this.equals((LSSupervisorAssignments)that);
     return false;
@@ -264,7 +268,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments());
+    lastComparison = java.lang.Boolean.compare(is_set_assignments(), other.is_set_assignments());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -278,14 +282,17 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -332,6 +339,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
   }
 
   private static class LSSupervisorAssignmentsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSSupervisorAssignmentsStandardScheme getScheme() {
       return new LSSupervisorAssignmentsStandardScheme();
     }
@@ -339,6 +347,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
 
   private static class LSSupervisorAssignmentsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSSupervisorAssignments> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSSupervisorAssignments struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -379,6 +388,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSSupervisorAssignments struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -403,6 +413,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
   }
 
   private static class LSSupervisorAssignmentsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSSupervisorAssignmentsTupleScheme getScheme() {
       return new LSSupervisorAssignmentsTupleScheme();
     }
@@ -427,7 +438,7 @@ public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LS
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map866 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.I32, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map866 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.I32, org.apache.storm.thrift.protocol.TType.STRUCT); 
         struct.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(2*_map866.size);
         int _key867;
         @org.apache.storm.thrift.annotation.Nullable LocalAssignment _val868;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
index c6af8d3d2..aeec80beb 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSupervisorId, LSSupervisorId._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorId> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSSupervisorId");
 
@@ -86,10 +86,12 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
     }
   }
 
+  @Override
   public LSSupervisorId deepCopy() {
     return new LSSupervisorId(this);
   }
@@ -157,6 +160,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SUPERVISOR_ID:
@@ -171,6 +175,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUPERVISOR_ID:
@@ -181,6 +186,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -195,8 +201,6 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSSupervisorId)
       return this.equals((LSSupervisorId)that);
     return false;
@@ -239,7 +243,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id());
+    lastComparison = java.lang.Boolean.compare(is_set_supervisor_id(), other.is_set_supervisor_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -253,14 +257,17 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -307,6 +314,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
   }
 
   private static class LSSupervisorIdStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSSupervisorIdStandardScheme getScheme() {
       return new LSSupervisorIdStandardScheme();
     }
@@ -314,6 +322,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
 
   private static class LSSupervisorIdStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSSupervisorId> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSSupervisorId struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -341,6 +350,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSSupervisorId struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -357,6 +367,7 @@ public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSuperviso
   }
 
   private static class LSSupervisorIdTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSSupervisorIdTupleScheme getScheme() {
       return new LSSupervisorIdTupleScheme();
     }
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
index baec85c73..510288e87 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistory, LSTopoHistory._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistory> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSTopoHistory");
 
@@ -101,10 +101,12 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -166,6 +168,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
     }
   }
 
+  @Override
   public LSTopoHistory deepCopy() {
     return new LSTopoHistory(this);
   }
@@ -305,6 +308,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TOPOLOGY_ID:
@@ -343,6 +347,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TOPOLOGY_ID:
@@ -362,6 +367,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -382,8 +388,6 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSTopoHistory)
       return this.equals((LSTopoHistory)that);
     return false;
@@ -463,7 +467,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_id(), other.is_set_topology_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -473,7 +477,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_time_stamp()).compareTo(other.is_set_time_stamp());
+    lastComparison = java.lang.Boolean.compare(is_set_time_stamp(), other.is_set_time_stamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -483,7 +487,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_users()).compareTo(other.is_set_users());
+    lastComparison = java.lang.Boolean.compare(is_set_users(), other.is_set_users());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -493,7 +497,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_groups()).compareTo(other.is_set_groups());
+    lastComparison = java.lang.Boolean.compare(is_set_groups(), other.is_set_groups());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -507,14 +511,17 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -595,6 +602,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
   }
 
   private static class LSTopoHistoryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSTopoHistoryStandardScheme getScheme() {
       return new LSTopoHistoryStandardScheme();
     }
@@ -602,6 +610,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
 
   private static class LSTopoHistoryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSTopoHistory> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSTopoHistory struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -673,6 +682,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSTopoHistory struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -716,6 +726,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
   }
 
   private static class LSTopoHistoryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSTopoHistoryTupleScheme getScheme() {
       return new LSTopoHistoryTupleScheme();
     }
@@ -752,7 +763,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
       struct.time_stamp = iprot.readI64();
       struct.set_time_stamp_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list888 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list888 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRING);
         struct.users = new java.util.ArrayList<java.lang.String>(_list888.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _elem889;
         for (int _i890 = 0; _i890 < _list888.size; ++_i890)
@@ -763,7 +774,7 @@ public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistor
       }
       struct.set_users_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list891 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list891 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRING);
         struct.groups = new java.util.ArrayList<java.lang.String>(_list891.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _elem892;
         for (int _i893 = 0; _i893 < _list891.size; ++_i893)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
index 517089740..2662c6585 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHistoryList, LSTopoHistoryList._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistoryList> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSTopoHistoryList");
 
@@ -86,10 +86,12 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -129,6 +131,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
     }
   }
 
+  @Override
   public LSTopoHistoryList deepCopy() {
     return new LSTopoHistoryList(this);
   }
@@ -178,6 +181,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TOPO_HISTORY:
@@ -192,6 +196,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TOPO_HISTORY:
@@ -202,6 +207,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -216,8 +222,6 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSTopoHistoryList)
       return this.equals((LSTopoHistoryList)that);
     return false;
@@ -260,7 +264,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_topo_history()).compareTo(other.is_set_topo_history());
+    lastComparison = java.lang.Boolean.compare(is_set_topo_history(), other.is_set_topo_history());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -274,14 +278,17 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -328,6 +335,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
   }
 
   private static class LSTopoHistoryListStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSTopoHistoryListStandardScheme getScheme() {
       return new LSTopoHistoryListStandardScheme();
     }
@@ -335,6 +343,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
 
   private static class LSTopoHistoryListStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSTopoHistoryList> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSTopoHistoryList struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -373,6 +382,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSTopoHistoryList struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -396,6 +406,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
   }
 
   private static class LSTopoHistoryListTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSTopoHistoryListTupleScheme getScheme() {
       return new LSTopoHistoryListTupleScheme();
     }
@@ -419,7 +430,7 @@ public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHi
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, LSTopoHistoryList struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TList _list899 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list899 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.topo_history = new java.util.ArrayList<LSTopoHistory>(_list899.size);
         @org.apache.storm.thrift.annotation.Nullable LSTopoHistory _elem900;
         for (int _i901 = 0; _i901 < _list899.size; ++_i901)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
index 86b08c302..3e1e9040d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSWorkerHeartbeat");
 
@@ -101,10 +101,12 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -167,6 +169,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
     this.port = other.port;
   }
 
+  @Override
   public LSWorkerHeartbeat deepCopy() {
     return new LSWorkerHeartbeat(this);
   }
@@ -289,6 +292,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
     __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TIME_SECS:
@@ -327,6 +331,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TIME_SECS:
@@ -346,6 +351,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -366,8 +372,6 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LSWorkerHeartbeat)
       return this.equals((LSWorkerHeartbeat)that);
     return false;
@@ -445,7 +449,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs());
+    lastComparison = java.lang.Boolean.compare(is_set_time_secs(), other.is_set_time_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -455,7 +459,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_id(), other.is_set_topology_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -465,7 +469,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors());
+    lastComparison = java.lang.Boolean.compare(is_set_executors(), other.is_set_executors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -475,7 +479,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
+    lastComparison = java.lang.Boolean.compare(is_set_port(), other.is_set_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -489,14 +493,17 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -573,6 +580,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
   }
 
   private static class LSWorkerHeartbeatStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSWorkerHeartbeatStandardScheme getScheme() {
       return new LSWorkerHeartbeatStandardScheme();
     }
@@ -580,6 +588,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
 
   private static class LSWorkerHeartbeatStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSWorkerHeartbeat> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -642,6 +651,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -676,6 +686,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
   }
 
   private static class LSWorkerHeartbeatTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LSWorkerHeartbeatTupleScheme getScheme() {
       return new LSWorkerHeartbeatTupleScheme();
     }
@@ -706,7 +717,7 @@ public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorker
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list875 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list875 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.executors = new java.util.ArrayList<ExecutorInfo>(_list875.size);
         @org.apache.storm.thrift.annotation.Nullable ExecutorInfo _elem876;
         for (int _i877 = 0; _i877 < _list875.size; ++_i877)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java b/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java
index f653bf1f5..4ba117cd7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsResult, ListBlobsResult._Fields>, java.io.Serializable, Cloneable, Comparable<ListBlobsResult> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ListBlobsResult");
 
@@ -91,10 +91,12 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
     }
   }
 
+  @Override
   public ListBlobsResult deepCopy() {
     return new ListBlobsResult(this);
   }
@@ -212,6 +215,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case KEYS:
@@ -234,6 +238,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case KEYS:
@@ -247,6 +252,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -263,8 +269,6 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ListBlobsResult)
       return this.equals((ListBlobsResult)that);
     return false;
@@ -320,7 +324,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_keys()).compareTo(other.is_set_keys());
+    lastComparison = java.lang.Boolean.compare(is_set_keys(), other.is_set_keys());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -330,7 +334,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_session()).compareTo(other.is_set_session());
+    lastComparison = java.lang.Boolean.compare(is_set_session(), other.is_set_session());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -344,14 +348,17 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -410,6 +417,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
   }
 
   private static class ListBlobsResultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ListBlobsResultStandardScheme getScheme() {
       return new ListBlobsResultStandardScheme();
     }
@@ -417,6 +425,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
 
   private static class ListBlobsResultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ListBlobsResult> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ListBlobsResult struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -462,6 +471,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ListBlobsResult struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -490,6 +500,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
   }
 
   private static class ListBlobsResultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public ListBlobsResultTupleScheme getScheme() {
       return new ListBlobsResultTupleScheme();
     }
@@ -514,7 +525,7 @@ public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsR
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, ListBlobsResult struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TList _list669 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list669 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRING);
         struct.keys = new java.util.ArrayList<java.lang.String>(_list669.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _elem670;
         for (int _i671 = 0; _i671 < _list669.size; ++_i671)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
index a7ace147d..a5d1876b5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LocalAssignment");
 
@@ -106,10 +106,12 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -173,6 +175,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
     }
   }
 
+  @Override
   public LocalAssignment deepCopy() {
     return new LocalAssignment(this);
   }
@@ -321,6 +324,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TOPOLOGY_ID:
@@ -367,6 +371,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TOPOLOGY_ID:
@@ -389,6 +394,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -411,8 +417,6 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LocalAssignment)
       return this.equals((LocalAssignment)that);
     return false;
@@ -507,7 +511,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+    lastComparison = java.lang.Boolean.compare(is_set_topology_id(), other.is_set_topology_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -517,7 +521,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors());
+    lastComparison = java.lang.Boolean.compare(is_set_executors(), other.is_set_executors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -527,7 +531,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_resources()).compareTo(other.is_set_resources());
+    lastComparison = java.lang.Boolean.compare(is_set_resources(), other.is_set_resources());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -537,7 +541,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_total_node_shared()).compareTo(other.is_set_total_node_shared());
+    lastComparison = java.lang.Boolean.compare(is_set_total_node_shared(), other.is_set_total_node_shared());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -547,7 +551,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
+    lastComparison = java.lang.Boolean.compare(is_set_owner(), other.is_set_owner());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -561,14 +565,17 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -658,6 +665,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
   }
 
   private static class LocalAssignmentStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LocalAssignmentStandardScheme getScheme() {
       return new LocalAssignmentStandardScheme();
     }
@@ -665,6 +673,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
 
   private static class LocalAssignmentStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LocalAssignment> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LocalAssignment struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -736,6 +745,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LocalAssignment struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -783,6 +793,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
   }
 
   private static class LocalAssignmentTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LocalAssignmentTupleScheme getScheme() {
       return new LocalAssignmentTupleScheme();
     }
@@ -829,7 +840,7 @@ public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssig
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.storm.thrift.protocol.TList _list847 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list847 = iprot.readListBegin(org.apache.storm.thrift.protocol.TType.STRUCT);
         struct.executors = new java.util.ArrayList<ExecutorInfo>(_list847.size);
         @org.apache.storm.thrift.annotation.Nullable ExecutorInfo _elem848;
         for (int _i849 = 0; _i849 < _list847.size; ++_i849)
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
index d0b9f324b..08e19c620 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LocalStateData");
 
@@ -86,10 +86,12 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
     }
   }
 
+  @Override
   public LocalStateData deepCopy() {
     return new LocalStateData(this);
   }
@@ -182,6 +185,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SERIALIZED_PARTS:
@@ -196,6 +200,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SERIALIZED_PARTS:
@@ -206,6 +211,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -220,8 +226,6 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LocalStateData)
       return this.equals((LocalStateData)that);
     return false;
@@ -264,7 +268,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_serialized_parts()).compareTo(other.is_set_serialized_parts());
+    lastComparison = java.lang.Boolean.compare(is_set_serialized_parts(), other.is_set_serialized_parts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -278,14 +282,17 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -332,6 +339,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
   }
 
   private static class LocalStateDataStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LocalStateDataStandardScheme getScheme() {
       return new LocalStateDataStandardScheme();
     }
@@ -339,6 +347,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
 
   private static class LocalStateDataStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LocalStateData> {
 
+    @Override
     public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LocalStateData struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
@@ -379,6 +388,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LocalStateData struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
@@ -403,6 +413,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
   }
 
   private static class LocalStateDataTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
     public LocalStateDataTupleScheme getScheme() {
       return new LocalStateDataTupleScheme();
     }
@@ -427,7 +438,7 @@ public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateD
     public void read(org.apache.storm.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.storm.thrift.TException {
       org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.storm.thrift.protocol.TMap _map838 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map838 = iprot.readMapBegin(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT); 
         struct.serialized_parts = new java.util.HashMap<java.lang.String,ThriftSerializedObject>(2*_map838.size);
         @org.apache.storm.thrift.annotation.Nullable java.lang.String _key839;
         @org.apache.storm.thrift.annotation.Nullable ThriftSerializedObject _val840;
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
index 375977332..c2c0b2c6e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.18.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
 public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogConfig._Fields>, java.io.Serializable, Cloneable, Comparable<LogConfig> {
   private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LogConfig");
 
@@ -86,10 +86,12 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -132,6 +134,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
     }
   }
 
+  @Override
   public LogConfig deepCopy() {
     return new LogConfig(this);
   }
@@ -176,6 +179,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAMED_LOGGER_LEVEL:
@@ -190,6 +194,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAMED_LOGGER_LEVEL:
@@ -200,6 +205,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -214,8 +220,6 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof LogConfig)
       return this.equals((LogConfig)that);
     return false;
@@ -258,7 +262,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(is_set_named_logger_level()).compareTo(other.is_set_named_logger_level());
+    lastComparison = java.lang.Boolean.compare(is_set_named_logger_level(), other.is_set_named_logger_level());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -272,14 +276,17 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
   }
 
   @org.apache.storm.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -324,6 +331,7 @@ public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogCo
   }
 
   private static class LogConfigStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
+    @Override
... 31408 lines suppressed ...