STORM-3061: thrift 0.11
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1fd1e17f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1fd1e17f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1fd1e17f Branch: refs/heads/master Commit: 1fd1e17fb2ede7bbb872bfca9ac6dd50fa58efd5 Parents: 93ed601 Author: Robert (Bobby) Evans <[email protected]> Authored: Tue May 22 16:26:21 2018 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Tue May 22 16:26:21 2018 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- storm-client/src/genthrift.sh | 2 +- .../apache/storm/generated/AccessControl.java | 148 +- .../storm/generated/AccessControlType.java | 6 +- .../storm/generated/AlreadyAliveException.java | 124 +- .../org/apache/storm/generated/Assignment.java | 362 +- .../storm/generated/AuthorizationException.java | 124 +- .../storm/generated/BeginDownloadResult.java | 158 +- .../jvm/org/apache/storm/generated/Bolt.java | 121 +- .../storm/generated/BoltAggregateStats.java | 175 +- .../org/apache/storm/generated/BoltStats.java | 440 +- .../apache/storm/generated/ClusterSummary.java | 205 +- .../storm/generated/ClusterWorkerHeartbeat.java | 185 +- .../storm/generated/CommonAggregateStats.java | 260 +- .../generated/ComponentAggregateStats.java | 143 +- .../apache/storm/generated/ComponentCommon.java | 217 +- .../apache/storm/generated/ComponentObject.java | 129 +- .../storm/generated/ComponentPageInfo.java | 495 +- .../apache/storm/generated/ComponentType.java | 6 +- .../org/apache/storm/generated/Credentials.java | 144 +- .../storm/generated/DRPCExceptionType.java | 6 +- .../storm/generated/DRPCExecutionException.java | 137 +- .../org/apache/storm/generated/DRPCRequest.java | 141 +- .../apache/storm/generated/DebugOptions.java | 141 +- .../apache/storm/generated/DistributedRPC.java | 368 +- .../generated/DistributedRPCInvocations.java | 1106 +- .../org/apache/storm/generated/ErrorInfo.java | 175 +- .../storm/generated/ExecutorAggregateStats.java | 125 +- .../apache/storm/generated/ExecutorInfo.java | 133 +- .../storm/generated/ExecutorSpecificStats.java | 97 +- .../apache/storm/generated/ExecutorStats.java | 253 +- .../apache/storm/generated/ExecutorSummary.java | 193 +- .../apache/storm/generated/GetInfoOptions.java | 116 +- .../apache/storm/generated/GlobalStreamId.java | 141 +- .../org/apache/storm/generated/Grouping.java | 199 +- .../generated/HBAuthorizationException.java | 124 +- .../storm/generated/HBExecutionException.java | 124 +- .../org/apache/storm/generated/HBMessage.java | 142 +- .../apache/storm/generated/HBMessageData.java | 179 +- .../jvm/org/apache/storm/generated/HBNodes.java | 146 +- .../jvm/org/apache/storm/generated/HBPulse.java | 151 +- .../org/apache/storm/generated/HBRecords.java | 134 +- .../storm/generated/HBServerMessageType.java | 6 +- .../generated/InvalidTopologyException.java | 124 +- .../org/apache/storm/generated/JavaObject.java | 149 +- .../apache/storm/generated/JavaObjectArg.java | 211 +- .../generated/KeyAlreadyExistsException.java | 124 +- .../storm/generated/KeyNotFoundException.java | 124 +- .../org/apache/storm/generated/KillOptions.java | 124 +- .../storm/generated/LSApprovedWorkers.java | 140 +- .../generated/LSSupervisorAssignments.java | 140 +- .../apache/storm/generated/LSSupervisorId.java | 122 +- .../apache/storm/generated/LSTopoHistory.java | 215 +- .../storm/generated/LSTopoHistoryList.java | 130 +- .../storm/generated/LSWorkerHeartbeat.java | 179 +- .../apache/storm/generated/ListBlobsResult.java | 161 +- .../apache/storm/generated/LocalAssignment.java | 196 +- .../apache/storm/generated/LocalStateData.java | 146 +- .../org/apache/storm/generated/LogConfig.java | 148 +- .../org/apache/storm/generated/LogLevel.java | 184 +- .../apache/storm/generated/LogLevelAction.java | 6 +- .../jvm/org/apache/storm/generated/Nimbus.java | 14032 ++++----- .../apache/storm/generated/NimbusSummary.java | 186 +- .../org/apache/storm/generated/NodeInfo.java | 151 +- .../storm/generated/NotAliveException.java | 124 +- .../org/apache/storm/generated/NullStruct.java | 103 +- .../apache/storm/generated/NumErrorsChoice.java | 6 +- .../storm/generated/OwnerResourceSummary.java | 453 +- .../storm/generated/PrivateWorkerKey.java | 162 +- .../apache/storm/generated/ProfileAction.java | 6 +- .../apache/storm/generated/ProfileRequest.java | 142 +- .../storm/generated/ReadableBlobMeta.java | 127 +- .../storm/generated/RebalanceOptions.java | 285 +- .../storm/generated/SettableBlobMeta.java | 151 +- .../apache/storm/generated/SharedMemory.java | 177 +- .../apache/storm/generated/ShellComponent.java | 145 +- .../storm/generated/SpecificAggregateStats.java | 97 +- .../storm/generated/SpoutAggregateStats.java | 124 +- .../org/apache/storm/generated/SpoutSpec.java | 121 +- .../org/apache/storm/generated/SpoutStats.java | 292 +- .../apache/storm/generated/StateSpoutSpec.java | 121 +- .../org/apache/storm/generated/StormBase.java | 336 +- .../apache/storm/generated/StormTopology.java | 483 +- .../org/apache/storm/generated/StreamInfo.java | 157 +- .../apache/storm/generated/SubmitOptions.java | 125 +- .../org/apache/storm/generated/Supervisor.java | 803 +- .../storm/generated/SupervisorAssignments.java | 152 +- .../apache/storm/generated/SupervisorInfo.java | 587 +- .../storm/generated/SupervisorPageInfo.java | 157 +- .../storm/generated/SupervisorSummary.java | 334 +- .../generated/SupervisorWorkerHeartbeat.java | 164 +- .../generated/SupervisorWorkerHeartbeats.java | 149 +- .../storm/generated/ThriftSerializedObject.java | 147 +- .../storm/generated/TopologyActionOptions.java | 93 +- .../storm/generated/TopologyHistoryInfo.java | 146 +- .../apache/storm/generated/TopologyInfo.java | 508 +- .../storm/generated/TopologyInitialStatus.java | 6 +- .../storm/generated/TopologyPageInfo.java | 759 +- .../apache/storm/generated/TopologyStats.java | 294 +- .../apache/storm/generated/TopologyStatus.java | 6 +- .../apache/storm/generated/TopologySummary.java | 449 +- .../storm/generated/WorkerMetricList.java | 134 +- .../storm/generated/WorkerMetricPoint.java | 209 +- .../apache/storm/generated/WorkerMetrics.java | 165 +- .../apache/storm/generated/WorkerResources.java | 262 +- .../apache/storm/generated/WorkerSummary.java | 412 +- .../org/apache/storm/generated/WorkerToken.java | 162 +- .../apache/storm/generated/WorkerTokenInfo.java | 171 +- .../storm/generated/WorkerTokenServiceType.java | 6 +- storm-client/src/py/storm/DistributedRPC-remote | 125 +- storm-client/src/py/storm/DistributedRPC.py | 531 +- .../py/storm/DistributedRPCInvocations-remote | 155 +- .../src/py/storm/DistributedRPCInvocations.py | 1637 +- storm-client/src/py/storm/Nimbus-remote | 615 +- storm-client/src/py/storm/Nimbus.py | 21130 +++++++------ storm-client/src/py/storm/Supervisor-remote | 145 +- storm-client/src/py/storm/Supervisor.py | 1266 +- storm-client/src/py/storm/constants.py | 9 +- storm-client/src/py/storm/ttypes.py | 26309 ++++++++--------- 119 files changed, 41924 insertions(+), 44785 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af94ead..0b18947 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ <kryo.version>3.0.3</kryo.version> <servlet.version>3.1.0</servlet.version> <joda-time.version>2.3</joda-time.version> - <thrift.version>0.9.3</thrift.version> + <thrift.version>0.11.0</thrift.version> <junit.version>4.11</junit.version> <metrics-clojure.version>2.5.1</metrics-clojure.version> <hdrhistogram.version>2.1.7</hdrhistogram.version> http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/genthrift.sh ---------------------------------------------------------------------- diff --git a/storm-client/src/genthrift.sh b/storm-client/src/genthrift.sh index a2373c2..c63bf44 100644 --- a/storm-client/src/genthrift.sh +++ b/storm-client/src/genthrift.sh @@ -17,7 +17,7 @@ rm -rf gen-javabean gen-py py rm -rf jvm/org/apache/storm/generated -thrift --gen java:beans,hashcode,nocamel,generated_annotations=undated --gen py:utf8strings storm.thrift +thrift --gen java:beans,nocamel,generated_annotations=undated --gen py:utf8strings storm.thrift for file in gen-javabean/org/apache/storm/generated/* ; do cat java_license_header.txt ${file} > ${file}.tmp mv -f ${file}.tmp ${file} http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java ---------------------------------------------------------------------- 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 c1c072a..58e8e27 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java +++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java @@ -16,42 +16,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class AccessControl implements org.apache.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccessControl"); @@ -59,14 +32,11 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("access", org.apache.thrift.protocol.TType.I32, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new AccessControlStandardSchemeFactory()); - schemes.put(TupleScheme.class, new AccessControlTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccessControlStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccessControlTupleSchemeFactory(); private AccessControlType type; // required - private String name; // optional + private java.lang.String name; // optional private int access; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -79,10 +49,10 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc NAME((short)2, "name"), ACCESS((short)3, "access"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -109,21 +79,21 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -132,7 +102,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -141,16 +111,16 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc private static final int __ACCESS_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.NAME}; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AccessControlType.class))); tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.ACCESS, new org.apache.thrift.meta_data.FieldMetaData("access", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccessControl.class, metaDataMap); } @@ -224,11 +194,11 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } } - public String get_name() { + public java.lang.String get_name() { return this.name; } - public void set_name(String name) { + public void set_name(java.lang.String name) { this.name = name; } @@ -257,19 +227,19 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } public void unset_access() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID); } /** Returns true if field access is set (has been assigned a value) and false otherwise */ public boolean is_set_access() { - return EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID); } public void set_access_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case TYPE: if (value == null) { @@ -283,7 +253,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc if (value == null) { unset_name(); } else { - set_name((String)value); + set_name((java.lang.String)value); } break; @@ -291,14 +261,14 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc if (value == null) { unset_access(); } else { - set_access((Integer)value); + set_access((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case TYPE: return get_type(); @@ -310,13 +280,13 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc return get_access(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -327,11 +297,11 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc case ACCESS: return is_set_access(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof AccessControl) @@ -342,6 +312,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc public boolean equals(AccessControl that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_type = true && this.is_set_type(); boolean that_present_type = true && that.is_set_type(); @@ -375,24 +347,19 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_type = true && (is_set_type()); - list.add(present_type); - if (present_type) - list.add(type.getValue()); + hashCode = hashCode * 8191 + ((is_set_type()) ? 131071 : 524287); + if (is_set_type()) + hashCode = hashCode * 8191 + type.getValue(); - boolean present_name = true && (is_set_name()); - list.add(present_name); - if (present_name) - list.add(name); + hashCode = hashCode * 8191 + ((is_set_name()) ? 131071 : 524287); + if (is_set_name()) + hashCode = hashCode * 8191 + name.hashCode(); - boolean present_access = true; - list.add(present_access); - if (present_access) - list.add(access); + hashCode = hashCode * 8191 + access; - return list.hashCode(); + return hashCode; } @Override @@ -403,7 +370,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_type()).compareTo(other.is_set_type()); + lastComparison = java.lang.Boolean.valueOf(is_set_type()).compareTo(other.is_set_type()); if (lastComparison != 0) { return lastComparison; } @@ -413,7 +380,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_name()).compareTo(other.is_set_name()); + lastComparison = java.lang.Boolean.valueOf(is_set_name()).compareTo(other.is_set_name()); if (lastComparison != 0) { return lastComparison; } @@ -423,7 +390,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_access()).compareTo(other.is_set_access()); + lastComparison = java.lang.Boolean.valueOf(is_set_access()).compareTo(other.is_set_access()); if (lastComparison != 0) { return lastComparison; } @@ -441,16 +408,16 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + scheme(iprot).read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("AccessControl("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("AccessControl("); boolean first = true; sb.append("type:"); @@ -499,7 +466,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; @@ -509,13 +476,13 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } } - private static class AccessControlStandardSchemeFactory implements SchemeFactory { + private static class AccessControlStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AccessControlStandardScheme getScheme() { return new AccessControlStandardScheme(); } } - private static class AccessControlStandardScheme extends StandardScheme<AccessControl> { + private static class AccessControlStandardScheme extends org.apache.thrift.scheme.StandardScheme<AccessControl> { public void read(org.apache.thrift.protocol.TProtocol iprot, AccessControl struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -585,20 +552,20 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } - private static class AccessControlTupleSchemeFactory implements SchemeFactory { + private static class AccessControlTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AccessControlTupleScheme getScheme() { return new AccessControlTupleScheme(); } } - private static class AccessControlTupleScheme extends TupleScheme<AccessControl> { + private static class AccessControlTupleScheme extends org.apache.thrift.scheme.TupleScheme<AccessControl> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeI32(struct.type.getValue()); oprot.writeI32(struct.access); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_name()) { optionals.set(0); } @@ -610,12 +577,12 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc @Override public void read(org.apache.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.type = org.apache.storm.generated.AccessControlType.findByValue(iprot.readI32()); struct.set_type_isSet(true); struct.access = iprot.readI32(); struct.set_access_isSet(true); - BitSet incoming = iprot.readBitSet(1); + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.name = iprot.readString(); struct.set_name_isSet(true); @@ -623,5 +590,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc } } + private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java ---------------------------------------------------------------------- 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 cb75b9b..159dffa 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.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -24,10 +24,6 @@ package org.apache.storm.generated; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - public enum AccessControlType implements org.apache.thrift.TEnum { OTHER(1), USER(2); http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java ---------------------------------------------------------------------- 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 4e635fb..6a43897 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java +++ b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java @@ -16,63 +16,33 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") -public class AlreadyAliveException extends TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") +public class AlreadyAliveException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new AlreadyAliveExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new AlreadyAliveExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory(); - private String msg; // required + private java.lang.String msg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -95,21 +65,21 @@ public class AlreadyAliveException extends TException implements org.apache.thri */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -118,18 +88,18 @@ public class AlreadyAliveException extends TException implements org.apache.thri return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap); } @@ -137,7 +107,7 @@ public class AlreadyAliveException extends TException implements org.apache.thri } public AlreadyAliveException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -161,11 +131,11 @@ public class AlreadyAliveException extends TException implements org.apache.thri this.msg = null; } - public String get_msg() { + public java.lang.String get_msg() { return this.msg; } - public void set_msg(String msg) { + public void set_msg(java.lang.String msg) { this.msg = msg; } @@ -184,43 +154,43 @@ public class AlreadyAliveException extends TException implements org.apache.thri } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case MSG: if (value == null) { unset_msg(); } else { - set_msg((String)value); + set_msg((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case MSG: return get_msg(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case MSG: return is_set_msg(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof AlreadyAliveException) @@ -231,6 +201,8 @@ public class AlreadyAliveException extends TException implements org.apache.thri public boolean equals(AlreadyAliveException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_msg = true && this.is_set_msg(); boolean that_present_msg = true && that.is_set_msg(); @@ -246,14 +218,13 @@ public class AlreadyAliveException extends TException implements org.apache.thri @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_msg = true && (is_set_msg()); - list.add(present_msg); - if (present_msg) - list.add(msg); + hashCode = hashCode * 8191 + ((is_set_msg()) ? 131071 : 524287); + if (is_set_msg()) + hashCode = hashCode * 8191 + msg.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class AlreadyAliveException extends TException implements org.apache.thri int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg()); + lastComparison = java.lang.Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class AlreadyAliveException extends TException implements org.apache.thri } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + scheme(iprot).read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("AlreadyAliveException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("AlreadyAliveException("); boolean first = true; sb.append("msg:"); @@ -322,7 +293,7 @@ public class AlreadyAliveException extends TException implements org.apache.thri } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -330,13 +301,13 @@ public class AlreadyAliveException extends TException implements org.apache.thri } } - private static class AlreadyAliveExceptionStandardSchemeFactory implements SchemeFactory { + private static class AlreadyAliveExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AlreadyAliveExceptionStandardScheme getScheme() { return new AlreadyAliveExceptionStandardScheme(); } } - private static class AlreadyAliveExceptionStandardScheme extends StandardScheme<AlreadyAliveException> { + private static class AlreadyAliveExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlreadyAliveException> { public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -380,27 +351,30 @@ public class AlreadyAliveException extends TException implements org.apache.thri } - private static class AlreadyAliveExceptionTupleSchemeFactory implements SchemeFactory { + private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AlreadyAliveExceptionTupleScheme getScheme() { return new AlreadyAliveExceptionTupleScheme(); } } - private static class AlreadyAliveExceptionTupleScheme extends TupleScheme<AlreadyAliveException> { + private static class AlreadyAliveExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<AlreadyAliveException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeString(struct.msg); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.msg = iprot.readString(); struct.set_msg_isSet(true); } } + private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } }
