http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
b/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
index 2287244..7471d79 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
@@ -16,53 +16,23 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.11.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.storm.generated;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
[email protected](value = "Autogenerated by Thrift Compiler
(0.11.0)")
public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions,
SubmitOptions._Fields>, java.io.Serializable, Cloneable,
Comparable<SubmitOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("SubmitOptions");
private static final org.apache.thrift.protocol.TField
INITIAL_STATUS_FIELD_DESC = new
org.apache.thrift.protocol.TField("initial_status",
org.apache.thrift.protocol.TType.I32, (short)1);
private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC =
new org.apache.thrift.protocol.TField("creds",
org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new
SubmitOptionsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new SubmitOptionsTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new SubmitOptionsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new SubmitOptionsTupleSchemeFactory();
private TopologyInitialStatus initial_status; // required
private Credentials creds; // optional
@@ -76,10 +46,10 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
INITIAL_STATUS((short)1, "initial_status"),
CREDS((short)2, "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);
}
}
@@ -104,21 +74,21 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
*/
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;
}
@@ -127,21 +97,21 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
private static final _Fields optionals[] = {_Fields.CREDS};
- 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.INITIAL_STATUS, new
org.apache.thrift.meta_data.FieldMetaData("initial_status",
org.apache.thrift.TFieldRequirementType.REQUIRED,
new
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM,
TopologyInitialStatus.class)));
tmpMap.put(_Fields.CREDS, new
org.apache.thrift.meta_data.FieldMetaData("creds",
org.apache.thrift.TFieldRequirementType.OPTIONAL,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
Credentials.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class,
metaDataMap);
}
@@ -231,7 +201,7 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case INITIAL_STATUS:
if (value == null) {
@@ -252,7 +222,7 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case INITIAL_STATUS:
return get_initial_status();
@@ -261,13 +231,13 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
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) {
@@ -276,11 +246,11 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
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 SubmitOptions)
@@ -291,6 +261,8 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
public boolean equals(SubmitOptions that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_initial_status = true && this.is_set_initial_status();
boolean that_present_initial_status = true && that.is_set_initial_status();
@@ -315,19 +287,17 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_initial_status = true && (is_set_initial_status());
- list.add(present_initial_status);
- if (present_initial_status)
- list.add(initial_status.getValue());
+ hashCode = hashCode * 8191 + ((is_set_initial_status()) ? 131071 : 524287);
+ if (is_set_initial_status())
+ hashCode = hashCode * 8191 + initial_status.getValue();
- 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
@@ -338,7 +308,7 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
int lastComparison = 0;
- lastComparison =
Boolean.valueOf(is_set_initial_status()).compareTo(other.is_set_initial_status());
+ lastComparison =
java.lang.Boolean.valueOf(is_set_initial_status()).compareTo(other.is_set_initial_status());
if (lastComparison != 0) {
return lastComparison;
}
@@ -348,7 +318,7 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
return lastComparison;
}
}
- 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;
}
@@ -366,16 +336,16 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
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("SubmitOptions(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("SubmitOptions(");
boolean first = true;
sb.append("initial_status:");
@@ -419,7 +389,7 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
}
- 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) {
@@ -427,13 +397,13 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
}
- private static class SubmitOptionsStandardSchemeFactory implements
SchemeFactory {
+ private static class SubmitOptionsStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public SubmitOptionsStandardScheme getScheme() {
return new SubmitOptionsStandardScheme();
}
}
- private static class SubmitOptionsStandardScheme extends
StandardScheme<SubmitOptions> {
+ private static class SubmitOptionsStandardScheme extends
org.apache.thrift.scheme.StandardScheme<SubmitOptions> {
public void read(org.apache.thrift.protocol.TProtocol iprot, SubmitOptions
struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -493,19 +463,19 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
- private static class SubmitOptionsTupleSchemeFactory implements
SchemeFactory {
+ private static class SubmitOptionsTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public SubmitOptionsTupleScheme getScheme() {
return new SubmitOptionsTupleScheme();
}
}
- private static class SubmitOptionsTupleScheme extends
TupleScheme<SubmitOptions> {
+ private static class SubmitOptionsTupleScheme extends
org.apache.thrift.scheme.TupleScheme<SubmitOptions> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, SubmitOptions
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.initial_status.getValue());
- BitSet optionals = new BitSet();
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.is_set_creds()) {
optionals.set(0);
}
@@ -517,10 +487,10 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, SubmitOptions
struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
struct.initial_status =
org.apache.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32());
struct.set_initial_status_isSet(true);
- BitSet incoming = iprot.readBitSet(1);
+ java.util.BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
struct.creds = new Credentials();
struct.creds.read(iprot);
@@ -529,5 +499,8 @@ public class SubmitOptions implements
org.apache.thrift.TBase<SubmitOptions, Sub
}
}
+ 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();
+ }
}
