http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java index 9b13724..7fcd248 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.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)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers"); private static final org.apache.thrift.protocol.TField APPROVED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("approved_workers", org.apache.thrift.protocol.TType.MAP, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new LSApprovedWorkersStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LSApprovedWorkersTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSApprovedWorkersStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSApprovedWorkersTupleSchemeFactory(); - private Map<String,Integer> approved_workers; // required + private java.util.Map<java.lang.String,java.lang.Integer> approved_workers; // 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 { APPROVED_WORKERS((short)1, "approved_workers"); - 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 LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork */ 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,20 +88,20 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork 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.APPROVED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("approved_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 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(LSApprovedWorkers.class, metaDataMap); } @@ -139,7 +109,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } public LSApprovedWorkers( - Map<String,Integer> approved_workers) + java.util.Map<java.lang.String,java.lang.Integer> approved_workers) { this(); this.approved_workers = approved_workers; @@ -150,7 +120,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork */ public LSApprovedWorkers(LSApprovedWorkers other) { if (other.is_set_approved_workers()) { - Map<String,Integer> __this__approved_workers = new HashMap<String,Integer>(other.approved_workers); + java.util.Map<java.lang.String,java.lang.Integer> __this__approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(other.approved_workers); this.approved_workers = __this__approved_workers; } } @@ -168,18 +138,18 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork return (this.approved_workers == null) ? 0 : this.approved_workers.size(); } - public void put_to_approved_workers(String key, int val) { + public void put_to_approved_workers(java.lang.String key, int val) { if (this.approved_workers == null) { - this.approved_workers = new HashMap<String,Integer>(); + this.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(); } this.approved_workers.put(key, val); } - public Map<String,Integer> get_approved_workers() { + public java.util.Map<java.lang.String,java.lang.Integer> get_approved_workers() { return this.approved_workers; } - public void set_approved_workers(Map<String,Integer> approved_workers) { + public void set_approved_workers(java.util.Map<java.lang.String,java.lang.Integer> approved_workers) { this.approved_workers = approved_workers; } @@ -198,43 +168,43 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case APPROVED_WORKERS: if (value == null) { unset_approved_workers(); } else { - set_approved_workers((Map<String,Integer>)value); + set_approved_workers((java.util.Map<java.lang.String,java.lang.Integer>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case APPROVED_WORKERS: return get_approved_workers(); } - 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 APPROVED_WORKERS: return is_set_approved_workers(); } - 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 LSApprovedWorkers) @@ -245,6 +215,8 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork public boolean equals(LSApprovedWorkers that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_approved_workers = true && this.is_set_approved_workers(); boolean that_present_approved_workers = true && that.is_set_approved_workers(); @@ -260,14 +232,13 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_approved_workers = true && (is_set_approved_workers()); - list.add(present_approved_workers); - if (present_approved_workers) - list.add(approved_workers); + hashCode = hashCode * 8191 + ((is_set_approved_workers()) ? 131071 : 524287); + if (is_set_approved_workers()) + hashCode = hashCode * 8191 + approved_workers.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -278,7 +249,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_approved_workers()).compareTo(other.is_set_approved_workers()); + lastComparison = java.lang.Boolean.valueOf(is_set_approved_workers()).compareTo(other.is_set_approved_workers()); if (lastComparison != 0) { return lastComparison; } @@ -296,16 +267,16 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } 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("LSApprovedWorkers("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("LSApprovedWorkers("); boolean first = true; sb.append("approved_workers:"); @@ -336,7 +307,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } } - 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) { @@ -344,13 +315,13 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } } - private static class LSApprovedWorkersStandardSchemeFactory implements SchemeFactory { + private static class LSApprovedWorkersStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSApprovedWorkersStandardScheme getScheme() { return new LSApprovedWorkersStandardScheme(); } } - private static class LSApprovedWorkersStandardScheme extends StandardScheme<LSApprovedWorkers> { + private static class LSApprovedWorkersStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSApprovedWorkers> { public void read(org.apache.thrift.protocol.TProtocol iprot, LSApprovedWorkers struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -366,8 +337,8 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map800 = iprot.readMapBegin(); - struct.approved_workers = new HashMap<String,Integer>(2*_map800.size); - String _key801; + struct.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map800.size); + java.lang.String _key801; int _val802; for (int _i803 = 0; _i803 < _map800.size; ++_i803) { @@ -399,7 +370,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size())); - for (Map.Entry<String, Integer> _iter804 : struct.approved_workers.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter804 : struct.approved_workers.entrySet()) { oprot.writeString(_iter804.getKey()); oprot.writeI32(_iter804.getValue()); @@ -414,20 +385,20 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } - private static class LSApprovedWorkersTupleSchemeFactory implements SchemeFactory { + private static class LSApprovedWorkersTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSApprovedWorkersTupleScheme getScheme() { return new LSApprovedWorkersTupleScheme(); } } - private static class LSApprovedWorkersTupleScheme extends TupleScheme<LSApprovedWorkers> { + private static class LSApprovedWorkersTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSApprovedWorkers> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers 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.approved_workers.size()); - for (Map.Entry<String, Integer> _iter805 : struct.approved_workers.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter805 : struct.approved_workers.entrySet()) { oprot.writeString(_iter805.getKey()); oprot.writeI32(_iter805.getValue()); @@ -437,11 +408,11 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork @Override public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; { org.apache.thrift.protocol.TMap _map806 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.approved_workers = new HashMap<String,Integer>(2*_map806.size); - String _key807; + struct.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map806.size); + java.lang.String _key807; int _val808; for (int _i809 = 0; _i809 < _map806.size; ++_i809) { @@ -454,5 +425,8 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork } } + 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/LSSupervisorAssignments.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java index 95f78ca..4abe47a 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.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)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments"); private static final org.apache.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("assignments", org.apache.thrift.protocol.TType.MAP, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new LSSupervisorAssignmentsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LSSupervisorAssignmentsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorAssignmentsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorAssignmentsTupleSchemeFactory(); - private Map<Integer,LocalAssignment> assignments; // required + private java.util.Map<java.lang.Integer,LocalAssignment> assignments; // 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 { ASSIGNMENTS((short)1, "assignments"); - 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 LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv */ 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,20 +88,20 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv 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.ASSIGNMENTS, new org.apache.thrift.meta_data.FieldMetaData("assignments", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32), new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LocalAssignment.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorAssignments.class, metaDataMap); } @@ -139,7 +109,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } public LSSupervisorAssignments( - Map<Integer,LocalAssignment> assignments) + java.util.Map<java.lang.Integer,LocalAssignment> assignments) { this(); this.assignments = assignments; @@ -150,13 +120,13 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv */ public LSSupervisorAssignments(LSSupervisorAssignments other) { if (other.is_set_assignments()) { - Map<Integer,LocalAssignment> __this__assignments = new HashMap<Integer,LocalAssignment>(other.assignments.size()); - for (Map.Entry<Integer, LocalAssignment> other_element : other.assignments.entrySet()) { + java.util.Map<java.lang.Integer,LocalAssignment> __this__assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(other.assignments.size()); + for (java.util.Map.Entry<java.lang.Integer, LocalAssignment> other_element : other.assignments.entrySet()) { - Integer other_element_key = other_element.getKey(); + java.lang.Integer other_element_key = other_element.getKey(); LocalAssignment other_element_value = other_element.getValue(); - Integer __this__assignments_copy_key = other_element_key; + java.lang.Integer __this__assignments_copy_key = other_element_key; LocalAssignment __this__assignments_copy_value = new LocalAssignment(other_element_value); @@ -181,16 +151,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv public void put_to_assignments(int key, LocalAssignment val) { if (this.assignments == null) { - this.assignments = new HashMap<Integer,LocalAssignment>(); + this.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(); } this.assignments.put(key, val); } - public Map<Integer,LocalAssignment> get_assignments() { + public java.util.Map<java.lang.Integer,LocalAssignment> get_assignments() { return this.assignments; } - public void set_assignments(Map<Integer,LocalAssignment> assignments) { + public void set_assignments(java.util.Map<java.lang.Integer,LocalAssignment> assignments) { this.assignments = assignments; } @@ -209,43 +179,43 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case ASSIGNMENTS: if (value == null) { unset_assignments(); } else { - set_assignments((Map<Integer,LocalAssignment>)value); + set_assignments((java.util.Map<java.lang.Integer,LocalAssignment>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case ASSIGNMENTS: return get_assignments(); } - 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 ASSIGNMENTS: return is_set_assignments(); } - 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 LSSupervisorAssignments) @@ -256,6 +226,8 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv public boolean equals(LSSupervisorAssignments that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_assignments = true && this.is_set_assignments(); boolean that_present_assignments = true && that.is_set_assignments(); @@ -271,14 +243,13 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_assignments = true && (is_set_assignments()); - list.add(present_assignments); - if (present_assignments) - list.add(assignments); + hashCode = hashCode * 8191 + ((is_set_assignments()) ? 131071 : 524287); + if (is_set_assignments()) + hashCode = hashCode * 8191 + assignments.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -289,7 +260,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments()); + lastComparison = java.lang.Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments()); if (lastComparison != 0) { return lastComparison; } @@ -307,16 +278,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } 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("LSSupervisorAssignments("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("LSSupervisorAssignments("); boolean first = true; sb.append("assignments:"); @@ -347,7 +318,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } } - 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) { @@ -355,13 +326,13 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } } - private static class LSSupervisorAssignmentsStandardSchemeFactory implements SchemeFactory { + private static class LSSupervisorAssignmentsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSSupervisorAssignmentsStandardScheme getScheme() { return new LSSupervisorAssignmentsStandardScheme(); } } - private static class LSSupervisorAssignmentsStandardScheme extends StandardScheme<LSSupervisorAssignments> { + private static class LSSupervisorAssignmentsStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSSupervisorAssignments> { public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorAssignments struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -377,7 +348,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map810 = iprot.readMapBegin(); - struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map810.size); + struct.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(2*_map810.size); int _key811; LocalAssignment _val812; for (int _i813 = 0; _i813 < _map810.size; ++_i813) @@ -411,7 +382,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size())); - for (Map.Entry<Integer, LocalAssignment> _iter814 : struct.assignments.entrySet()) + for (java.util.Map.Entry<java.lang.Integer, LocalAssignment> _iter814 : struct.assignments.entrySet()) { oprot.writeI32(_iter814.getKey()); _iter814.getValue().write(oprot); @@ -426,20 +397,20 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } - private static class LSSupervisorAssignmentsTupleSchemeFactory implements SchemeFactory { + private static class LSSupervisorAssignmentsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSSupervisorAssignmentsTupleScheme getScheme() { return new LSSupervisorAssignmentsTupleScheme(); } } - private static class LSSupervisorAssignmentsTupleScheme extends TupleScheme<LSSupervisorAssignments> { + private static class LSSupervisorAssignmentsTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSSupervisorAssignments> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments 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.assignments.size()); - for (Map.Entry<Integer, LocalAssignment> _iter815 : struct.assignments.entrySet()) + for (java.util.Map.Entry<java.lang.Integer, LocalAssignment> _iter815 : struct.assignments.entrySet()) { oprot.writeI32(_iter815.getKey()); _iter815.getValue().write(oprot); @@ -449,10 +420,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv @Override public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; { org.apache.thrift.protocol.TMap _map816 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map816.size); + struct.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(2*_map816.size); int _key817; LocalAssignment _val818; for (int _i819 = 0; _i819 < _map816.size; ++_i819) @@ -467,5 +438,8 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv } } + 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/LSSupervisorId.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java index 605b9b1..15b9651 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.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)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, LSSupervisorId._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorId> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorId"); private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", 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 LSSupervisorIdStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LSSupervisorIdTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorIdStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorIdTupleSchemeFactory(); - private String supervisor_id; // required + private java.lang.String supervisor_id; // 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 { SUPERVISOR_ID((short)1, "supervisor_id"); - 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 LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L */ 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 LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L 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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", 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(LSSupervisorId.class, metaDataMap); } @@ -137,7 +107,7 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } public LSSupervisorId( - String supervisor_id) + java.lang.String supervisor_id) { this(); this.supervisor_id = supervisor_id; @@ -161,11 +131,11 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L this.supervisor_id = null; } - public String get_supervisor_id() { + public java.lang.String get_supervisor_id() { return this.supervisor_id; } - public void set_supervisor_id(String supervisor_id) { + public void set_supervisor_id(java.lang.String supervisor_id) { this.supervisor_id = supervisor_id; } @@ -184,43 +154,43 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SUPERVISOR_ID: if (value == null) { unset_supervisor_id(); } else { - set_supervisor_id((String)value); + set_supervisor_id((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUPERVISOR_ID: return get_supervisor_id(); } - 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 SUPERVISOR_ID: return is_set_supervisor_id(); } - 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 LSSupervisorId) @@ -231,6 +201,8 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L public boolean equals(LSSupervisorId that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_supervisor_id = true && this.is_set_supervisor_id(); boolean that_present_supervisor_id = true && that.is_set_supervisor_id(); @@ -246,14 +218,13 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_supervisor_id = true && (is_set_supervisor_id()); - list.add(present_supervisor_id); - if (present_supervisor_id) - list.add(supervisor_id); + hashCode = hashCode * 8191 + ((is_set_supervisor_id()) ? 131071 : 524287); + if (is_set_supervisor_id()) + hashCode = hashCode * 8191 + supervisor_id.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } 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("LSSupervisorId("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("LSSupervisorId("); boolean first = true; sb.append("supervisor_id:"); @@ -322,7 +293,7 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } } - 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 LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } } - private static class LSSupervisorIdStandardSchemeFactory implements SchemeFactory { + private static class LSSupervisorIdStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSSupervisorIdStandardScheme getScheme() { return new LSSupervisorIdStandardScheme(); } } - private static class LSSupervisorIdStandardScheme extends StandardScheme<LSSupervisorId> { + private static class LSSupervisorIdStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSSupervisorId> { public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorId struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -380,27 +351,30 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L } - private static class LSSupervisorIdTupleSchemeFactory implements SchemeFactory { + private static class LSSupervisorIdTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSSupervisorIdTupleScheme getScheme() { return new LSSupervisorIdTupleScheme(); } } - private static class LSSupervisorIdTupleScheme extends TupleScheme<LSSupervisorId> { + private static class LSSupervisorIdTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSSupervisorId> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId 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.supervisor_id); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.supervisor_id = iprot.readString(); struct.set_supervisor_id_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/LSTopoHistory.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java index 432b9b6..2f2dd78 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.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 LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LSTopoHistory._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistory> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSTopoHistory"); @@ -60,16 +33,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST private static final org.apache.thrift.protocol.TField USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("users", org.apache.thrift.protocol.TType.LIST, (short)3); private static final org.apache.thrift.protocol.TField GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("groups", org.apache.thrift.protocol.TType.LIST, (short)4); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new LSTopoHistoryStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LSTopoHistoryTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSTopoHistoryStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSTopoHistoryTupleSchemeFactory(); - private String topology_id; // required + private java.lang.String topology_id; // required private long time_stamp; // required - private List<String> users; // required - private List<String> groups; // required + private java.util.List<java.lang.String> users; // required + private java.util.List<java.lang.String> groups; // 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 { @@ -78,10 +48,10 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST USERS((short)3, "users"), GROUPS((short)4, "groups"); - 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); } } @@ -110,21 +80,21 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST */ 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; } @@ -133,7 +103,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -141,9 +111,9 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST // isset id assignments private static final int __TIME_STAMP_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.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TIME_STAMP, new org.apache.thrift.meta_data.FieldMetaData("time_stamp", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -154,7 +124,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST tmpMap.put(_Fields.GROUPS, new org.apache.thrift.meta_data.FieldMetaData("groups", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSTopoHistory.class, metaDataMap); } @@ -162,10 +132,10 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } public LSTopoHistory( - String topology_id, + java.lang.String topology_id, long time_stamp, - List<String> users, - List<String> groups) + java.util.List<java.lang.String> users, + java.util.List<java.lang.String> groups) { this(); this.topology_id = topology_id; @@ -185,11 +155,11 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } this.time_stamp = other.time_stamp; if (other.is_set_users()) { - List<String> __this__users = new ArrayList<String>(other.users); + java.util.List<java.lang.String> __this__users = new java.util.ArrayList<java.lang.String>(other.users); this.users = __this__users; } if (other.is_set_groups()) { - List<String> __this__groups = new ArrayList<String>(other.groups); + java.util.List<java.lang.String> __this__groups = new java.util.ArrayList<java.lang.String>(other.groups); this.groups = __this__groups; } } @@ -207,11 +177,11 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST this.groups = null; } - public String get_topology_id() { + public java.lang.String get_topology_id() { return this.topology_id; } - public void set_topology_id(String topology_id) { + public void set_topology_id(java.lang.String topology_id) { this.topology_id = topology_id; } @@ -240,38 +210,38 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } 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 int get_users_size() { return (this.users == null) ? 0 : this.users.size(); } - public java.util.Iterator<String> get_users_iterator() { + public java.util.Iterator<java.lang.String> get_users_iterator() { return (this.users == null) ? null : this.users.iterator(); } - public void add_to_users(String elem) { + public void add_to_users(java.lang.String elem) { if (this.users == null) { - this.users = new ArrayList<String>(); + this.users = new java.util.ArrayList<java.lang.String>(); } this.users.add(elem); } - public List<String> get_users() { + public java.util.List<java.lang.String> get_users() { return this.users; } - public void set_users(List<String> users) { + public void set_users(java.util.List<java.lang.String> users) { this.users = users; } @@ -294,22 +264,22 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST return (this.groups == null) ? 0 : this.groups.size(); } - public java.util.Iterator<String> get_groups_iterator() { + public java.util.Iterator<java.lang.String> get_groups_iterator() { return (this.groups == null) ? null : this.groups.iterator(); } - public void add_to_groups(String elem) { + public void add_to_groups(java.lang.String elem) { if (this.groups == null) { - this.groups = new ArrayList<String>(); + this.groups = new java.util.ArrayList<java.lang.String>(); } this.groups.add(elem); } - public List<String> get_groups() { + public java.util.List<java.lang.String> get_groups() { return this.groups; } - public void set_groups(List<String> groups) { + public void set_groups(java.util.List<java.lang.String> groups) { this.groups = groups; } @@ -328,13 +298,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case TOPOLOGY_ID: if (value == null) { unset_topology_id(); } else { - set_topology_id((String)value); + set_topology_id((java.lang.String)value); } break; @@ -342,7 +312,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST if (value == null) { unset_time_stamp(); } else { - set_time_stamp((Long)value); + set_time_stamp((java.lang.Long)value); } break; @@ -350,7 +320,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST if (value == null) { unset_users(); } else { - set_users((List<String>)value); + set_users((java.util.List<java.lang.String>)value); } break; @@ -358,14 +328,14 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST if (value == null) { unset_groups(); } else { - set_groups((List<String>)value); + set_groups((java.util.List<java.lang.String>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case TOPOLOGY_ID: return get_topology_id(); @@ -380,13 +350,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST return get_groups(); } - 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) { @@ -399,11 +369,11 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST case GROUPS: return is_set_groups(); } - 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 LSTopoHistory) @@ -414,6 +384,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST public boolean equals(LSTopoHistory that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_topology_id = true && this.is_set_topology_id(); boolean that_present_topology_id = true && that.is_set_topology_id(); @@ -456,29 +428,23 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_topology_id = true && (is_set_topology_id()); - list.add(present_topology_id); - if (present_topology_id) - list.add(topology_id); + hashCode = hashCode * 8191 + ((is_set_topology_id()) ? 131071 : 524287); + if (is_set_topology_id()) + hashCode = hashCode * 8191 + topology_id.hashCode(); - boolean present_time_stamp = true; - list.add(present_time_stamp); - if (present_time_stamp) - list.add(time_stamp); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(time_stamp); - boolean present_users = true && (is_set_users()); - list.add(present_users); - if (present_users) - list.add(users); + hashCode = hashCode * 8191 + ((is_set_users()) ? 131071 : 524287); + if (is_set_users()) + hashCode = hashCode * 8191 + users.hashCode(); - boolean present_groups = true && (is_set_groups()); - list.add(present_groups); - if (present_groups) - list.add(groups); + hashCode = hashCode * 8191 + ((is_set_groups()) ? 131071 : 524287); + if (is_set_groups()) + hashCode = hashCode * 8191 + groups.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -489,7 +455,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id()); if (lastComparison != 0) { return lastComparison; } @@ -499,7 +465,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST 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; } @@ -509,7 +475,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_users()).compareTo(other.is_set_users()); + lastComparison = java.lang.Boolean.valueOf(is_set_users()).compareTo(other.is_set_users()); if (lastComparison != 0) { return lastComparison; } @@ -519,7 +485,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_groups()).compareTo(other.is_set_groups()); + lastComparison = java.lang.Boolean.valueOf(is_set_groups()).compareTo(other.is_set_groups()); if (lastComparison != 0) { return lastComparison; } @@ -537,16 +503,16 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } 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("LSTopoHistory("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("LSTopoHistory("); boolean first = true; sb.append("topology_id:"); @@ -609,7 +575,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } } - 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; @@ -619,13 +585,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } } - private static class LSTopoHistoryStandardSchemeFactory implements SchemeFactory { + private static class LSTopoHistoryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSTopoHistoryStandardScheme getScheme() { return new LSTopoHistoryStandardScheme(); } } - private static class LSTopoHistoryStandardScheme extends StandardScheme<LSTopoHistory> { + private static class LSTopoHistoryStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSTopoHistory> { public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistory struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -657,8 +623,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list828 = iprot.readListBegin(); - struct.users = new ArrayList<String>(_list828.size); - String _elem829; + struct.users = new java.util.ArrayList<java.lang.String>(_list828.size); + java.lang.String _elem829; for (int _i830 = 0; _i830 < _list828.size; ++_i830) { _elem829 = iprot.readString(); @@ -675,8 +641,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list831 = iprot.readListBegin(); - struct.groups = new ArrayList<String>(_list831.size); - String _elem832; + struct.groups = new java.util.ArrayList<java.lang.String>(_list831.size); + java.lang.String _elem832; for (int _i833 = 0; _i833 < _list831.size; ++_i833) { _elem832 = iprot.readString(); @@ -714,7 +680,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST oprot.writeFieldBegin(USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.users.size())); - for (String _iter834 : struct.users) + for (java.lang.String _iter834 : struct.users) { oprot.writeString(_iter834); } @@ -726,7 +692,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST oprot.writeFieldBegin(GROUPS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.groups.size())); - for (String _iter835 : struct.groups) + for (java.lang.String _iter835 : struct.groups) { oprot.writeString(_iter835); } @@ -740,29 +706,29 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } - private static class LSTopoHistoryTupleSchemeFactory implements SchemeFactory { + private static class LSTopoHistoryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LSTopoHistoryTupleScheme getScheme() { return new LSTopoHistoryTupleScheme(); } } - private static class LSTopoHistoryTupleScheme extends TupleScheme<LSTopoHistory> { + private static class LSTopoHistoryTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSTopoHistory> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory 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.topology_id); oprot.writeI64(struct.time_stamp); { oprot.writeI32(struct.users.size()); - for (String _iter836 : struct.users) + for (java.lang.String _iter836 : struct.users) { oprot.writeString(_iter836); } } { oprot.writeI32(struct.groups.size()); - for (String _iter837 : struct.groups) + for (java.lang.String _iter837 : struct.groups) { oprot.writeString(_iter837); } @@ -771,15 +737,15 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST @Override public void read(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.topology_id = iprot.readString(); struct.set_topology_id_isSet(true); struct.time_stamp = iprot.readI64(); struct.set_time_stamp_isSet(true); { org.apache.thrift.protocol.TList _list838 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.users = new ArrayList<String>(_list838.size); - String _elem839; + struct.users = new java.util.ArrayList<java.lang.String>(_list838.size); + java.lang.String _elem839; for (int _i840 = 0; _i840 < _list838.size; ++_i840) { _elem839 = iprot.readString(); @@ -789,8 +755,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST struct.set_users_isSet(true); { org.apache.thrift.protocol.TList _list841 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.groups = new ArrayList<String>(_list841.size); - String _elem842; + struct.groups = new java.util.ArrayList<java.lang.String>(_list841.size); + java.lang.String _elem842; for (int _i843 = 0; _i843 < _list841.size; ++_i843) { _elem842 = iprot.readString(); @@ -801,5 +767,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST } } + 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(); + } }
