http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java index 4d7af9d..911a590 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java +++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java @@ -16,66 +16,36 @@ * 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 JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable, Comparable<JavaObject> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObject"); private static final org.apache.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("full_class_name", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("args_list", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new JavaObjectStandardSchemeFactory()); - schemes.put(TupleScheme.class, new JavaObjectTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new JavaObjectStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new JavaObjectTupleSchemeFactory(); - private String full_class_name; // required - private List<JavaObjectArg> args_list; // required + private java.lang.String full_class_name; // required + private java.util.List<JavaObjectArg> args_list; // 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 { FULL_CLASS_NAME((short)1, "full_class_name"), ARGS_LIST((short)2, "args_list"); - 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 JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec */ 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,21 +93,21 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec 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.FULL_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("full_class_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.ARGS_LIST, new org.apache.thrift.meta_data.FieldMetaData("args_list", 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, JavaObjectArg.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObject.class, metaDataMap); } @@ -145,8 +115,8 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } public JavaObject( - String full_class_name, - List<JavaObjectArg> args_list) + java.lang.String full_class_name, + java.util.List<JavaObjectArg> args_list) { this(); this.full_class_name = full_class_name; @@ -161,7 +131,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec this.full_class_name = other.full_class_name; } if (other.is_set_args_list()) { - List<JavaObjectArg> __this__args_list = new ArrayList<JavaObjectArg>(other.args_list.size()); + java.util.List<JavaObjectArg> __this__args_list = new java.util.ArrayList<JavaObjectArg>(other.args_list.size()); for (JavaObjectArg other_element : other.args_list) { __this__args_list.add(new JavaObjectArg(other_element)); } @@ -179,11 +149,11 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec this.args_list = null; } - public String get_full_class_name() { + public java.lang.String get_full_class_name() { return this.full_class_name; } - public void set_full_class_name(String full_class_name) { + public void set_full_class_name(java.lang.String full_class_name) { this.full_class_name = full_class_name; } @@ -212,16 +182,16 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec public void add_to_args_list(JavaObjectArg elem) { if (this.args_list == null) { - this.args_list = new ArrayList<JavaObjectArg>(); + this.args_list = new java.util.ArrayList<JavaObjectArg>(); } this.args_list.add(elem); } - public List<JavaObjectArg> get_args_list() { + public java.util.List<JavaObjectArg> get_args_list() { return this.args_list; } - public void set_args_list(List<JavaObjectArg> args_list) { + public void set_args_list(java.util.List<JavaObjectArg> args_list) { this.args_list = args_list; } @@ -240,13 +210,13 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case FULL_CLASS_NAME: if (value == null) { unset_full_class_name(); } else { - set_full_class_name((String)value); + set_full_class_name((java.lang.String)value); } break; @@ -254,14 +224,14 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec if (value == null) { unset_args_list(); } else { - set_args_list((List<JavaObjectArg>)value); + set_args_list((java.util.List<JavaObjectArg>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case FULL_CLASS_NAME: return get_full_class_name(); @@ -270,13 +240,13 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec return get_args_list(); } - 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 JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec case ARGS_LIST: return is_set_args_list(); } - 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 JavaObject) @@ -300,6 +270,8 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec public boolean equals(JavaObject that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_full_class_name = true && this.is_set_full_class_name(); boolean that_present_full_class_name = true && that.is_set_full_class_name(); @@ -324,19 +296,17 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_full_class_name = true && (is_set_full_class_name()); - list.add(present_full_class_name); - if (present_full_class_name) - list.add(full_class_name); + hashCode = hashCode * 8191 + ((is_set_full_class_name()) ? 131071 : 524287); + if (is_set_full_class_name()) + hashCode = hashCode * 8191 + full_class_name.hashCode(); - boolean present_args_list = true && (is_set_args_list()); - list.add(present_args_list); - if (present_args_list) - list.add(args_list); + hashCode = hashCode * 8191 + ((is_set_args_list()) ? 131071 : 524287); + if (is_set_args_list()) + hashCode = hashCode * 8191 + args_list.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -347,7 +317,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_full_class_name()).compareTo(other.is_set_full_class_name()); + lastComparison = java.lang.Boolean.valueOf(is_set_full_class_name()).compareTo(other.is_set_full_class_name()); if (lastComparison != 0) { return lastComparison; } @@ -357,7 +327,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_args_list()).compareTo(other.is_set_args_list()); + lastComparison = java.lang.Boolean.valueOf(is_set_args_list()).compareTo(other.is_set_args_list()); if (lastComparison != 0) { return lastComparison; } @@ -375,16 +345,16 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } 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("JavaObject("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("JavaObject("); boolean first = true; sb.append("full_class_name:"); @@ -427,7 +397,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } } - 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) { @@ -435,13 +405,13 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } } - private static class JavaObjectStandardSchemeFactory implements SchemeFactory { + private static class JavaObjectStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public JavaObjectStandardScheme getScheme() { return new JavaObjectStandardScheme(); } } - private static class JavaObjectStandardScheme extends StandardScheme<JavaObject> { + private static class JavaObjectStandardScheme extends org.apache.thrift.scheme.StandardScheme<JavaObject> { public void read(org.apache.thrift.protocol.TProtocol iprot, JavaObject struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -465,7 +435,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.args_list = new ArrayList<JavaObjectArg>(_list0.size); + struct.args_list = new java.util.ArrayList<JavaObjectArg>(_list0.size); JavaObjectArg _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { @@ -516,17 +486,17 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } - private static class JavaObjectTupleSchemeFactory implements SchemeFactory { + private static class JavaObjectTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public JavaObjectTupleScheme getScheme() { return new JavaObjectTupleScheme(); } } - private static class JavaObjectTupleScheme extends TupleScheme<JavaObject> { + private static class JavaObjectTupleScheme extends org.apache.thrift.scheme.TupleScheme<JavaObject> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, JavaObject 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.full_class_name); { oprot.writeI32(struct.args_list.size()); @@ -539,12 +509,12 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec @Override public void read(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.full_class_name = iprot.readString(); struct.set_full_class_name_isSet(true); { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.args_list = new ArrayList<JavaObjectArg>(_list5.size); + struct.args_list = new java.util.ArrayList<JavaObjectArg>(_list5.size); JavaObjectArg _elem6; for (int _i7 = 0; _i7 < _list5.size; ++_i7) { @@ -557,5 +527,8 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec } } + 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/JavaObjectArg.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java index bcb2596..17c38f6 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java +++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java @@ -16,41 +16,14 @@ * 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"}) +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaObjectArg._Fields> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObjectArg"); private static final org.apache.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("int_arg", org.apache.thrift.protocol.TType.I32, (short)1); @@ -69,10 +42,10 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO BINARY_ARG((short)5, "binary_arg"), DOUBLE_ARG((short)6, "double_arg"); - 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); } } @@ -105,21 +78,21 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO */ 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; } @@ -128,27 +101,27 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - 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); - tmpMap.put(_Fields.INT_ARG, new org.apache.thrift.meta_data.FieldMetaData("int_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + 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.INT_ARG, new org.apache.thrift.meta_data.FieldMetaData("int_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.LONG_ARG, new org.apache.thrift.meta_data.FieldMetaData("long_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.LONG_ARG, new org.apache.thrift.meta_data.FieldMetaData("long_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.STRING_ARG, new org.apache.thrift.meta_data.FieldMetaData("string_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.STRING_ARG, new org.apache.thrift.meta_data.FieldMetaData("string_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.BOOL_ARG, new org.apache.thrift.meta_data.FieldMetaData("bool_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.BOOL_ARG, new org.apache.thrift.meta_data.FieldMetaData("bool_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.BINARY_ARG, new org.apache.thrift.meta_data.FieldMetaData("binary_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.BINARY_ARG, new org.apache.thrift.meta_data.FieldMetaData("binary_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.thrift.meta_data.FieldMetaData("double_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.thrift.meta_data.FieldMetaData("double_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObjectArg.class, metaDataMap); } @@ -156,7 +129,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO super(); } - public JavaObjectArg(_Fields setField, Object value) { + public JavaObjectArg(_Fields setField, java.lang.Object value) { super(setField, value); } @@ -179,7 +152,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO return x; } - public static JavaObjectArg string_arg(String value) { + public static JavaObjectArg string_arg(java.lang.String value) { JavaObjectArg x = new JavaObjectArg(); x.set_string_arg(value); return x; @@ -191,7 +164,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO return x; } - public static JavaObjectArg binary_arg(ByteBuffer value) { + public static JavaObjectArg binary_arg(java.nio.ByteBuffer value) { JavaObjectArg x = new JavaObjectArg(); x.set_binary_arg(value); return x; @@ -199,7 +172,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO public static JavaObjectArg binary_arg(byte[] value) { JavaObjectArg x = new JavaObjectArg(); - x.set_binary_arg(ByteBuffer.wrap(Arrays.copyOf(value, value.length))); + x.set_binary_arg(java.nio.ByteBuffer.wrap(value.clone())); return x; } @@ -211,51 +184,51 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO @Override - protected void checkType(_Fields setField, Object value) throws ClassCastException { + protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException { switch (setField) { case INT_ARG: - if (value instanceof Integer) { + if (value instanceof java.lang.Integer) { break; } - throw new ClassCastException("Was expecting value of type Integer for field 'int_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.lang.Integer for field 'int_arg', but got " + value.getClass().getSimpleName()); case LONG_ARG: - if (value instanceof Long) { + if (value instanceof java.lang.Long) { break; } - throw new ClassCastException("Was expecting value of type Long for field 'long_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.lang.Long for field 'long_arg', but got " + value.getClass().getSimpleName()); case STRING_ARG: - if (value instanceof String) { + if (value instanceof java.lang.String) { break; } - throw new ClassCastException("Was expecting value of type String for field 'string_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.lang.String for field 'string_arg', but got " + value.getClass().getSimpleName()); case BOOL_ARG: - if (value instanceof Boolean) { + if (value instanceof java.lang.Boolean) { break; } - throw new ClassCastException("Was expecting value of type Boolean for field 'bool_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.lang.Boolean for field 'bool_arg', but got " + value.getClass().getSimpleName()); case BINARY_ARG: - if (value instanceof ByteBuffer) { + if (value instanceof java.nio.ByteBuffer) { break; } - throw new ClassCastException("Was expecting value of type ByteBuffer for field 'binary_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.nio.ByteBuffer for field 'binary_arg', but got " + value.getClass().getSimpleName()); case DOUBLE_ARG: - if (value instanceof Double) { + if (value instanceof java.lang.Double) { break; } - throw new ClassCastException("Was expecting value of type Double for field 'double_arg', but got " + value.getClass().getSimpleName()); + throw new java.lang.ClassCastException("Was expecting value of type java.lang.Double for field 'double_arg', but got " + value.getClass().getSimpleName()); default: - throw new IllegalArgumentException("Unknown field id " + setField); + throw new java.lang.IllegalArgumentException("Unknown field id " + setField); } } @Override - protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { + protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { case INT_ARG: if (field.type == INT_ARG_FIELD_DESC.type) { - Integer int_arg; + java.lang.Integer int_arg; int_arg = iprot.readI32(); return int_arg; } else { @@ -264,7 +237,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } case LONG_ARG: if (field.type == LONG_ARG_FIELD_DESC.type) { - Long long_arg; + java.lang.Long long_arg; long_arg = iprot.readI64(); return long_arg; } else { @@ -273,7 +246,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } case STRING_ARG: if (field.type == STRING_ARG_FIELD_DESC.type) { - String string_arg; + java.lang.String string_arg; string_arg = iprot.readString(); return string_arg; } else { @@ -282,7 +255,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } case BOOL_ARG: if (field.type == BOOL_ARG_FIELD_DESC.type) { - Boolean bool_arg; + java.lang.Boolean bool_arg; bool_arg = iprot.readBool(); return bool_arg; } else { @@ -291,7 +264,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } case BINARY_ARG: if (field.type == BINARY_ARG_FIELD_DESC.type) { - ByteBuffer binary_arg; + java.nio.ByteBuffer binary_arg; binary_arg = iprot.readBinary(); return binary_arg; } else { @@ -300,7 +273,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } case DOUBLE_ARG: if (field.type == DOUBLE_ARG_FIELD_DESC.type) { - Double double_arg; + java.lang.Double double_arg; double_arg = iprot.readDouble(); return double_arg; } else { @@ -308,7 +281,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO return null; } default: - throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); + throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); @@ -320,68 +293,68 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case INT_ARG: - Integer int_arg = (Integer)value_; + java.lang.Integer int_arg = (java.lang.Integer)value_; oprot.writeI32(int_arg); return; case LONG_ARG: - Long long_arg = (Long)value_; + java.lang.Long long_arg = (java.lang.Long)value_; oprot.writeI64(long_arg); return; case STRING_ARG: - String string_arg = (String)value_; + java.lang.String string_arg = (java.lang.String)value_; oprot.writeString(string_arg); return; case BOOL_ARG: - Boolean bool_arg = (Boolean)value_; + java.lang.Boolean bool_arg = (java.lang.Boolean)value_; oprot.writeBool(bool_arg); return; case BINARY_ARG: - ByteBuffer binary_arg = (ByteBuffer)value_; + java.nio.ByteBuffer binary_arg = (java.nio.ByteBuffer)value_; oprot.writeBinary(binary_arg); return; case DOUBLE_ARG: - Double double_arg = (Double)value_; + java.lang.Double double_arg = (java.lang.Double)value_; oprot.writeDouble(double_arg); return; default: - throw new IllegalStateException("Cannot write union with unknown field " + setField_); + throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_); } } @Override - protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException { + protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(fieldID); if (setField != null) { switch (setField) { case INT_ARG: - Integer int_arg; + java.lang.Integer int_arg; int_arg = iprot.readI32(); return int_arg; case LONG_ARG: - Long long_arg; + java.lang.Long long_arg; long_arg = iprot.readI64(); return long_arg; case STRING_ARG: - String string_arg; + java.lang.String string_arg; string_arg = iprot.readString(); return string_arg; case BOOL_ARG: - Boolean bool_arg; + java.lang.Boolean bool_arg; bool_arg = iprot.readBool(); return bool_arg; case BINARY_ARG: - ByteBuffer binary_arg; + java.nio.ByteBuffer binary_arg; binary_arg = iprot.readBinary(); return binary_arg; case DOUBLE_ARG: - Double double_arg; + java.lang.Double double_arg; double_arg = iprot.readDouble(); return double_arg; default: - throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); + throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { - throw new TProtocolException("Couldn't find a field with field id " + fieldID); + throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID); } } @@ -389,31 +362,31 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case INT_ARG: - Integer int_arg = (Integer)value_; + java.lang.Integer int_arg = (java.lang.Integer)value_; oprot.writeI32(int_arg); return; case LONG_ARG: - Long long_arg = (Long)value_; + java.lang.Long long_arg = (java.lang.Long)value_; oprot.writeI64(long_arg); return; case STRING_ARG: - String string_arg = (String)value_; + java.lang.String string_arg = (java.lang.String)value_; oprot.writeString(string_arg); return; case BOOL_ARG: - Boolean bool_arg = (Boolean)value_; + java.lang.Boolean bool_arg = (java.lang.Boolean)value_; oprot.writeBool(bool_arg); return; case BINARY_ARG: - ByteBuffer binary_arg = (ByteBuffer)value_; + java.nio.ByteBuffer binary_arg = (java.nio.ByteBuffer)value_; oprot.writeBinary(binary_arg); return; case DOUBLE_ARG: - Double double_arg = (Double)value_; + java.lang.Double double_arg = (java.lang.Double)value_; oprot.writeDouble(double_arg); return; default: - throw new IllegalStateException("Cannot write union with unknown field " + setField_); + throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_); } } @@ -433,7 +406,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO case DOUBLE_ARG: return DOUBLE_ARG_FIELD_DESC; default: - throw new IllegalArgumentException("Unknown field id " + setField); + throw new java.lang.IllegalArgumentException("Unknown field id " + setField); } } @@ -454,9 +427,9 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO public int get_int_arg() { if (getSetField() == _Fields.INT_ARG) { - return (Integer)getFieldValue(); + return (java.lang.Integer)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'int_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'int_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } @@ -467,9 +440,9 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO public long get_long_arg() { if (getSetField() == _Fields.LONG_ARG) { - return (Long)getFieldValue(); + return (java.lang.Long)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'long_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'long_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } @@ -478,25 +451,25 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO value_ = value; } - public String get_string_arg() { + public java.lang.String get_string_arg() { if (getSetField() == _Fields.STRING_ARG) { - return (String)getFieldValue(); + return (java.lang.String)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'string_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'string_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } - public void set_string_arg(String value) { - if (value == null) throw new NullPointerException(); + public void set_string_arg(java.lang.String value) { + if (value == null) throw new java.lang.NullPointerException(); setField_ = _Fields.STRING_ARG; value_ = value; } public boolean get_bool_arg() { if (getSetField() == _Fields.BOOL_ARG) { - return (Boolean)getFieldValue(); + return (java.lang.Boolean)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'bool_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'bool_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } @@ -507,33 +480,33 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO public byte[] get_binary_arg() { set_binary_arg(org.apache.thrift.TBaseHelper.rightSize(buffer_for_binary_arg())); - ByteBuffer b = buffer_for_binary_arg(); + java.nio.ByteBuffer b = buffer_for_binary_arg(); return b == null ? null : b.array(); } - public ByteBuffer buffer_for_binary_arg() { + public java.nio.ByteBuffer buffer_for_binary_arg() { if (getSetField() == _Fields.BINARY_ARG) { - return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue()); + return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue()); } else { - throw new RuntimeException("Cannot get field 'binary_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'binary_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } public void set_binary_arg(byte[] value) { - set_binary_arg(ByteBuffer.wrap(Arrays.copyOf(value, value.length))); + set_binary_arg(java.nio.ByteBuffer.wrap(value.clone())); } - public void set_binary_arg(ByteBuffer value) { - if (value == null) throw new NullPointerException(); + public void set_binary_arg(java.nio.ByteBuffer value) { + if (value == null) throw new java.lang.NullPointerException(); setField_ = _Fields.BINARY_ARG; value_ = value; } public double get_double_arg() { if (getSetField() == _Fields.DOUBLE_ARG) { - return (Double)getFieldValue(); + return (java.lang.Double)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'double_arg' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new java.lang.RuntimeException("Cannot get field 'double_arg' because union is currently set to " + getFieldDesc(getSetField()).name); } } @@ -572,7 +545,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } - public boolean equals(Object other) { + public boolean equals(java.lang.Object other) { if (other instanceof JavaObjectArg) { return equals((JavaObjectArg)other); } else { @@ -596,12 +569,12 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>(); list.add(this.getClass().getName()); org.apache.thrift.TFieldIdEnum setField = getSetField(); if (setField != null) { list.add(setField.getThriftFieldId()); - Object value = getFieldValue(); + java.lang.Object value = getFieldValue(); if (value instanceof org.apache.thrift.TEnum) { list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue()); } else { @@ -619,7 +592,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO } - 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) { http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java index 32b0a74..0a7decd 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java +++ b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.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 KeyAlreadyExistsException extends TException implements org.apache.thrift.TBase<KeyAlreadyExistsException, KeyAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyAlreadyExistsException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") +public class KeyAlreadyExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<KeyAlreadyExistsException, KeyAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyAlreadyExistsException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyAlreadyExistsException"); 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 KeyAlreadyExistsExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new KeyAlreadyExistsExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyAlreadyExistsExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyAlreadyExistsExceptionTupleSchemeFactory(); - 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 KeyAlreadyExistsException extends TException implements org.apache. */ 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 KeyAlreadyExistsException extends TException implements org.apache. 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(KeyAlreadyExistsException.class, metaDataMap); } @@ -137,7 +107,7 @@ public class KeyAlreadyExistsException extends TException implements org.apache. } public KeyAlreadyExistsException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -161,11 +131,11 @@ public class KeyAlreadyExistsException extends TException implements org.apache. 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 KeyAlreadyExistsException extends TException implements org.apache. } } - 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 KeyAlreadyExistsException) @@ -231,6 +201,8 @@ public class KeyAlreadyExistsException extends TException implements org.apache. public boolean equals(KeyAlreadyExistsException 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 KeyAlreadyExistsException extends TException implements org.apache. @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 KeyAlreadyExistsException extends TException implements org.apache. 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 KeyAlreadyExistsException extends TException implements org.apache. } 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("KeyAlreadyExistsException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("KeyAlreadyExistsException("); boolean first = true; sb.append("msg:"); @@ -322,7 +293,7 @@ public class KeyAlreadyExistsException extends TException implements org.apache. } } - 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 KeyAlreadyExistsException extends TException implements org.apache. } } - private static class KeyAlreadyExistsExceptionStandardSchemeFactory implements SchemeFactory { + private static class KeyAlreadyExistsExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KeyAlreadyExistsExceptionStandardScheme getScheme() { return new KeyAlreadyExistsExceptionStandardScheme(); } } - private static class KeyAlreadyExistsExceptionStandardScheme extends StandardScheme<KeyAlreadyExistsException> { + private static class KeyAlreadyExistsExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<KeyAlreadyExistsException> { public void read(org.apache.thrift.protocol.TProtocol iprot, KeyAlreadyExistsException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -380,27 +351,30 @@ public class KeyAlreadyExistsException extends TException implements org.apache. } - private static class KeyAlreadyExistsExceptionTupleSchemeFactory implements SchemeFactory { + private static class KeyAlreadyExistsExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KeyAlreadyExistsExceptionTupleScheme getScheme() { return new KeyAlreadyExistsExceptionTupleScheme(); } } - private static class KeyAlreadyExistsExceptionTupleScheme extends TupleScheme<KeyAlreadyExistsException> { + private static class KeyAlreadyExistsExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<KeyAlreadyExistsException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, KeyAlreadyExistsException 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, KeyAlreadyExistsException 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(); + } } http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java index d55564c..8ec60d3 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java +++ b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.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 KeyNotFoundException extends TException implements org.apache.thrift.TBase<KeyNotFoundException, KeyNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyNotFoundException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") +public class KeyNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<KeyNotFoundException, KeyNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyNotFoundException"); 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 KeyNotFoundExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new KeyNotFoundExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyNotFoundExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyNotFoundExceptionTupleSchemeFactory(); - 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 KeyNotFoundException extends TException implements org.apache.thrif */ 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 KeyNotFoundException extends TException implements org.apache.thrif 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(KeyNotFoundException.class, metaDataMap); } @@ -137,7 +107,7 @@ public class KeyNotFoundException extends TException implements org.apache.thrif } public KeyNotFoundException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -161,11 +131,11 @@ public class KeyNotFoundException extends TException implements org.apache.thrif 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 KeyNotFoundException extends TException implements org.apache.thrif } } - 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 KeyNotFoundException) @@ -231,6 +201,8 @@ public class KeyNotFoundException extends TException implements org.apache.thrif public boolean equals(KeyNotFoundException 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 KeyNotFoundException extends TException implements org.apache.thrif @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 KeyNotFoundException extends TException implements org.apache.thrif 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 KeyNotFoundException extends TException implements org.apache.thrif } 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("KeyNotFoundException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("KeyNotFoundException("); boolean first = true; sb.append("msg:"); @@ -322,7 +293,7 @@ public class KeyNotFoundException extends TException implements org.apache.thrif } } - 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 KeyNotFoundException extends TException implements org.apache.thrif } } - private static class KeyNotFoundExceptionStandardSchemeFactory implements SchemeFactory { + private static class KeyNotFoundExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KeyNotFoundExceptionStandardScheme getScheme() { return new KeyNotFoundExceptionStandardScheme(); } } - private static class KeyNotFoundExceptionStandardScheme extends StandardScheme<KeyNotFoundException> { + private static class KeyNotFoundExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<KeyNotFoundException> { public void read(org.apache.thrift.protocol.TProtocol iprot, KeyNotFoundException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -380,27 +351,30 @@ public class KeyNotFoundException extends TException implements org.apache.thrif } - private static class KeyNotFoundExceptionTupleSchemeFactory implements SchemeFactory { + private static class KeyNotFoundExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KeyNotFoundExceptionTupleScheme getScheme() { return new KeyNotFoundExceptionTupleScheme(); } } - private static class KeyNotFoundExceptionTupleScheme extends TupleScheme<KeyNotFoundException> { + private static class KeyNotFoundExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<KeyNotFoundException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, KeyNotFoundException 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, KeyNotFoundException 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(); + } } http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java index f2ad8e2..4f31bcc 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java +++ b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java @@ -16,52 +16,22 @@ * 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 KillOptions implements org.apache.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable, Comparable<KillOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KillOptions"); private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new KillOptionsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new KillOptionsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KillOptionsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KillOptionsTupleSchemeFactory(); private int wait_secs; // optional @@ -69,10 +39,10 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt public enum _Fields implements org.apache.thrift.TFieldIdEnum { WAIT_SECS((short)1, "wait_secs"); - 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 KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt */ 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,7 +88,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -127,12 +97,12 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt private static final int __WAIT_SECS_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.WAIT_SECS}; - 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))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KillOptions.class, metaDataMap); } @@ -167,55 +137,55 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } 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 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; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case WAIT_SECS: return get_wait_secs(); } - 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 WAIT_SECS: return is_set_wait_secs(); } - 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 KillOptions) @@ -226,6 +196,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt public boolean equals(KillOptions 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(); @@ -241,14 +213,13 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_wait_secs = true && (is_set_wait_secs()); - list.add(present_wait_secs); - if (present_wait_secs) - list.add(wait_secs); + hashCode = hashCode * 8191 + ((is_set_wait_secs()) ? 131071 : 524287); + if (is_set_wait_secs()) + hashCode = hashCode * 8191 + wait_secs; - return list.hashCode(); + return hashCode; } @Override @@ -259,7 +230,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt 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; } @@ -277,16 +248,16 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } 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("KillOptions("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("KillOptions("); boolean first = true; if (is_set_wait_secs()) { @@ -311,7 +282,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } } - 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; @@ -321,13 +292,13 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } } - private static class KillOptionsStandardSchemeFactory implements SchemeFactory { + private static class KillOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KillOptionsStandardScheme getScheme() { return new KillOptionsStandardScheme(); } } - private static class KillOptionsStandardScheme extends StandardScheme<KillOptions> { + private static class KillOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<KillOptions> { public void read(org.apache.thrift.protocol.TProtocol iprot, KillOptions struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -371,18 +342,18 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } - private static class KillOptionsTupleSchemeFactory implements SchemeFactory { + private static class KillOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public KillOptionsTupleScheme getScheme() { return new KillOptionsTupleScheme(); } } - private static class KillOptionsTupleScheme extends TupleScheme<KillOptions> { + private static class KillOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<KillOptions> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, KillOptions 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); } @@ -394,8 +365,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt @Override public void read(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.wait_secs = iprot.readI32(); struct.set_wait_secs_isSet(true); @@ -403,5 +374,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt } } + 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(); + } }
