http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java b/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java index 1189175..a335083 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java +++ b/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.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 ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, ProfileRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ProfileRequest> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProfileRequest"); @@ -59,11 +32,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P private static final org.apache.thrift.protocol.TField ACTION_FIELD_DESC = new org.apache.thrift.protocol.TField("action", org.apache.thrift.protocol.TType.I32, (short)2); private static final org.apache.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("time_stamp", org.apache.thrift.protocol.TType.I64, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ProfileRequestStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ProfileRequestTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ProfileRequestStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ProfileRequestTupleSchemeFactory(); private NodeInfo nodeInfo; // required private ProfileAction action; // required @@ -79,10 +49,10 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P ACTION((short)2, "action"), TIME_STAMP((short)3, "time_stamp"); - 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 ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P */ 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 ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -141,16 +111,16 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P private static final int __TIME_STAMP_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.TIME_STAMP}; - 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.NODE_INFO, new org.apache.thrift.meta_data.FieldMetaData("nodeInfo", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeInfo.class))); tmpMap.put(_Fields.ACTION, new org.apache.thrift.meta_data.FieldMetaData("action", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ProfileAction.class))); tmpMap.put(_Fields.TIME_STAMP, new org.apache.thrift.meta_data.FieldMetaData("time_stamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProfileRequest.class, metaDataMap); } @@ -256,19 +226,19 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } public void unset_time_stamp() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID); } /** Returns true if field time_stamp is set (has been assigned a value) and false otherwise */ public boolean is_set_time_stamp() { - return EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID); } public void set_time_stamp_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case NODE_INFO: if (value == null) { @@ -290,14 +260,14 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P if (value == null) { unset_time_stamp(); } else { - set_time_stamp((Long)value); + set_time_stamp((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case NODE_INFO: return get_nodeInfo(); @@ -309,13 +279,13 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P return get_time_stamp(); } - 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) { @@ -326,11 +296,11 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P case TIME_STAMP: return is_set_time_stamp(); } - 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 ProfileRequest) @@ -341,6 +311,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P public boolean equals(ProfileRequest that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_nodeInfo = true && this.is_set_nodeInfo(); boolean that_present_nodeInfo = true && that.is_set_nodeInfo(); @@ -374,24 +346,21 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_nodeInfo = true && (is_set_nodeInfo()); - list.add(present_nodeInfo); - if (present_nodeInfo) - list.add(nodeInfo); + hashCode = hashCode * 8191 + ((is_set_nodeInfo()) ? 131071 : 524287); + if (is_set_nodeInfo()) + hashCode = hashCode * 8191 + nodeInfo.hashCode(); - boolean present_action = true && (is_set_action()); - list.add(present_action); - if (present_action) - list.add(action.getValue()); + hashCode = hashCode * 8191 + ((is_set_action()) ? 131071 : 524287); + if (is_set_action()) + hashCode = hashCode * 8191 + action.getValue(); - boolean present_time_stamp = true && (is_set_time_stamp()); - list.add(present_time_stamp); - if (present_time_stamp) - list.add(time_stamp); + hashCode = hashCode * 8191 + ((is_set_time_stamp()) ? 131071 : 524287); + if (is_set_time_stamp()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(time_stamp); - return list.hashCode(); + return hashCode; } @Override @@ -402,7 +371,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_nodeInfo()).compareTo(other.is_set_nodeInfo()); + lastComparison = java.lang.Boolean.valueOf(is_set_nodeInfo()).compareTo(other.is_set_nodeInfo()); if (lastComparison != 0) { return lastComparison; } @@ -412,7 +381,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_action()).compareTo(other.is_set_action()); + lastComparison = java.lang.Boolean.valueOf(is_set_action()).compareTo(other.is_set_action()); if (lastComparison != 0) { return lastComparison; } @@ -422,7 +391,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_time_stamp()).compareTo(other.is_set_time_stamp()); + lastComparison = java.lang.Boolean.valueOf(is_set_time_stamp()).compareTo(other.is_set_time_stamp()); if (lastComparison != 0) { return lastComparison; } @@ -440,16 +409,16 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } 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("ProfileRequest("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ProfileRequest("); boolean first = true; sb.append("nodeInfo:"); @@ -501,7 +470,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } } - 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; @@ -511,13 +480,13 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } } - private static class ProfileRequestStandardSchemeFactory implements SchemeFactory { + private static class ProfileRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ProfileRequestStandardScheme getScheme() { return new ProfileRequestStandardScheme(); } } - private static class ProfileRequestStandardScheme extends StandardScheme<ProfileRequest> { + private static class ProfileRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ProfileRequest> { public void read(org.apache.thrift.protocol.TProtocol iprot, ProfileRequest struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -588,20 +557,20 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } - private static class ProfileRequestTupleSchemeFactory implements SchemeFactory { + private static class ProfileRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ProfileRequestTupleScheme getScheme() { return new ProfileRequestTupleScheme(); } } - private static class ProfileRequestTupleScheme extends TupleScheme<ProfileRequest> { + private static class ProfileRequestTupleScheme extends org.apache.thrift.scheme.TupleScheme<ProfileRequest> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ProfileRequest struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.nodeInfo.write(oprot); oprot.writeI32(struct.action.getValue()); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_time_stamp()) { optionals.set(0); } @@ -613,13 +582,13 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P @Override public void read(org.apache.thrift.protocol.TProtocol prot, ProfileRequest struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.nodeInfo = new NodeInfo(); struct.nodeInfo.read(iprot); struct.set_nodeInfo_isSet(true); struct.action = org.apache.storm.generated.ProfileAction.findByValue(iprot.readI32()); struct.set_action_isSet(true); - BitSet incoming = iprot.readBitSet(1); + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.time_stamp = iprot.readI64(); struct.set_time_stamp_isSet(true); @@ -627,5 +596,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P } } + 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/ReadableBlobMeta.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java b/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java index 0cbd3b8..6488d62 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java +++ b/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java @@ -16,53 +16,23 @@ * 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 ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMeta, ReadableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<ReadableBlobMeta> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReadableBlobMeta"); private static final org.apache.thrift.protocol.TField SETTABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("settable", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.I64, (short)2); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ReadableBlobMetaStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ReadableBlobMetaTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ReadableBlobMetaStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ReadableBlobMetaTupleSchemeFactory(); private SettableBlobMeta settable; // required private long version; // required @@ -72,10 +42,10 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet SETTABLE((short)1, "settable"), VERSION((short)2, "version"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -100,21 +70,21 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -123,7 +93,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -131,14 +101,14 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet // isset id assignments private static final int __VERSION_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SETTABLE, new org.apache.thrift.meta_data.FieldMetaData("settable", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SettableBlobMeta.class))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ReadableBlobMeta.class, metaDataMap); } @@ -210,19 +180,19 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } public void unset_version() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID); } /** Returns true if field version is set (has been assigned a value) and false otherwise */ public boolean is_set_version() { - return EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID); } public void set_version_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SETTABLE: if (value == null) { @@ -236,14 +206,14 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet if (value == null) { unset_version(); } else { - set_version((Long)value); + set_version((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SETTABLE: return get_settable(); @@ -252,13 +222,13 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet return get_version(); } - 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) { @@ -267,11 +237,11 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet case VERSION: return is_set_version(); } - 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 ReadableBlobMeta) @@ -282,6 +252,8 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet public boolean equals(ReadableBlobMeta that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_settable = true && this.is_set_settable(); boolean that_present_settable = true && that.is_set_settable(); @@ -306,19 +278,15 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_settable = true && (is_set_settable()); - list.add(present_settable); - if (present_settable) - list.add(settable); + hashCode = hashCode * 8191 + ((is_set_settable()) ? 131071 : 524287); + if (is_set_settable()) + hashCode = hashCode * 8191 + settable.hashCode(); - boolean present_version = true; - list.add(present_version); - if (present_version) - list.add(version); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(version); - return list.hashCode(); + return hashCode; } @Override @@ -329,7 +297,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_settable()).compareTo(other.is_set_settable()); + lastComparison = java.lang.Boolean.valueOf(is_set_settable()).compareTo(other.is_set_settable()); if (lastComparison != 0) { return lastComparison; } @@ -339,7 +307,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_version()).compareTo(other.is_set_version()); + lastComparison = java.lang.Boolean.valueOf(is_set_version()).compareTo(other.is_set_version()); if (lastComparison != 0) { return lastComparison; } @@ -357,16 +325,16 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } 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("ReadableBlobMeta("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ReadableBlobMeta("); boolean first = true; sb.append("settable:"); @@ -408,7 +376,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } } - 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; @@ -418,13 +386,13 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } } - private static class ReadableBlobMetaStandardSchemeFactory implements SchemeFactory { + private static class ReadableBlobMetaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ReadableBlobMetaStandardScheme getScheme() { return new ReadableBlobMetaStandardScheme(); } } - private static class ReadableBlobMetaStandardScheme extends StandardScheme<ReadableBlobMeta> { + private static class ReadableBlobMetaStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReadableBlobMeta> { public void read(org.apache.thrift.protocol.TProtocol iprot, ReadableBlobMeta struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -480,24 +448,24 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } - private static class ReadableBlobMetaTupleSchemeFactory implements SchemeFactory { + private static class ReadableBlobMetaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ReadableBlobMetaTupleScheme getScheme() { return new ReadableBlobMetaTupleScheme(); } } - private static class ReadableBlobMetaTupleScheme extends TupleScheme<ReadableBlobMeta> { + private static class ReadableBlobMetaTupleScheme extends org.apache.thrift.scheme.TupleScheme<ReadableBlobMeta> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ReadableBlobMeta struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.settable.write(oprot); oprot.writeI64(struct.version); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ReadableBlobMeta struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.settable = new SettableBlobMeta(); struct.settable.read(iprot); struct.set_settable_isSet(true); @@ -506,5 +474,8 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet } } + 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/RebalanceOptions.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java index 9cd8a2e..3060c90 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java +++ b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.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 RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions"); @@ -62,18 +35,15 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_OVERRIDES_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf_overrides", org.apache.thrift.protocol.TType.STRING, (short)5); private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)6); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new RebalanceOptionsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new RebalanceOptionsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RebalanceOptionsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RebalanceOptionsTupleSchemeFactory(); private int wait_secs; // optional private int num_workers; // optional - private Map<String,Integer> num_executors; // optional - private Map<String,Map<String,Double>> topology_resources_overrides; // optional - private String topology_conf_overrides; // optional - private String principal; // optional + private java.util.Map<java.lang.String,java.lang.Integer> num_executors; // optional + private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>> topology_resources_overrides; // optional + private java.lang.String topology_conf_overrides; // optional + private java.lang.String principal; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -84,10 +54,10 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption TOPOLOGY_CONF_OVERRIDES((short)5, "topology_conf_overrides"), PRINCIPAL((short)6, "principal"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -120,21 +90,21 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -143,7 +113,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -153,9 +123,9 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption private static final int __NUM_WORKERS_ISSET_ID = 1; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.WAIT_SECS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS,_Fields.TOPOLOGY_RESOURCES_OVERRIDES,_Fields.TOPOLOGY_CONF_OVERRIDES,_Fields.PRINCIPAL}; - 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.WAIT_SECS, new org.apache.thrift.meta_data.FieldMetaData("wait_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -174,7 +144,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PRINCIPAL, new org.apache.thrift.meta_data.FieldMetaData("principal", org.apache.thrift.TFieldRequirementType.OPTIONAL, 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(RebalanceOptions.class, metaDataMap); } @@ -189,19 +159,19 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption this.wait_secs = other.wait_secs; this.num_workers = other.num_workers; if (other.is_set_num_executors()) { - Map<String,Integer> __this__num_executors = new HashMap<String,Integer>(other.num_executors); + java.util.Map<java.lang.String,java.lang.Integer> __this__num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(other.num_executors); this.num_executors = __this__num_executors; } if (other.is_set_topology_resources_overrides()) { - Map<String,Map<String,Double>> __this__topology_resources_overrides = new HashMap<String,Map<String,Double>>(other.topology_resources_overrides.size()); - for (Map.Entry<String, Map<String,Double>> other_element : other.topology_resources_overrides.entrySet()) { + java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>> __this__topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(other.topology_resources_overrides.size()); + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Double>> other_element : other.topology_resources_overrides.entrySet()) { - String other_element_key = other_element.getKey(); - Map<String,Double> other_element_value = other_element.getValue(); + java.lang.String other_element_key = other_element.getKey(); + java.util.Map<java.lang.String,java.lang.Double> other_element_value = other_element.getValue(); - String __this__topology_resources_overrides_copy_key = other_element_key; + java.lang.String __this__topology_resources_overrides_copy_key = other_element_key; - Map<String,Double> __this__topology_resources_overrides_copy_value = new HashMap<String,Double>(other_element_value); + java.util.Map<java.lang.String,java.lang.Double> __this__topology_resources_overrides_copy_value = new java.util.HashMap<java.lang.String,java.lang.Double>(other_element_value); __this__topology_resources_overrides.put(__this__topology_resources_overrides_copy_key, __this__topology_resources_overrides_copy_value); } @@ -241,16 +211,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } public void unset_wait_secs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID); } /** Returns true if field wait_secs is set (has been assigned a value) and false otherwise */ public boolean is_set_wait_secs() { - return EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID); } public void set_wait_secs_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value); } public int get_num_workers() { @@ -263,34 +233,34 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } public void unset_num_workers() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); } /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */ public boolean is_set_num_workers() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); } public void set_num_workers_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value); } public int get_num_executors_size() { return (this.num_executors == null) ? 0 : this.num_executors.size(); } - public void put_to_num_executors(String key, int val) { + public void put_to_num_executors(java.lang.String key, int val) { if (this.num_executors == null) { - this.num_executors = new HashMap<String,Integer>(); + this.num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(); } this.num_executors.put(key, val); } - public Map<String,Integer> get_num_executors() { + public java.util.Map<java.lang.String,java.lang.Integer> get_num_executors() { return this.num_executors; } - public void set_num_executors(Map<String,Integer> num_executors) { + public void set_num_executors(java.util.Map<java.lang.String,java.lang.Integer> num_executors) { this.num_executors = num_executors; } @@ -313,18 +283,18 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return (this.topology_resources_overrides == null) ? 0 : this.topology_resources_overrides.size(); } - public void put_to_topology_resources_overrides(String key, Map<String,Double> val) { + public void put_to_topology_resources_overrides(java.lang.String key, java.util.Map<java.lang.String,java.lang.Double> val) { if (this.topology_resources_overrides == null) { - this.topology_resources_overrides = new HashMap<String,Map<String,Double>>(); + this.topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(); } this.topology_resources_overrides.put(key, val); } - public Map<String,Map<String,Double>> get_topology_resources_overrides() { + public java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>> get_topology_resources_overrides() { return this.topology_resources_overrides; } - public void set_topology_resources_overrides(Map<String,Map<String,Double>> topology_resources_overrides) { + public void set_topology_resources_overrides(java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>> topology_resources_overrides) { this.topology_resources_overrides = topology_resources_overrides; } @@ -343,11 +313,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } - public String get_topology_conf_overrides() { + public java.lang.String get_topology_conf_overrides() { return this.topology_conf_overrides; } - public void set_topology_conf_overrides(String topology_conf_overrides) { + public void set_topology_conf_overrides(java.lang.String topology_conf_overrides) { this.topology_conf_overrides = topology_conf_overrides; } @@ -366,11 +336,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } - public String get_principal() { + public java.lang.String get_principal() { return this.principal; } - public void set_principal(String principal) { + public void set_principal(java.lang.String principal) { this.principal = principal; } @@ -389,13 +359,13 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case WAIT_SECS: if (value == null) { unset_wait_secs(); } else { - set_wait_secs((Integer)value); + set_wait_secs((java.lang.Integer)value); } break; @@ -403,7 +373,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (value == null) { unset_num_workers(); } else { - set_num_workers((Integer)value); + set_num_workers((java.lang.Integer)value); } break; @@ -411,7 +381,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (value == null) { unset_num_executors(); } else { - set_num_executors((Map<String,Integer>)value); + set_num_executors((java.util.Map<java.lang.String,java.lang.Integer>)value); } break; @@ -419,7 +389,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (value == null) { unset_topology_resources_overrides(); } else { - set_topology_resources_overrides((Map<String,Map<String,Double>>)value); + set_topology_resources_overrides((java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>)value); } break; @@ -427,7 +397,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (value == null) { unset_topology_conf_overrides(); } else { - set_topology_conf_overrides((String)value); + set_topology_conf_overrides((java.lang.String)value); } break; @@ -435,14 +405,14 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (value == null) { unset_principal(); } else { - set_principal((String)value); + set_principal((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case WAIT_SECS: return get_wait_secs(); @@ -463,13 +433,13 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return get_principal(); } - 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) { @@ -486,11 +456,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption case PRINCIPAL: return is_set_principal(); } - 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 RebalanceOptions) @@ -501,6 +471,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption public boolean equals(RebalanceOptions that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_wait_secs = true && this.is_set_wait_secs(); boolean that_present_wait_secs = true && that.is_set_wait_secs(); @@ -561,39 +533,33 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_wait_secs = true && (is_set_wait_secs()); - list.add(present_wait_secs); - if (present_wait_secs) - list.add(wait_secs); - - boolean present_num_workers = true && (is_set_num_workers()); - list.add(present_num_workers); - if (present_num_workers) - list.add(num_workers); - - boolean present_num_executors = true && (is_set_num_executors()); - list.add(present_num_executors); - if (present_num_executors) - list.add(num_executors); - - boolean present_topology_resources_overrides = true && (is_set_topology_resources_overrides()); - list.add(present_topology_resources_overrides); - if (present_topology_resources_overrides) - list.add(topology_resources_overrides); - - boolean present_topology_conf_overrides = true && (is_set_topology_conf_overrides()); - list.add(present_topology_conf_overrides); - if (present_topology_conf_overrides) - list.add(topology_conf_overrides); - - boolean present_principal = true && (is_set_principal()); - list.add(present_principal); - if (present_principal) - list.add(principal); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((is_set_wait_secs()) ? 131071 : 524287); + if (is_set_wait_secs()) + hashCode = hashCode * 8191 + wait_secs; + + hashCode = hashCode * 8191 + ((is_set_num_workers()) ? 131071 : 524287); + if (is_set_num_workers()) + hashCode = hashCode * 8191 + num_workers; + + hashCode = hashCode * 8191 + ((is_set_num_executors()) ? 131071 : 524287); + if (is_set_num_executors()) + hashCode = hashCode * 8191 + num_executors.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_topology_resources_overrides()) ? 131071 : 524287); + if (is_set_topology_resources_overrides()) + hashCode = hashCode * 8191 + topology_resources_overrides.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_topology_conf_overrides()) ? 131071 : 524287); + if (is_set_topology_conf_overrides()) + hashCode = hashCode * 8191 + topology_conf_overrides.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_principal()) ? 131071 : 524287); + if (is_set_principal()) + hashCode = hashCode * 8191 + principal.hashCode(); + + return hashCode; } @Override @@ -604,7 +570,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_wait_secs()).compareTo(other.is_set_wait_secs()); + lastComparison = java.lang.Boolean.valueOf(is_set_wait_secs()).compareTo(other.is_set_wait_secs()); if (lastComparison != 0) { return lastComparison; } @@ -614,7 +580,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers()); if (lastComparison != 0) { return lastComparison; } @@ -624,7 +590,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); if (lastComparison != 0) { return lastComparison; } @@ -634,7 +600,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_resources_overrides()).compareTo(other.is_set_topology_resources_overrides()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_resources_overrides()).compareTo(other.is_set_topology_resources_overrides()); if (lastComparison != 0) { return lastComparison; } @@ -644,7 +610,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_conf_overrides()).compareTo(other.is_set_topology_conf_overrides()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_conf_overrides()).compareTo(other.is_set_topology_conf_overrides()); if (lastComparison != 0) { return lastComparison; } @@ -654,7 +620,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_principal()).compareTo(other.is_set_principal()); + lastComparison = java.lang.Boolean.valueOf(is_set_principal()).compareTo(other.is_set_principal()); if (lastComparison != 0) { return lastComparison; } @@ -672,16 +638,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } 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("RebalanceOptions("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("RebalanceOptions("); boolean first = true; if (is_set_wait_secs()) { @@ -752,7 +718,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } - 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; @@ -762,13 +728,13 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } - private static class RebalanceOptionsStandardSchemeFactory implements SchemeFactory { + private static class RebalanceOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public RebalanceOptionsStandardScheme getScheme() { return new RebalanceOptionsStandardScheme(); } } - private static class RebalanceOptionsStandardScheme extends StandardScheme<RebalanceOptions> { + private static class RebalanceOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<RebalanceOptions> { public void read(org.apache.thrift.protocol.TProtocol iprot, RebalanceOptions struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -800,8 +766,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map566 = iprot.readMapBegin(); - struct.num_executors = new HashMap<String,Integer>(2*_map566.size); - String _key567; + struct.num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map566.size); + java.lang.String _key567; int _val568; for (int _i569 = 0; _i569 < _map566.size; ++_i569) { @@ -820,16 +786,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map570 = iprot.readMapBegin(); - struct.topology_resources_overrides = new HashMap<String,Map<String,Double>>(2*_map570.size); - String _key571; - Map<String,Double> _val572; + struct.topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map570.size); + java.lang.String _key571; + java.util.Map<java.lang.String,java.lang.Double> _val572; for (int _i573 = 0; _i573 < _map570.size; ++_i573) { _key571 = iprot.readString(); { org.apache.thrift.protocol.TMap _map574 = iprot.readMapBegin(); - _val572 = new HashMap<String,Double>(2*_map574.size); - String _key575; + _val572 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map574.size); + java.lang.String _key575; double _val576; for (int _i577 = 0; _i577 < _map574.size; ++_i577) { @@ -892,7 +858,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.num_executors.size())); - for (Map.Entry<String, Integer> _iter578 : struct.num_executors.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter578 : struct.num_executors.entrySet()) { oprot.writeString(_iter578.getKey()); oprot.writeI32(_iter578.getValue()); @@ -907,12 +873,12 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption oprot.writeFieldBegin(TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.topology_resources_overrides.size())); - for (Map.Entry<String, Map<String,Double>> _iter579 : struct.topology_resources_overrides.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Double>> _iter579 : struct.topology_resources_overrides.entrySet()) { oprot.writeString(_iter579.getKey()); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter579.getValue().size())); - for (Map.Entry<String, Double> _iter580 : _iter579.getValue().entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter580 : _iter579.getValue().entrySet()) { oprot.writeString(_iter580.getKey()); oprot.writeDouble(_iter580.getValue()); @@ -945,18 +911,18 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } - private static class RebalanceOptionsTupleSchemeFactory implements SchemeFactory { + private static class RebalanceOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public RebalanceOptionsTupleScheme getScheme() { return new RebalanceOptionsTupleScheme(); } } - private static class RebalanceOptionsTupleScheme extends TupleScheme<RebalanceOptions> { + private static class RebalanceOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<RebalanceOptions> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_wait_secs()) { optionals.set(0); } @@ -985,7 +951,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (struct.is_set_num_executors()) { { oprot.writeI32(struct.num_executors.size()); - for (Map.Entry<String, Integer> _iter581 : struct.num_executors.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter581 : struct.num_executors.entrySet()) { oprot.writeString(_iter581.getKey()); oprot.writeI32(_iter581.getValue()); @@ -995,12 +961,12 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (struct.is_set_topology_resources_overrides()) { { oprot.writeI32(struct.topology_resources_overrides.size()); - for (Map.Entry<String, Map<String,Double>> _iter582 : struct.topology_resources_overrides.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Double>> _iter582 : struct.topology_resources_overrides.entrySet()) { oprot.writeString(_iter582.getKey()); { oprot.writeI32(_iter582.getValue().size()); - for (Map.Entry<String, Double> _iter583 : _iter582.getValue().entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter583 : _iter582.getValue().entrySet()) { oprot.writeString(_iter583.getKey()); oprot.writeDouble(_iter583.getValue()); @@ -1019,8 +985,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption @Override public void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.wait_secs = iprot.readI32(); struct.set_wait_secs_isSet(true); @@ -1032,8 +998,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (incoming.get(2)) { { org.apache.thrift.protocol.TMap _map584 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.num_executors = new HashMap<String,Integer>(2*_map584.size); - String _key585; + struct.num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map584.size); + java.lang.String _key585; int _val586; for (int _i587 = 0; _i587 < _map584.size; ++_i587) { @@ -1047,16 +1013,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption if (incoming.get(3)) { { org.apache.thrift.protocol.TMap _map588 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.topology_resources_overrides = new HashMap<String,Map<String,Double>>(2*_map588.size); - String _key589; - Map<String,Double> _val590; + struct.topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map588.size); + java.lang.String _key589; + java.util.Map<java.lang.String,java.lang.Double> _val590; for (int _i591 = 0; _i591 < _map588.size; ++_i591) { _key589 = iprot.readString(); { org.apache.thrift.protocol.TMap _map592 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - _val590 = new HashMap<String,Double>(2*_map592.size); - String _key593; + _val590 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map592.size); + java.lang.String _key593; double _val594; for (int _i595 = 0; _i595 < _map592.size; ++_i595) { @@ -1081,5 +1047,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption } } + 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/SettableBlobMeta.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java index 604e446..f41d069 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java +++ b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java @@ -16,55 +16,25 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMeta, SettableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<SettableBlobMeta> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SettableBlobMeta"); private static final org.apache.thrift.protocol.TField ACL_FIELD_DESC = new org.apache.thrift.protocol.TField("acl", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField REPLICATION_FACTOR_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_factor", org.apache.thrift.protocol.TType.I32, (short)2); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new SettableBlobMetaStandardSchemeFactory()); - schemes.put(TupleScheme.class, new SettableBlobMetaTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SettableBlobMetaStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SettableBlobMetaTupleSchemeFactory(); - private List<AccessControl> acl; // required + private java.util.List<AccessControl> acl; // required private int replication_factor; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -72,10 +42,10 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet ACL((short)1, "acl"), REPLICATION_FACTOR((short)2, "replication_factor"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -100,21 +70,21 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -123,7 +93,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -132,15 +102,15 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet private static final int __REPLICATION_FACTOR_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.REPLICATION_FACTOR}; - 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.ACL, new org.apache.thrift.meta_data.FieldMetaData("acl", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AccessControl.class)))); tmpMap.put(_Fields.REPLICATION_FACTOR, new org.apache.thrift.meta_data.FieldMetaData("replication_factor", org.apache.thrift.TFieldRequirementType.OPTIONAL, 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(SettableBlobMeta.class, metaDataMap); } @@ -148,7 +118,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } public SettableBlobMeta( - List<AccessControl> acl) + java.util.List<AccessControl> acl) { this(); this.acl = acl; @@ -160,7 +130,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet public SettableBlobMeta(SettableBlobMeta other) { __isset_bitfield = other.__isset_bitfield; if (other.is_set_acl()) { - List<AccessControl> __this__acl = new ArrayList<AccessControl>(other.acl.size()); + java.util.List<AccessControl> __this__acl = new java.util.ArrayList<AccessControl>(other.acl.size()); for (AccessControl other_element : other.acl) { __this__acl.add(new AccessControl(other_element)); } @@ -190,16 +160,16 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet public void add_to_acl(AccessControl elem) { if (this.acl == null) { - this.acl = new ArrayList<AccessControl>(); + this.acl = new java.util.ArrayList<AccessControl>(); } this.acl.add(elem); } - public List<AccessControl> get_acl() { + public java.util.List<AccessControl> get_acl() { return this.acl; } - public void set_acl(List<AccessControl> acl) { + public void set_acl(java.util.List<AccessControl> acl) { this.acl = acl; } @@ -228,25 +198,25 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } public void unset_replication_factor() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID); } /** Returns true if field replication_factor is set (has been assigned a value) and false otherwise */ public boolean is_set_replication_factor() { - return EncodingUtils.testBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID); } public void set_replication_factor_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case ACL: if (value == null) { unset_acl(); } else { - set_acl((List<AccessControl>)value); + set_acl((java.util.List<AccessControl>)value); } break; @@ -254,14 +224,14 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet if (value == null) { unset_replication_factor(); } else { - set_replication_factor((Integer)value); + set_replication_factor((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case ACL: return get_acl(); @@ -270,13 +240,13 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet return get_replication_factor(); } - 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) { @@ -285,11 +255,11 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet case REPLICATION_FACTOR: return is_set_replication_factor(); } - 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 SettableBlobMeta) @@ -300,6 +270,8 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet public boolean equals(SettableBlobMeta that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_acl = true && this.is_set_acl(); boolean that_present_acl = true && that.is_set_acl(); @@ -324,19 +296,17 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_acl = true && (is_set_acl()); - list.add(present_acl); - if (present_acl) - list.add(acl); + hashCode = hashCode * 8191 + ((is_set_acl()) ? 131071 : 524287); + if (is_set_acl()) + hashCode = hashCode * 8191 + acl.hashCode(); - boolean present_replication_factor = true && (is_set_replication_factor()); - list.add(present_replication_factor); - if (present_replication_factor) - list.add(replication_factor); + hashCode = hashCode * 8191 + ((is_set_replication_factor()) ? 131071 : 524287); + if (is_set_replication_factor()) + hashCode = hashCode * 8191 + replication_factor; - return list.hashCode(); + return hashCode; } @Override @@ -347,7 +317,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_acl()).compareTo(other.is_set_acl()); + lastComparison = java.lang.Boolean.valueOf(is_set_acl()).compareTo(other.is_set_acl()); if (lastComparison != 0) { return lastComparison; } @@ -357,7 +327,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_replication_factor()).compareTo(other.is_set_replication_factor()); + lastComparison = java.lang.Boolean.valueOf(is_set_replication_factor()).compareTo(other.is_set_replication_factor()); if (lastComparison != 0) { return lastComparison; } @@ -375,16 +345,16 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } 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("SettableBlobMeta("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("SettableBlobMeta("); boolean first = true; sb.append("acl:"); @@ -421,7 +391,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } } - 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; @@ -431,13 +401,13 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } } - private static class SettableBlobMetaStandardSchemeFactory implements SchemeFactory { + private static class SettableBlobMetaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SettableBlobMetaStandardScheme getScheme() { return new SettableBlobMetaStandardScheme(); } } - private static class SettableBlobMetaStandardScheme extends StandardScheme<SettableBlobMeta> { + private static class SettableBlobMetaStandardScheme extends org.apache.thrift.scheme.StandardScheme<SettableBlobMeta> { public void read(org.apache.thrift.protocol.TProtocol iprot, SettableBlobMeta struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -453,7 +423,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list606 = iprot.readListBegin(); - struct.acl = new ArrayList<AccessControl>(_list606.size); + struct.acl = new java.util.ArrayList<AccessControl>(_list606.size); AccessControl _elem607; for (int _i608 = 0; _i608 < _list606.size; ++_i608) { @@ -512,17 +482,17 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } - private static class SettableBlobMetaTupleSchemeFactory implements SchemeFactory { + private static class SettableBlobMetaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SettableBlobMetaTupleScheme getScheme() { return new SettableBlobMetaTupleScheme(); } } - private static class SettableBlobMetaTupleScheme extends TupleScheme<SettableBlobMeta> { + private static class SettableBlobMetaTupleScheme extends org.apache.thrift.scheme.TupleScheme<SettableBlobMeta> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta 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.acl.size()); for (AccessControl _iter610 : struct.acl) @@ -530,7 +500,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet _iter610.write(oprot); } } - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_replication_factor()) { optionals.set(0); } @@ -542,10 +512,10 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet @Override public void read(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; { org.apache.thrift.protocol.TList _list611 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.acl = new ArrayList<AccessControl>(_list611.size); + struct.acl = new java.util.ArrayList<AccessControl>(_list611.size); AccessControl _elem612; for (int _i613 = 0; _i613 < _list611.size; ++_i613) { @@ -555,7 +525,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } } struct.set_acl_isSet(true); - BitSet incoming = iprot.readBitSet(1); + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.replication_factor = iprot.readI32(); struct.set_replication_factor_isSet(true); @@ -563,5 +533,8 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet } } + 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(); + } }
