http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java index 377e733..bf37de2 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java +++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.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 ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageInfo, ComponentPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentPageInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentPageInfo"); @@ -72,28 +45,25 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI private static final org.apache.thrift.protocol.TField TOPOLOGY_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_status", org.apache.thrift.protocol.TType.STRING, (short)15); private static final org.apache.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("resources_map", org.apache.thrift.protocol.TType.MAP, (short)16); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ComponentPageInfoStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ComponentPageInfoTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentPageInfoStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentPageInfoTupleSchemeFactory(); - private String component_id; // required + private java.lang.String component_id; // required private ComponentType component_type; // required - private String topology_id; // optional - private String topology_name; // optional + private java.lang.String topology_id; // optional + private java.lang.String topology_name; // optional private int num_executors; // optional private int num_tasks; // optional - private Map<String,ComponentAggregateStats> window_to_stats; // optional - private Map<GlobalStreamId,ComponentAggregateStats> gsid_to_input_stats; // optional - private Map<String,ComponentAggregateStats> sid_to_output_stats; // optional - private List<ExecutorAggregateStats> exec_stats; // optional - private List<ErrorInfo> errors; // optional - private String eventlog_host; // optional + private java.util.Map<java.lang.String,ComponentAggregateStats> window_to_stats; // optional + private java.util.Map<GlobalStreamId,ComponentAggregateStats> gsid_to_input_stats; // optional + private java.util.Map<java.lang.String,ComponentAggregateStats> sid_to_output_stats; // optional + private java.util.List<ExecutorAggregateStats> exec_stats; // optional + private java.util.List<ErrorInfo> errors; // optional + private java.lang.String eventlog_host; // optional private int eventlog_port; // optional private DebugOptions debug_options; // optional - private String topology_status; // optional - private Map<String,Double> resources_map; // optional + private java.lang.String topology_status; // optional + private java.util.Map<java.lang.String,java.lang.Double> resources_map; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -118,10 +88,10 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI TOPOLOGY_STATUS((short)15, "topology_status"), RESOURCES_MAP((short)16, "resources_map"); - 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); } } @@ -174,21 +144,21 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI */ 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; } @@ -197,7 +167,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -208,9 +178,9 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI private static final int __EVENTLOG_PORT_ISSET_ID = 2; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.TOPOLOGY_ID,_Fields.TOPOLOGY_NAME,_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.WINDOW_TO_STATS,_Fields.GSID_TO_INPUT_STATS,_Fields.SID_TO_OUTPUT_STATS,_Fields.EXEC_STATS,_Fields.ERRORS,_Fields.EVENTLOG_HOST,_Fields.EVENTLOG_PORT,_Fields.DEBUG_OPTIONS,_Fields.TOPOLOGY_STATUS,_Fields.RESOURCES_MAP}; - 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.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("component_id", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.COMPONENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("component_type", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -253,7 +223,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI 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.DOUBLE)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentPageInfo.class, metaDataMap); } @@ -261,7 +231,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } public ComponentPageInfo( - String component_id, + java.lang.String component_id, ComponentType component_type) { this(); @@ -289,13 +259,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.num_executors = other.num_executors; this.num_tasks = other.num_tasks; if (other.is_set_window_to_stats()) { - Map<String,ComponentAggregateStats> __this__window_to_stats = new HashMap<String,ComponentAggregateStats>(other.window_to_stats.size()); - for (Map.Entry<String, ComponentAggregateStats> other_element : other.window_to_stats.entrySet()) { + java.util.Map<java.lang.String,ComponentAggregateStats> __this__window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(other.window_to_stats.size()); + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> other_element : other.window_to_stats.entrySet()) { - String other_element_key = other_element.getKey(); + java.lang.String other_element_key = other_element.getKey(); ComponentAggregateStats other_element_value = other_element.getValue(); - String __this__window_to_stats_copy_key = other_element_key; + java.lang.String __this__window_to_stats_copy_key = other_element_key; ComponentAggregateStats __this__window_to_stats_copy_value = new ComponentAggregateStats(other_element_value); @@ -304,8 +274,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.window_to_stats = __this__window_to_stats; } if (other.is_set_gsid_to_input_stats()) { - Map<GlobalStreamId,ComponentAggregateStats> __this__gsid_to_input_stats = new HashMap<GlobalStreamId,ComponentAggregateStats>(other.gsid_to_input_stats.size()); - for (Map.Entry<GlobalStreamId, ComponentAggregateStats> other_element : other.gsid_to_input_stats.entrySet()) { + java.util.Map<GlobalStreamId,ComponentAggregateStats> __this__gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(other.gsid_to_input_stats.size()); + for (java.util.Map.Entry<GlobalStreamId, ComponentAggregateStats> other_element : other.gsid_to_input_stats.entrySet()) { GlobalStreamId other_element_key = other_element.getKey(); ComponentAggregateStats other_element_value = other_element.getValue(); @@ -319,13 +289,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.gsid_to_input_stats = __this__gsid_to_input_stats; } if (other.is_set_sid_to_output_stats()) { - Map<String,ComponentAggregateStats> __this__sid_to_output_stats = new HashMap<String,ComponentAggregateStats>(other.sid_to_output_stats.size()); - for (Map.Entry<String, ComponentAggregateStats> other_element : other.sid_to_output_stats.entrySet()) { + java.util.Map<java.lang.String,ComponentAggregateStats> __this__sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(other.sid_to_output_stats.size()); + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> other_element : other.sid_to_output_stats.entrySet()) { - String other_element_key = other_element.getKey(); + java.lang.String other_element_key = other_element.getKey(); ComponentAggregateStats other_element_value = other_element.getValue(); - String __this__sid_to_output_stats_copy_key = other_element_key; + java.lang.String __this__sid_to_output_stats_copy_key = other_element_key; ComponentAggregateStats __this__sid_to_output_stats_copy_value = new ComponentAggregateStats(other_element_value); @@ -334,14 +304,14 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.sid_to_output_stats = __this__sid_to_output_stats; } if (other.is_set_exec_stats()) { - List<ExecutorAggregateStats> __this__exec_stats = new ArrayList<ExecutorAggregateStats>(other.exec_stats.size()); + java.util.List<ExecutorAggregateStats> __this__exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(other.exec_stats.size()); for (ExecutorAggregateStats other_element : other.exec_stats) { __this__exec_stats.add(new ExecutorAggregateStats(other_element)); } this.exec_stats = __this__exec_stats; } if (other.is_set_errors()) { - List<ErrorInfo> __this__errors = new ArrayList<ErrorInfo>(other.errors.size()); + java.util.List<ErrorInfo> __this__errors = new java.util.ArrayList<ErrorInfo>(other.errors.size()); for (ErrorInfo other_element : other.errors) { __this__errors.add(new ErrorInfo(other_element)); } @@ -358,7 +328,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.topology_status = other.topology_status; } if (other.is_set_resources_map()) { - Map<String,Double> __this__resources_map = new HashMap<String,Double>(other.resources_map); + java.util.Map<java.lang.String,java.lang.Double> __this__resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(other.resources_map); this.resources_map = __this__resources_map; } } @@ -390,11 +360,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI this.resources_map = null; } - public String get_component_id() { + public java.lang.String get_component_id() { return this.component_id; } - public void set_component_id(String component_id) { + public void set_component_id(java.lang.String component_id) { this.component_id = component_id; } @@ -444,11 +414,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - 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; } @@ -467,11 +437,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - public String get_topology_name() { + public java.lang.String get_topology_name() { return this.topology_name; } - public void set_topology_name(String topology_name) { + public void set_topology_name(java.lang.String topology_name) { this.topology_name = topology_name; } @@ -500,16 +470,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } public void unset_num_executors() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); } /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */ public boolean is_set_num_executors() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); } public void set_num_executors_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value); } public int get_num_tasks() { @@ -522,34 +492,34 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } public void unset_num_tasks() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID); } /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */ public boolean is_set_num_tasks() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID); } public void set_num_tasks_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value); } public int get_window_to_stats_size() { return (this.window_to_stats == null) ? 0 : this.window_to_stats.size(); } - public void put_to_window_to_stats(String key, ComponentAggregateStats val) { + public void put_to_window_to_stats(java.lang.String key, ComponentAggregateStats val) { if (this.window_to_stats == null) { - this.window_to_stats = new HashMap<String,ComponentAggregateStats>(); + this.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(); } this.window_to_stats.put(key, val); } - public Map<String,ComponentAggregateStats> get_window_to_stats() { + public java.util.Map<java.lang.String,ComponentAggregateStats> get_window_to_stats() { return this.window_to_stats; } - public void set_window_to_stats(Map<String,ComponentAggregateStats> window_to_stats) { + public void set_window_to_stats(java.util.Map<java.lang.String,ComponentAggregateStats> window_to_stats) { this.window_to_stats = window_to_stats; } @@ -574,16 +544,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI public void put_to_gsid_to_input_stats(GlobalStreamId key, ComponentAggregateStats val) { if (this.gsid_to_input_stats == null) { - this.gsid_to_input_stats = new HashMap<GlobalStreamId,ComponentAggregateStats>(); + this.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(); } this.gsid_to_input_stats.put(key, val); } - public Map<GlobalStreamId,ComponentAggregateStats> get_gsid_to_input_stats() { + public java.util.Map<GlobalStreamId,ComponentAggregateStats> get_gsid_to_input_stats() { return this.gsid_to_input_stats; } - public void set_gsid_to_input_stats(Map<GlobalStreamId,ComponentAggregateStats> gsid_to_input_stats) { + public void set_gsid_to_input_stats(java.util.Map<GlobalStreamId,ComponentAggregateStats> gsid_to_input_stats) { this.gsid_to_input_stats = gsid_to_input_stats; } @@ -606,18 +576,18 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return (this.sid_to_output_stats == null) ? 0 : this.sid_to_output_stats.size(); } - public void put_to_sid_to_output_stats(String key, ComponentAggregateStats val) { + public void put_to_sid_to_output_stats(java.lang.String key, ComponentAggregateStats val) { if (this.sid_to_output_stats == null) { - this.sid_to_output_stats = new HashMap<String,ComponentAggregateStats>(); + this.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(); } this.sid_to_output_stats.put(key, val); } - public Map<String,ComponentAggregateStats> get_sid_to_output_stats() { + public java.util.Map<java.lang.String,ComponentAggregateStats> get_sid_to_output_stats() { return this.sid_to_output_stats; } - public void set_sid_to_output_stats(Map<String,ComponentAggregateStats> sid_to_output_stats) { + public void set_sid_to_output_stats(java.util.Map<java.lang.String,ComponentAggregateStats> sid_to_output_stats) { this.sid_to_output_stats = sid_to_output_stats; } @@ -646,16 +616,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI public void add_to_exec_stats(ExecutorAggregateStats elem) { if (this.exec_stats == null) { - this.exec_stats = new ArrayList<ExecutorAggregateStats>(); + this.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(); } this.exec_stats.add(elem); } - public List<ExecutorAggregateStats> get_exec_stats() { + public java.util.List<ExecutorAggregateStats> get_exec_stats() { return this.exec_stats; } - public void set_exec_stats(List<ExecutorAggregateStats> exec_stats) { + public void set_exec_stats(java.util.List<ExecutorAggregateStats> exec_stats) { this.exec_stats = exec_stats; } @@ -684,16 +654,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI public void add_to_errors(ErrorInfo elem) { if (this.errors == null) { - this.errors = new ArrayList<ErrorInfo>(); + this.errors = new java.util.ArrayList<ErrorInfo>(); } this.errors.add(elem); } - public List<ErrorInfo> get_errors() { + public java.util.List<ErrorInfo> get_errors() { return this.errors; } - public void set_errors(List<ErrorInfo> errors) { + public void set_errors(java.util.List<ErrorInfo> errors) { this.errors = errors; } @@ -712,11 +682,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - public String get_eventlog_host() { + public java.lang.String get_eventlog_host() { return this.eventlog_host; } - public void set_eventlog_host(String eventlog_host) { + public void set_eventlog_host(java.lang.String eventlog_host) { this.eventlog_host = eventlog_host; } @@ -745,16 +715,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } public void unset_eventlog_port() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID); } /** Returns true if field eventlog_port is set (has been assigned a value) and false otherwise */ public boolean is_set_eventlog_port() { - return EncodingUtils.testBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID); } public void set_eventlog_port_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID, value); } public DebugOptions get_debug_options() { @@ -780,11 +750,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - public String get_topology_status() { + public java.lang.String get_topology_status() { return this.topology_status; } - public void set_topology_status(String topology_status) { + public void set_topology_status(java.lang.String topology_status) { this.topology_status = topology_status; } @@ -807,18 +777,18 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return (this.resources_map == null) ? 0 : this.resources_map.size(); } - public void put_to_resources_map(String key, double val) { + public void put_to_resources_map(java.lang.String key, double val) { if (this.resources_map == null) { - this.resources_map = new HashMap<String,Double>(); + this.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(); } this.resources_map.put(key, val); } - public Map<String,Double> get_resources_map() { + public java.util.Map<java.lang.String,java.lang.Double> get_resources_map() { return this.resources_map; } - public void set_resources_map(Map<String,Double> resources_map) { + public void set_resources_map(java.util.Map<java.lang.String,java.lang.Double> resources_map) { this.resources_map = resources_map; } @@ -837,13 +807,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case COMPONENT_ID: if (value == null) { unset_component_id(); } else { - set_component_id((String)value); + set_component_id((java.lang.String)value); } break; @@ -859,7 +829,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_topology_id(); } else { - set_topology_id((String)value); + set_topology_id((java.lang.String)value); } break; @@ -867,7 +837,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_topology_name(); } else { - set_topology_name((String)value); + set_topology_name((java.lang.String)value); } break; @@ -875,7 +845,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_num_executors(); } else { - set_num_executors((Integer)value); + set_num_executors((java.lang.Integer)value); } break; @@ -883,7 +853,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_num_tasks(); } else { - set_num_tasks((Integer)value); + set_num_tasks((java.lang.Integer)value); } break; @@ -891,7 +861,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_window_to_stats(); } else { - set_window_to_stats((Map<String,ComponentAggregateStats>)value); + set_window_to_stats((java.util.Map<java.lang.String,ComponentAggregateStats>)value); } break; @@ -899,7 +869,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_gsid_to_input_stats(); } else { - set_gsid_to_input_stats((Map<GlobalStreamId,ComponentAggregateStats>)value); + set_gsid_to_input_stats((java.util.Map<GlobalStreamId,ComponentAggregateStats>)value); } break; @@ -907,7 +877,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_sid_to_output_stats(); } else { - set_sid_to_output_stats((Map<String,ComponentAggregateStats>)value); + set_sid_to_output_stats((java.util.Map<java.lang.String,ComponentAggregateStats>)value); } break; @@ -915,7 +885,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_exec_stats(); } else { - set_exec_stats((List<ExecutorAggregateStats>)value); + set_exec_stats((java.util.List<ExecutorAggregateStats>)value); } break; @@ -923,7 +893,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_errors(); } else { - set_errors((List<ErrorInfo>)value); + set_errors((java.util.List<ErrorInfo>)value); } break; @@ -931,7 +901,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_eventlog_host(); } else { - set_eventlog_host((String)value); + set_eventlog_host((java.lang.String)value); } break; @@ -939,7 +909,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_eventlog_port(); } else { - set_eventlog_port((Integer)value); + set_eventlog_port((java.lang.Integer)value); } break; @@ -955,7 +925,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_topology_status(); } else { - set_topology_status((String)value); + set_topology_status((java.lang.String)value); } break; @@ -963,14 +933,14 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (value == null) { unset_resources_map(); } else { - set_resources_map((Map<String,Double>)value); + set_resources_map((java.util.Map<java.lang.String,java.lang.Double>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case COMPONENT_ID: return get_component_id(); @@ -1021,13 +991,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return get_resources_map(); } - 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) { @@ -1064,11 +1034,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI case RESOURCES_MAP: return is_set_resources_map(); } - 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 ComponentPageInfo) @@ -1079,6 +1049,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI public boolean equals(ComponentPageInfo that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_component_id = true && this.is_set_component_id(); boolean that_present_component_id = true && that.is_set_component_id(); @@ -1229,89 +1201,73 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_component_id = true && (is_set_component_id()); - list.add(present_component_id); - if (present_component_id) - list.add(component_id); - - boolean present_component_type = true && (is_set_component_type()); - list.add(present_component_type); - if (present_component_type) - list.add(component_type.getValue()); - - boolean present_topology_id = true && (is_set_topology_id()); - list.add(present_topology_id); - if (present_topology_id) - list.add(topology_id); - - boolean present_topology_name = true && (is_set_topology_name()); - list.add(present_topology_name); - if (present_topology_name) - list.add(topology_name); - - boolean present_num_executors = true && (is_set_num_executors()); - list.add(present_num_executors); - if (present_num_executors) - list.add(num_executors); - - boolean present_num_tasks = true && (is_set_num_tasks()); - list.add(present_num_tasks); - if (present_num_tasks) - list.add(num_tasks); - - boolean present_window_to_stats = true && (is_set_window_to_stats()); - list.add(present_window_to_stats); - if (present_window_to_stats) - list.add(window_to_stats); - - boolean present_gsid_to_input_stats = true && (is_set_gsid_to_input_stats()); - list.add(present_gsid_to_input_stats); - if (present_gsid_to_input_stats) - list.add(gsid_to_input_stats); - - boolean present_sid_to_output_stats = true && (is_set_sid_to_output_stats()); - list.add(present_sid_to_output_stats); - if (present_sid_to_output_stats) - list.add(sid_to_output_stats); - - boolean present_exec_stats = true && (is_set_exec_stats()); - list.add(present_exec_stats); - if (present_exec_stats) - list.add(exec_stats); - - boolean present_errors = true && (is_set_errors()); - list.add(present_errors); - if (present_errors) - list.add(errors); - - boolean present_eventlog_host = true && (is_set_eventlog_host()); - list.add(present_eventlog_host); - if (present_eventlog_host) - list.add(eventlog_host); - - boolean present_eventlog_port = true && (is_set_eventlog_port()); - list.add(present_eventlog_port); - if (present_eventlog_port) - list.add(eventlog_port); - - boolean present_debug_options = true && (is_set_debug_options()); - list.add(present_debug_options); - if (present_debug_options) - list.add(debug_options); - - boolean present_topology_status = true && (is_set_topology_status()); - list.add(present_topology_status); - if (present_topology_status) - list.add(topology_status); - - boolean present_resources_map = true && (is_set_resources_map()); - list.add(present_resources_map); - if (present_resources_map) - list.add(resources_map); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((is_set_component_id()) ? 131071 : 524287); + if (is_set_component_id()) + hashCode = hashCode * 8191 + component_id.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_component_type()) ? 131071 : 524287); + if (is_set_component_type()) + hashCode = hashCode * 8191 + component_type.getValue(); + + hashCode = hashCode * 8191 + ((is_set_topology_id()) ? 131071 : 524287); + if (is_set_topology_id()) + hashCode = hashCode * 8191 + topology_id.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_topology_name()) ? 131071 : 524287); + if (is_set_topology_name()) + hashCode = hashCode * 8191 + topology_name.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_num_executors()) ? 131071 : 524287); + if (is_set_num_executors()) + hashCode = hashCode * 8191 + num_executors; + + hashCode = hashCode * 8191 + ((is_set_num_tasks()) ? 131071 : 524287); + if (is_set_num_tasks()) + hashCode = hashCode * 8191 + num_tasks; + + hashCode = hashCode * 8191 + ((is_set_window_to_stats()) ? 131071 : 524287); + if (is_set_window_to_stats()) + hashCode = hashCode * 8191 + window_to_stats.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_gsid_to_input_stats()) ? 131071 : 524287); + if (is_set_gsid_to_input_stats()) + hashCode = hashCode * 8191 + gsid_to_input_stats.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_sid_to_output_stats()) ? 131071 : 524287); + if (is_set_sid_to_output_stats()) + hashCode = hashCode * 8191 + sid_to_output_stats.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_exec_stats()) ? 131071 : 524287); + if (is_set_exec_stats()) + hashCode = hashCode * 8191 + exec_stats.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_errors()) ? 131071 : 524287); + if (is_set_errors()) + hashCode = hashCode * 8191 + errors.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_eventlog_host()) ? 131071 : 524287); + if (is_set_eventlog_host()) + hashCode = hashCode * 8191 + eventlog_host.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_eventlog_port()) ? 131071 : 524287); + if (is_set_eventlog_port()) + hashCode = hashCode * 8191 + eventlog_port; + + hashCode = hashCode * 8191 + ((is_set_debug_options()) ? 131071 : 524287); + if (is_set_debug_options()) + hashCode = hashCode * 8191 + debug_options.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_topology_status()) ? 131071 : 524287); + if (is_set_topology_status()) + hashCode = hashCode * 8191 + topology_status.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_resources_map()) ? 131071 : 524287); + if (is_set_resources_map()) + hashCode = hashCode * 8191 + resources_map.hashCode(); + + return hashCode; } @Override @@ -1322,7 +1278,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id()); if (lastComparison != 0) { return lastComparison; } @@ -1332,7 +1288,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_component_type()).compareTo(other.is_set_component_type()); + lastComparison = java.lang.Boolean.valueOf(is_set_component_type()).compareTo(other.is_set_component_type()); if (lastComparison != 0) { return lastComparison; } @@ -1342,7 +1298,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - 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; } @@ -1352,7 +1308,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_name()).compareTo(other.is_set_topology_name()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_name()).compareTo(other.is_set_topology_name()); if (lastComparison != 0) { return lastComparison; } @@ -1362,7 +1318,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); if (lastComparison != 0) { return lastComparison; } @@ -1372,7 +1328,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks()); if (lastComparison != 0) { return lastComparison; } @@ -1382,7 +1338,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_window_to_stats()).compareTo(other.is_set_window_to_stats()); + lastComparison = java.lang.Boolean.valueOf(is_set_window_to_stats()).compareTo(other.is_set_window_to_stats()); if (lastComparison != 0) { return lastComparison; } @@ -1392,7 +1348,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_gsid_to_input_stats()).compareTo(other.is_set_gsid_to_input_stats()); + lastComparison = java.lang.Boolean.valueOf(is_set_gsid_to_input_stats()).compareTo(other.is_set_gsid_to_input_stats()); if (lastComparison != 0) { return lastComparison; } @@ -1402,7 +1358,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_sid_to_output_stats()).compareTo(other.is_set_sid_to_output_stats()); + lastComparison = java.lang.Boolean.valueOf(is_set_sid_to_output_stats()).compareTo(other.is_set_sid_to_output_stats()); if (lastComparison != 0) { return lastComparison; } @@ -1412,7 +1368,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_exec_stats()).compareTo(other.is_set_exec_stats()); + lastComparison = java.lang.Boolean.valueOf(is_set_exec_stats()).compareTo(other.is_set_exec_stats()); if (lastComparison != 0) { return lastComparison; } @@ -1422,7 +1378,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_errors()).compareTo(other.is_set_errors()); + lastComparison = java.lang.Boolean.valueOf(is_set_errors()).compareTo(other.is_set_errors()); if (lastComparison != 0) { return lastComparison; } @@ -1432,7 +1388,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_eventlog_host()).compareTo(other.is_set_eventlog_host()); + lastComparison = java.lang.Boolean.valueOf(is_set_eventlog_host()).compareTo(other.is_set_eventlog_host()); if (lastComparison != 0) { return lastComparison; } @@ -1442,7 +1398,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_eventlog_port()).compareTo(other.is_set_eventlog_port()); + lastComparison = java.lang.Boolean.valueOf(is_set_eventlog_port()).compareTo(other.is_set_eventlog_port()); if (lastComparison != 0) { return lastComparison; } @@ -1452,7 +1408,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_debug_options()).compareTo(other.is_set_debug_options()); + lastComparison = java.lang.Boolean.valueOf(is_set_debug_options()).compareTo(other.is_set_debug_options()); if (lastComparison != 0) { return lastComparison; } @@ -1462,7 +1418,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_status()).compareTo(other.is_set_topology_status()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_status()).compareTo(other.is_set_topology_status()); if (lastComparison != 0) { return lastComparison; } @@ -1472,7 +1428,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map()); + lastComparison = java.lang.Boolean.valueOf(is_set_resources_map()).compareTo(other.is_set_resources_map()); if (lastComparison != 0) { return lastComparison; } @@ -1490,16 +1446,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } 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("ComponentPageInfo("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ComponentPageInfo("); boolean first = true; sb.append("component_id:"); @@ -1673,7 +1629,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - 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; @@ -1683,13 +1639,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } - private static class ComponentPageInfoStandardSchemeFactory implements SchemeFactory { + private static class ComponentPageInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ComponentPageInfoStandardScheme getScheme() { return new ComponentPageInfoStandardScheme(); } } - private static class ComponentPageInfoStandardScheme extends StandardScheme<ComponentPageInfo> { + private static class ComponentPageInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ComponentPageInfo> { public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1753,8 +1709,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map510 = iprot.readMapBegin(); - struct.window_to_stats = new HashMap<String,ComponentAggregateStats>(2*_map510.size); - String _key511; + struct.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map510.size); + java.lang.String _key511; ComponentAggregateStats _val512; for (int _i513 = 0; _i513 < _map510.size; ++_i513) { @@ -1774,7 +1730,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map514 = iprot.readMapBegin(); - struct.gsid_to_input_stats = new HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map514.size); + struct.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map514.size); GlobalStreamId _key515; ComponentAggregateStats _val516; for (int _i517 = 0; _i517 < _map514.size; ++_i517) @@ -1796,8 +1752,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map518 = iprot.readMapBegin(); - struct.sid_to_output_stats = new HashMap<String,ComponentAggregateStats>(2*_map518.size); - String _key519; + struct.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map518.size); + java.lang.String _key519; ComponentAggregateStats _val520; for (int _i521 = 0; _i521 < _map518.size; ++_i521) { @@ -1817,7 +1773,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list522 = iprot.readListBegin(); - struct.exec_stats = new ArrayList<ExecutorAggregateStats>(_list522.size); + struct.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(_list522.size); ExecutorAggregateStats _elem523; for (int _i524 = 0; _i524 < _list522.size; ++_i524) { @@ -1836,7 +1792,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list525 = iprot.readListBegin(); - struct.errors = new ArrayList<ErrorInfo>(_list525.size); + struct.errors = new java.util.ArrayList<ErrorInfo>(_list525.size); ErrorInfo _elem526; for (int _i527 = 0; _i527 < _list525.size; ++_i527) { @@ -1888,8 +1844,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map528 = iprot.readMapBegin(); - struct.resources_map = new HashMap<String,Double>(2*_map528.size); - String _key529; + struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map528.size); + java.lang.String _key529; double _val530; for (int _i531 = 0; _i531 < _map528.size; ++_i531) { @@ -1956,7 +1912,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI oprot.writeFieldBegin(WINDOW_TO_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.window_to_stats.size())); - for (Map.Entry<String, ComponentAggregateStats> _iter532 : struct.window_to_stats.entrySet()) + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter532 : struct.window_to_stats.entrySet()) { oprot.writeString(_iter532.getKey()); _iter532.getValue().write(oprot); @@ -1971,7 +1927,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI oprot.writeFieldBegin(GSID_TO_INPUT_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.gsid_to_input_stats.size())); - for (Map.Entry<GlobalStreamId, ComponentAggregateStats> _iter533 : struct.gsid_to_input_stats.entrySet()) + for (java.util.Map.Entry<GlobalStreamId, ComponentAggregateStats> _iter533 : struct.gsid_to_input_stats.entrySet()) { _iter533.getKey().write(oprot); _iter533.getValue().write(oprot); @@ -1986,7 +1942,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI oprot.writeFieldBegin(SID_TO_OUTPUT_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.sid_to_output_stats.size())); - for (Map.Entry<String, ComponentAggregateStats> _iter534 : struct.sid_to_output_stats.entrySet()) + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter534 : struct.sid_to_output_stats.entrySet()) { oprot.writeString(_iter534.getKey()); _iter534.getValue().write(oprot); @@ -2055,7 +2011,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size())); - for (Map.Entry<String, Double> _iter537 : struct.resources_map.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter537 : struct.resources_map.entrySet()) { oprot.writeString(_iter537.getKey()); oprot.writeDouble(_iter537.getValue()); @@ -2071,20 +2027,20 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } - private static class ComponentPageInfoTupleSchemeFactory implements SchemeFactory { + private static class ComponentPageInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ComponentPageInfoTupleScheme getScheme() { return new ComponentPageInfoTupleScheme(); } } - private static class ComponentPageInfoTupleScheme extends TupleScheme<ComponentPageInfo> { + private static class ComponentPageInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<ComponentPageInfo> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo 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.component_id); oprot.writeI32(struct.component_type.getValue()); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_topology_id()) { optionals.set(0); } @@ -2143,7 +2099,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (struct.is_set_window_to_stats()) { { oprot.writeI32(struct.window_to_stats.size()); - for (Map.Entry<String, ComponentAggregateStats> _iter538 : struct.window_to_stats.entrySet()) + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter538 : struct.window_to_stats.entrySet()) { oprot.writeString(_iter538.getKey()); _iter538.getValue().write(oprot); @@ -2153,7 +2109,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (struct.is_set_gsid_to_input_stats()) { { oprot.writeI32(struct.gsid_to_input_stats.size()); - for (Map.Entry<GlobalStreamId, ComponentAggregateStats> _iter539 : struct.gsid_to_input_stats.entrySet()) + for (java.util.Map.Entry<GlobalStreamId, ComponentAggregateStats> _iter539 : struct.gsid_to_input_stats.entrySet()) { _iter539.getKey().write(oprot); _iter539.getValue().write(oprot); @@ -2163,7 +2119,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (struct.is_set_sid_to_output_stats()) { { oprot.writeI32(struct.sid_to_output_stats.size()); - for (Map.Entry<String, ComponentAggregateStats> _iter540 : struct.sid_to_output_stats.entrySet()) + for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter540 : struct.sid_to_output_stats.entrySet()) { oprot.writeString(_iter540.getKey()); _iter540.getValue().write(oprot); @@ -2203,7 +2159,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (struct.is_set_resources_map()) { { oprot.writeI32(struct.resources_map.size()); - for (Map.Entry<String, Double> _iter543 : struct.resources_map.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter543 : struct.resources_map.entrySet()) { oprot.writeString(_iter543.getKey()); oprot.writeDouble(_iter543.getValue()); @@ -2214,12 +2170,12 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI @Override public void read(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.component_id = iprot.readString(); struct.set_component_id_isSet(true); struct.component_type = org.apache.storm.generated.ComponentType.findByValue(iprot.readI32()); struct.set_component_type_isSet(true); - BitSet incoming = iprot.readBitSet(14); + java.util.BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.topology_id = iprot.readString(); struct.set_topology_id_isSet(true); @@ -2239,8 +2195,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(4)) { { org.apache.thrift.protocol.TMap _map544 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.window_to_stats = new HashMap<String,ComponentAggregateStats>(2*_map544.size); - String _key545; + struct.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map544.size); + java.lang.String _key545; ComponentAggregateStats _val546; for (int _i547 = 0; _i547 < _map544.size; ++_i547) { @@ -2255,7 +2211,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(5)) { { org.apache.thrift.protocol.TMap _map548 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.gsid_to_input_stats = new HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map548.size); + struct.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map548.size); GlobalStreamId _key549; ComponentAggregateStats _val550; for (int _i551 = 0; _i551 < _map548.size; ++_i551) @@ -2272,8 +2228,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(6)) { { org.apache.thrift.protocol.TMap _map552 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.sid_to_output_stats = new HashMap<String,ComponentAggregateStats>(2*_map552.size); - String _key553; + struct.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map552.size); + java.lang.String _key553; ComponentAggregateStats _val554; for (int _i555 = 0; _i555 < _map552.size; ++_i555) { @@ -2288,7 +2244,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(7)) { { org.apache.thrift.protocol.TList _list556 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.exec_stats = new ArrayList<ExecutorAggregateStats>(_list556.size); + struct.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(_list556.size); ExecutorAggregateStats _elem557; for (int _i558 = 0; _i558 < _list556.size; ++_i558) { @@ -2302,7 +2258,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(8)) { { org.apache.thrift.protocol.TList _list559 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.errors = new ArrayList<ErrorInfo>(_list559.size); + struct.errors = new java.util.ArrayList<ErrorInfo>(_list559.size); ErrorInfo _elem560; for (int _i561 = 0; _i561 < _list559.size; ++_i561) { @@ -2333,8 +2289,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI if (incoming.get(13)) { { org.apache.thrift.protocol.TMap _map562 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - struct.resources_map = new HashMap<String,Double>(2*_map562.size); - String _key563; + struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map562.size); + java.lang.String _key563; double _val564; for (int _i565 = 0; _i565 < _map562.size; ++_i565) { @@ -2348,5 +2304,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI } } + 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/ComponentType.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java index 7a9fd66..0c8a57e 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java +++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -24,10 +24,6 @@ package org.apache.storm.generated; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - public enum ComponentType implements org.apache.thrift.TEnum { BOLT(1), SPOUT(2); http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/Credentials.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java b/storm-client/src/jvm/org/apache/storm/generated/Credentials.java index 84a8fb9..e4e7418 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java +++ b/storm-client/src/jvm/org/apache/storm/generated/Credentials.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 Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials"); private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", 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 CredentialsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new CredentialsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CredentialsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CredentialsTupleSchemeFactory(); - private Map<String,String> creds; // required + private java.util.Map<java.lang.String,java.lang.String> creds; // 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 { CREDS((short)1, "creds"); - 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 Credentials implements org.apache.thrift.TBase<Credentials, Credent */ 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 Credentials implements org.apache.thrift.TBase<Credentials, Credent 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.CREDS, new org.apache.thrift.meta_data.FieldMetaData("creds", 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.STRING)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Credentials.class, metaDataMap); } @@ -139,7 +109,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } public Credentials( - Map<String,String> creds) + java.util.Map<java.lang.String,java.lang.String> creds) { this(); this.creds = creds; @@ -150,7 +120,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent */ public Credentials(Credentials other) { if (other.is_set_creds()) { - Map<String,String> __this__creds = new HashMap<String,String>(other.creds); + java.util.Map<java.lang.String,java.lang.String> __this__creds = new java.util.HashMap<java.lang.String,java.lang.String>(other.creds); this.creds = __this__creds; } } @@ -168,18 +138,18 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent return (this.creds == null) ? 0 : this.creds.size(); } - public void put_to_creds(String key, String val) { + public void put_to_creds(java.lang.String key, java.lang.String val) { if (this.creds == null) { - this.creds = new HashMap<String,String>(); + this.creds = new java.util.HashMap<java.lang.String,java.lang.String>(); } this.creds.put(key, val); } - public Map<String,String> get_creds() { + public java.util.Map<java.lang.String,java.lang.String> get_creds() { return this.creds; } - public void set_creds(Map<String,String> creds) { + public void set_creds(java.util.Map<java.lang.String,java.lang.String> creds) { this.creds = creds; } @@ -198,43 +168,43 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case CREDS: if (value == null) { unset_creds(); } else { - set_creds((Map<String,String>)value); + set_creds((java.util.Map<java.lang.String,java.lang.String>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case CREDS: return get_creds(); } - 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 CREDS: return is_set_creds(); } - 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 Credentials) @@ -245,6 +215,8 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent public boolean equals(Credentials that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_creds = true && this.is_set_creds(); boolean that_present_creds = true && that.is_set_creds(); @@ -260,14 +232,13 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_creds = true && (is_set_creds()); - list.add(present_creds); - if (present_creds) - list.add(creds); + hashCode = hashCode * 8191 + ((is_set_creds()) ? 131071 : 524287); + if (is_set_creds()) + hashCode = hashCode * 8191 + creds.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -278,7 +249,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds()); + lastComparison = java.lang.Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds()); if (lastComparison != 0) { return lastComparison; } @@ -296,16 +267,16 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } 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("Credentials("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("Credentials("); boolean first = true; sb.append("creds:"); @@ -336,7 +307,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } } - 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 Credentials implements org.apache.thrift.TBase<Credentials, Credent } } - private static class CredentialsStandardSchemeFactory implements SchemeFactory { + private static class CredentialsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public CredentialsStandardScheme getScheme() { return new CredentialsStandardScheme(); } } - private static class CredentialsStandardScheme extends StandardScheme<Credentials> { + private static class CredentialsStandardScheme extends org.apache.thrift.scheme.StandardScheme<Credentials> { public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -366,9 +337,9 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map596 = iprot.readMapBegin(); - struct.creds = new HashMap<String,String>(2*_map596.size); - String _key597; - String _val598; + struct.creds = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map596.size); + java.lang.String _key597; + java.lang.String _val598; for (int _i599 = 0; _i599 < _map596.size; ++_i599) { _key597 = iprot.readString(); @@ -399,7 +370,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent oprot.writeFieldBegin(CREDS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size())); - for (Map.Entry<String, String> _iter600 : struct.creds.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter600 : struct.creds.entrySet()) { oprot.writeString(_iter600.getKey()); oprot.writeString(_iter600.getValue()); @@ -414,20 +385,20 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } - private static class CredentialsTupleSchemeFactory implements SchemeFactory { + private static class CredentialsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public CredentialsTupleScheme getScheme() { return new CredentialsTupleScheme(); } } - private static class CredentialsTupleScheme extends TupleScheme<Credentials> { + private static class CredentialsTupleScheme extends org.apache.thrift.scheme.TupleScheme<Credentials> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, Credentials 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.creds.size()); - for (Map.Entry<String, String> _iter601 : struct.creds.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter601 : struct.creds.entrySet()) { oprot.writeString(_iter601.getKey()); oprot.writeString(_iter601.getValue()); @@ -437,12 +408,12 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent @Override public void read(org.apache.thrift.protocol.TProtocol prot, Credentials 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 _map602 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.creds = new HashMap<String,String>(2*_map602.size); - String _key603; - String _val604; + struct.creds = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map602.size); + java.lang.String _key603; + java.lang.String _val604; for (int _i605 = 0; _i605 < _map602.size; ++_i605) { _key603 = iprot.readString(); @@ -454,5 +425,8 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent } } + 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/DRPCExceptionType.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java index 2ccf1b1..44bf0cb 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java +++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -24,10 +24,6 @@ package org.apache.storm.generated; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - public enum DRPCExceptionType implements org.apache.thrift.TEnum { INTERNAL_ERROR(0), SERVER_SHUTDOWN(1),
