You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/05/23 20:04:07 UTC
[37/43] storm git commit: STORM-3061: thrift 0.11
http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
index 420ad60..1d83ce3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.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"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon");
@@ -60,16 +33,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private static final org.apache.thrift.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism_hint", org.apache.thrift.protocol.TType.I32, (short)3);
private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("json_conf", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ComponentCommonStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ComponentCommonTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentCommonStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentCommonTupleSchemeFactory();
- private Map<GlobalStreamId,Grouping> inputs; // required
- private Map<String,StreamInfo> streams; // required
+ private java.util.Map<GlobalStreamId,Grouping> inputs; // required
+ private java.util.Map<java.lang.String,StreamInfo> streams; // required
private int parallelism_hint; // optional
- private String json_conf; // optional
+ private java.lang.String json_conf; // 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 {
@@ -78,10 +48,10 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
PARALLELISM_HINT((short)3, "parallelism_hint"),
JSON_CONF((short)4, "json_conf");
- 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 ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
*/
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 ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -142,9 +112,9 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private static final int __PARALLELISM_HINT_ISSET_ID = 0;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.PARALLELISM_HINT,_Fields.JSON_CONF};
- 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.INPUTS, new org.apache.thrift.meta_data.FieldMetaData("inputs", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class),
@@ -157,7 +127,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift.meta_data.FieldMetaData("json_conf", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentCommon.class, metaDataMap);
}
@@ -165,8 +135,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
public ComponentCommon(
- Map<GlobalStreamId,Grouping> inputs,
- Map<String,StreamInfo> streams)
+ java.util.Map<GlobalStreamId,Grouping> inputs,
+ java.util.Map<java.lang.String,StreamInfo> streams)
{
this();
this.inputs = inputs;
@@ -179,8 +149,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
public ComponentCommon(ComponentCommon other) {
__isset_bitfield = other.__isset_bitfield;
if (other.is_set_inputs()) {
- Map<GlobalStreamId,Grouping> __this__inputs = new HashMap<GlobalStreamId,Grouping>(other.inputs.size());
- for (Map.Entry<GlobalStreamId, Grouping> other_element : other.inputs.entrySet()) {
+ java.util.Map<GlobalStreamId,Grouping> __this__inputs = new java.util.HashMap<GlobalStreamId,Grouping>(other.inputs.size());
+ for (java.util.Map.Entry<GlobalStreamId, Grouping> other_element : other.inputs.entrySet()) {
GlobalStreamId other_element_key = other_element.getKey();
Grouping other_element_value = other_element.getValue();
@@ -194,13 +164,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
this.inputs = __this__inputs;
}
if (other.is_set_streams()) {
- Map<String,StreamInfo> __this__streams = new HashMap<String,StreamInfo>(other.streams.size());
- for (Map.Entry<String, StreamInfo> other_element : other.streams.entrySet()) {
+ java.util.Map<java.lang.String,StreamInfo> __this__streams = new java.util.HashMap<java.lang.String,StreamInfo>(other.streams.size());
+ for (java.util.Map.Entry<java.lang.String, StreamInfo> other_element : other.streams.entrySet()) {
- String other_element_key = other_element.getKey();
+ java.lang.String other_element_key = other_element.getKey();
StreamInfo other_element_value = other_element.getValue();
- String __this__streams_copy_key = other_element_key;
+ java.lang.String __this__streams_copy_key = other_element_key;
StreamInfo __this__streams_copy_value = new StreamInfo(other_element_value);
@@ -233,16 +203,16 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
public void put_to_inputs(GlobalStreamId key, Grouping val) {
if (this.inputs == null) {
- this.inputs = new HashMap<GlobalStreamId,Grouping>();
+ this.inputs = new java.util.HashMap<GlobalStreamId,Grouping>();
}
this.inputs.put(key, val);
}
- public Map<GlobalStreamId,Grouping> get_inputs() {
+ public java.util.Map<GlobalStreamId,Grouping> get_inputs() {
return this.inputs;
}
- public void set_inputs(Map<GlobalStreamId,Grouping> inputs) {
+ public void set_inputs(java.util.Map<GlobalStreamId,Grouping> inputs) {
this.inputs = inputs;
}
@@ -265,18 +235,18 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return (this.streams == null) ? 0 : this.streams.size();
}
- public void put_to_streams(String key, StreamInfo val) {
+ public void put_to_streams(java.lang.String key, StreamInfo val) {
if (this.streams == null) {
- this.streams = new HashMap<String,StreamInfo>();
+ this.streams = new java.util.HashMap<java.lang.String,StreamInfo>();
}
this.streams.put(key, val);
}
- public Map<String,StreamInfo> get_streams() {
+ public java.util.Map<java.lang.String,StreamInfo> get_streams() {
return this.streams;
}
- public void set_streams(Map<String,StreamInfo> streams) {
+ public void set_streams(java.util.Map<java.lang.String,StreamInfo> streams) {
this.streams = streams;
}
@@ -305,23 +275,23 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
public void unset_parallelism_hint() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
}
/** Returns true if field parallelism_hint is set (has been assigned a value) and false otherwise */
public boolean is_set_parallelism_hint() {
- return EncodingUtils.testBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
}
public void set_parallelism_hint_isSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID, value);
}
- public String get_json_conf() {
+ public java.lang.String get_json_conf() {
return this.json_conf;
}
- public void set_json_conf(String json_conf) {
+ public void set_json_conf(java.lang.String json_conf) {
this.json_conf = json_conf;
}
@@ -340,13 +310,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case INPUTS:
if (value == null) {
unset_inputs();
} else {
- set_inputs((Map<GlobalStreamId,Grouping>)value);
+ set_inputs((java.util.Map<GlobalStreamId,Grouping>)value);
}
break;
@@ -354,7 +324,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
if (value == null) {
unset_streams();
} else {
- set_streams((Map<String,StreamInfo>)value);
+ set_streams((java.util.Map<java.lang.String,StreamInfo>)value);
}
break;
@@ -362,7 +332,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
if (value == null) {
unset_parallelism_hint();
} else {
- set_parallelism_hint((Integer)value);
+ set_parallelism_hint((java.lang.Integer)value);
}
break;
@@ -370,14 +340,14 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
if (value == null) {
unset_json_conf();
} else {
- set_json_conf((String)value);
+ set_json_conf((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case INPUTS:
return get_inputs();
@@ -392,13 +362,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return get_json_conf();
}
- 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) {
@@ -411,11 +381,11 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
case JSON_CONF:
return is_set_json_conf();
}
- 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 ComponentCommon)
@@ -426,6 +396,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
public boolean equals(ComponentCommon that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_inputs = true && this.is_set_inputs();
boolean that_present_inputs = true && that.is_set_inputs();
@@ -468,29 +440,25 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_inputs = true && (is_set_inputs());
- list.add(present_inputs);
- if (present_inputs)
- list.add(inputs);
+ hashCode = hashCode * 8191 + ((is_set_inputs()) ? 131071 : 524287);
+ if (is_set_inputs())
+ hashCode = hashCode * 8191 + inputs.hashCode();
- boolean present_streams = true && (is_set_streams());
- list.add(present_streams);
- if (present_streams)
- list.add(streams);
+ hashCode = hashCode * 8191 + ((is_set_streams()) ? 131071 : 524287);
+ if (is_set_streams())
+ hashCode = hashCode * 8191 + streams.hashCode();
- boolean present_parallelism_hint = true && (is_set_parallelism_hint());
- list.add(present_parallelism_hint);
- if (present_parallelism_hint)
- list.add(parallelism_hint);
+ hashCode = hashCode * 8191 + ((is_set_parallelism_hint()) ? 131071 : 524287);
+ if (is_set_parallelism_hint())
+ hashCode = hashCode * 8191 + parallelism_hint;
- boolean present_json_conf = true && (is_set_json_conf());
- list.add(present_json_conf);
- if (present_json_conf)
- list.add(json_conf);
+ hashCode = hashCode * 8191 + ((is_set_json_conf()) ? 131071 : 524287);
+ if (is_set_json_conf())
+ hashCode = hashCode * 8191 + json_conf.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -501,7 +469,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
int lastComparison = 0;
- lastComparison = Boolean.valueOf(is_set_inputs()).compareTo(other.is_set_inputs());
+ lastComparison = java.lang.Boolean.valueOf(is_set_inputs()).compareTo(other.is_set_inputs());
if (lastComparison != 0) {
return lastComparison;
}
@@ -511,7 +479,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_streams()).compareTo(other.is_set_streams());
+ lastComparison = java.lang.Boolean.valueOf(is_set_streams()).compareTo(other.is_set_streams());
if (lastComparison != 0) {
return lastComparison;
}
@@ -521,7 +489,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_parallelism_hint()).compareTo(other.is_set_parallelism_hint());
+ lastComparison = java.lang.Boolean.valueOf(is_set_parallelism_hint()).compareTo(other.is_set_parallelism_hint());
if (lastComparison != 0) {
return lastComparison;
}
@@ -531,7 +499,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_json_conf()).compareTo(other.is_set_json_conf());
+ lastComparison = java.lang.Boolean.valueOf(is_set_json_conf()).compareTo(other.is_set_json_conf());
if (lastComparison != 0) {
return lastComparison;
}
@@ -549,16 +517,16 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
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("ComponentCommon(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("ComponentCommon(");
boolean first = true;
sb.append("inputs:");
@@ -617,7 +585,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
}
- 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;
@@ -627,13 +595,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
}
- private static class ComponentCommonStandardSchemeFactory implements SchemeFactory {
+ private static class ComponentCommonStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ComponentCommonStandardScheme getScheme() {
return new ComponentCommonStandardScheme();
}
}
- private static class ComponentCommonStandardScheme extends StandardScheme<ComponentCommon> {
+ private static class ComponentCommonStandardScheme extends org.apache.thrift.scheme.StandardScheme<ComponentCommon> {
public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentCommon struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -649,7 +617,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
- struct.inputs = new HashMap<GlobalStreamId,Grouping>(2*_map24.size);
+ struct.inputs = new java.util.HashMap<GlobalStreamId,Grouping>(2*_map24.size);
GlobalStreamId _key25;
Grouping _val26;
for (int _i27 = 0; _i27 < _map24.size; ++_i27)
@@ -671,8 +639,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
- struct.streams = new HashMap<String,StreamInfo>(2*_map28.size);
- String _key29;
+ struct.streams = new java.util.HashMap<java.lang.String,StreamInfo>(2*_map28.size);
+ java.lang.String _key29;
StreamInfo _val30;
for (int _i31 = 0; _i31 < _map28.size; ++_i31)
{
@@ -721,7 +689,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
oprot.writeFieldBegin(INPUTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.inputs.size()));
- for (Map.Entry<GlobalStreamId, Grouping> _iter32 : struct.inputs.entrySet())
+ for (java.util.Map.Entry<GlobalStreamId, Grouping> _iter32 : struct.inputs.entrySet())
{
_iter32.getKey().write(oprot);
_iter32.getValue().write(oprot);
@@ -734,7 +702,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
oprot.writeFieldBegin(STREAMS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.streams.size()));
- for (Map.Entry<String, StreamInfo> _iter33 : struct.streams.entrySet())
+ for (java.util.Map.Entry<java.lang.String, StreamInfo> _iter33 : struct.streams.entrySet())
{
oprot.writeString(_iter33.getKey());
_iter33.getValue().write(oprot);
@@ -761,20 +729,20 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
- private static class ComponentCommonTupleSchemeFactory implements SchemeFactory {
+ private static class ComponentCommonTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ComponentCommonTupleScheme getScheme() {
return new ComponentCommonTupleScheme();
}
}
- private static class ComponentCommonTupleScheme extends TupleScheme<ComponentCommon> {
+ private static class ComponentCommonTupleScheme extends org.apache.thrift.scheme.TupleScheme<ComponentCommon> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ComponentCommon 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.inputs.size());
- for (Map.Entry<GlobalStreamId, Grouping> _iter34 : struct.inputs.entrySet())
+ for (java.util.Map.Entry<GlobalStreamId, Grouping> _iter34 : struct.inputs.entrySet())
{
_iter34.getKey().write(oprot);
_iter34.getValue().write(oprot);
@@ -782,13 +750,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
{
oprot.writeI32(struct.streams.size());
- for (Map.Entry<String, StreamInfo> _iter35 : struct.streams.entrySet())
+ for (java.util.Map.Entry<java.lang.String, StreamInfo> _iter35 : struct.streams.entrySet())
{
oprot.writeString(_iter35.getKey());
_iter35.getValue().write(oprot);
}
}
- BitSet optionals = new BitSet();
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.is_set_parallelism_hint()) {
optionals.set(0);
}
@@ -806,10 +774,10 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ComponentCommon 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 _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.inputs = new HashMap<GlobalStreamId,Grouping>(2*_map36.size);
+ struct.inputs = new java.util.HashMap<GlobalStreamId,Grouping>(2*_map36.size);
GlobalStreamId _key37;
Grouping _val38;
for (int _i39 = 0; _i39 < _map36.size; ++_i39)
@@ -824,8 +792,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
struct.set_inputs_isSet(true);
{
org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.streams = new HashMap<String,StreamInfo>(2*_map40.size);
- String _key41;
+ struct.streams = new java.util.HashMap<java.lang.String,StreamInfo>(2*_map40.size);
+ java.lang.String _key41;
StreamInfo _val42;
for (int _i43 = 0; _i43 < _map40.size; ++_i43)
{
@@ -836,7 +804,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
}
struct.set_streams_isSet(true);
- BitSet incoming = iprot.readBitSet(2);
+ java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
struct.parallelism_hint = iprot.readI32();
struct.set_parallelism_hint_isSet(true);
@@ -848,5 +816,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
}
+ 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/ComponentObject.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
index 94560a0..3ec8fee 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
@@ -16,41 +16,14 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.11.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.storm.generated;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, ComponentObject._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentObject");
private static final org.apache.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_java", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -63,10 +36,10 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
SHELL((short)2, "shell"),
JAVA_OBJECT((short)3, "java_object");
- 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);
}
}
@@ -93,21 +66,21 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
*/
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;
}
@@ -116,21 +89,21 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.SERIALIZED_JAVA, new org.apache.thrift.meta_data.FieldMetaData("serialized_java", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.SERIALIZED_JAVA, new org.apache.thrift.meta_data.FieldMetaData("serialized_java", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- tmpMap.put(_Fields.SHELL, new org.apache.thrift.meta_data.FieldMetaData("shell", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.SHELL, new org.apache.thrift.meta_data.FieldMetaData("shell", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ShellComponent.class)));
- tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("java_object", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("java_object", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObject.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentObject.class, metaDataMap);
}
@@ -138,7 +111,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
super();
}
- public ComponentObject(_Fields setField, Object value) {
+ public ComponentObject(_Fields setField, java.lang.Object value) {
super(setField, value);
}
@@ -149,7 +122,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
return new ComponentObject(this);
}
- public static ComponentObject serialized_java(ByteBuffer value) {
+ public static ComponentObject serialized_java(java.nio.ByteBuffer value) {
ComponentObject x = new ComponentObject();
x.set_serialized_java(value);
return x;
@@ -157,7 +130,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
public static ComponentObject serialized_java(byte[] value) {
ComponentObject x = new ComponentObject();
- x.set_serialized_java(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
+ x.set_serialized_java(java.nio.ByteBuffer.wrap(value.clone()));
return x;
}
@@ -175,36 +148,36 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
@Override
- protected void checkType(_Fields setField, Object value) throws ClassCastException {
+ protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException {
switch (setField) {
case SERIALIZED_JAVA:
- if (value instanceof ByteBuffer) {
+ if (value instanceof java.nio.ByteBuffer) {
break;
}
- throw new ClassCastException("Was expecting value of type ByteBuffer for field 'serialized_java', but got " + value.getClass().getSimpleName());
+ throw new java.lang.ClassCastException("Was expecting value of type java.nio.ByteBuffer for field 'serialized_java', but got " + value.getClass().getSimpleName());
case SHELL:
if (value instanceof ShellComponent) {
break;
}
- throw new ClassCastException("Was expecting value of type ShellComponent for field 'shell', but got " + value.getClass().getSimpleName());
+ throw new java.lang.ClassCastException("Was expecting value of type ShellComponent for field 'shell', but got " + value.getClass().getSimpleName());
case JAVA_OBJECT:
if (value instanceof JavaObject) {
break;
}
- throw new ClassCastException("Was expecting value of type JavaObject for field 'java_object', but got " + value.getClass().getSimpleName());
+ throw new java.lang.ClassCastException("Was expecting value of type JavaObject for field 'java_object', but got " + value.getClass().getSimpleName());
default:
- throw new IllegalArgumentException("Unknown field id " + setField);
+ throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
}
}
@Override
- protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
case SERIALIZED_JAVA:
if (field.type == SERIALIZED_JAVA_FIELD_DESC.type) {
- ByteBuffer serialized_java;
+ java.nio.ByteBuffer serialized_java;
serialized_java = iprot.readBinary();
return serialized_java;
} else {
@@ -232,7 +205,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
return null;
}
default:
- throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
}
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
@@ -244,7 +217,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case SERIALIZED_JAVA:
- ByteBuffer serialized_java = (ByteBuffer)value_;
+ java.nio.ByteBuffer serialized_java = (java.nio.ByteBuffer)value_;
oprot.writeBinary(serialized_java);
return;
case SHELL:
@@ -256,17 +229,17 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
java_object.write(oprot);
return;
default:
- throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
}
}
@Override
- protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(fieldID);
if (setField != null) {
switch (setField) {
case SERIALIZED_JAVA:
- ByteBuffer serialized_java;
+ java.nio.ByteBuffer serialized_java;
serialized_java = iprot.readBinary();
return serialized_java;
case SHELL:
@@ -280,10 +253,10 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
java_object.read(iprot);
return java_object;
default:
- throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
}
} else {
- throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
}
}
@@ -291,7 +264,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case SERIALIZED_JAVA:
- ByteBuffer serialized_java = (ByteBuffer)value_;
+ java.nio.ByteBuffer serialized_java = (java.nio.ByteBuffer)value_;
oprot.writeBinary(serialized_java);
return;
case SHELL:
@@ -303,7 +276,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
java_object.write(oprot);
return;
default:
- throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
}
}
@@ -317,7 +290,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
case JAVA_OBJECT:
return JAVA_OBJECT_FIELD_DESC;
default:
- throw new IllegalArgumentException("Unknown field id " + setField);
+ throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
}
}
@@ -338,24 +311,24 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
public byte[] get_serialized_java() {
set_serialized_java(org.apache.thrift.TBaseHelper.rightSize(buffer_for_serialized_java()));
- ByteBuffer b = buffer_for_serialized_java();
+ java.nio.ByteBuffer b = buffer_for_serialized_java();
return b == null ? null : b.array();
}
- public ByteBuffer buffer_for_serialized_java() {
+ public java.nio.ByteBuffer buffer_for_serialized_java() {
if (getSetField() == _Fields.SERIALIZED_JAVA) {
- return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());
+ return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
} else {
- throw new RuntimeException("Cannot get field 'serialized_java' because union is currently set to " + getFieldDesc(getSetField()).name);
+ throw new java.lang.RuntimeException("Cannot get field 'serialized_java' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_serialized_java(byte[] value) {
- set_serialized_java(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
+ set_serialized_java(java.nio.ByteBuffer.wrap(value.clone()));
}
- public void set_serialized_java(ByteBuffer value) {
- if (value == null) throw new NullPointerException();
+ public void set_serialized_java(java.nio.ByteBuffer value) {
+ if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.SERIALIZED_JAVA;
value_ = value;
}
@@ -364,12 +337,12 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
if (getSetField() == _Fields.SHELL) {
return (ShellComponent)getFieldValue();
} else {
- throw new RuntimeException("Cannot get field 'shell' because union is currently set to " + getFieldDesc(getSetField()).name);
+ throw new java.lang.RuntimeException("Cannot get field 'shell' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_shell(ShellComponent value) {
- if (value == null) throw new NullPointerException();
+ if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.SHELL;
value_ = value;
}
@@ -378,12 +351,12 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
if (getSetField() == _Fields.JAVA_OBJECT) {
return (JavaObject)getFieldValue();
} else {
- throw new RuntimeException("Cannot get field 'java_object' because union is currently set to " + getFieldDesc(getSetField()).name);
+ throw new java.lang.RuntimeException("Cannot get field 'java_object' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_java_object(JavaObject value) {
- if (value == null) throw new NullPointerException();
+ if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.JAVA_OBJECT;
value_ = value;
}
@@ -403,7 +376,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
- public boolean equals(Object other) {
+ public boolean equals(java.lang.Object other) {
if (other instanceof ComponentObject) {
return equals((ComponentObject)other);
} else {
@@ -427,12 +400,12 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
list.add(setField.getThriftFieldId());
- Object value = getFieldValue();
+ java.lang.Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
@@ -450,7 +423,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
- 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) {