http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPCInvocations.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPCInvocations.java b/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPCInvocations.java index 08aab63..6795e5f 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPCInvocations.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPCInvocations.java @@ -34,26 +34,26 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class DistributedRPCInvocations { public interface Iface { - public void result(String id, String result) throws org.apache.thrift.TException; + public void result(String id, String result) throws AuthorizationException, TException; - public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift.TException; + public DRPCRequest fetchRequest(String functionName) throws AuthorizationException, TException; - public void failRequest(String id) throws org.apache.thrift.TException; + public void failRequest(String id) throws AuthorizationException, TException; } public interface AsyncIface { - public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void result(String id, String result, AsyncMethodCallback resultHandler) throws TException; - public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void fetchRequest(String functionName, AsyncMethodCallback resultHandler) throws TException; - public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void failRequest(String id, AsyncMethodCallback resultHandler) throws TException; } @@ -77,13 +77,13 @@ public class DistributedRPCInvocations { super(iprot, oprot); } - public void result(String id, String result) throws org.apache.thrift.TException + public void result(String id, String result) throws AuthorizationException, TException { send_result(id, result); recv_result(); } - public void send_result(String id, String result) throws org.apache.thrift.TException + public void send_result(String id, String result) throws TException { result_args args = new result_args(); args.set_id(id); @@ -91,53 +91,62 @@ public class DistributedRPCInvocations { sendBase("result", args); } - public void recv_result() throws org.apache.thrift.TException + public void recv_result() throws AuthorizationException, TException { result_result result = new result_result(); receiveBase(result, "result"); + if (result.aze != null) { + throw result.aze; + } return; } - public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift.TException + public DRPCRequest fetchRequest(String functionName) throws AuthorizationException, TException { send_fetchRequest(functionName); return recv_fetchRequest(); } - public void send_fetchRequest(String functionName) throws org.apache.thrift.TException + public void send_fetchRequest(String functionName) throws TException { fetchRequest_args args = new fetchRequest_args(); args.set_functionName(functionName); sendBase("fetchRequest", args); } - public DRPCRequest recv_fetchRequest() throws org.apache.thrift.TException + public DRPCRequest recv_fetchRequest() throws AuthorizationException, TException { fetchRequest_result result = new fetchRequest_result(); receiveBase(result, "fetchRequest"); if (result.is_set_success()) { return result.success; } + if (result.aze != null) { + throw result.aze; + } throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result"); } - public void failRequest(String id) throws org.apache.thrift.TException + public void failRequest(String id) throws AuthorizationException, TException { send_failRequest(id); recv_failRequest(); } - public void send_failRequest(String id) throws org.apache.thrift.TException + public void send_failRequest(String id) throws TException { failRequest_args args = new failRequest_args(); args.set_id(id); sendBase("failRequest", args); } - public void recv_failRequest() throws org.apache.thrift.TException + public void recv_failRequest() throws AuthorizationException, TException { failRequest_result result = new failRequest_result(); receiveBase(result, "failRequest"); + if (result.aze != null) { + throw result.aze; + } return; } @@ -159,7 +168,7 @@ public class DistributedRPCInvocations { super(protocolFactory, clientManager, transport); } - public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void result(String id, String result, AsyncMethodCallback resultHandler) throws TException { checkReady(); result_call method_call = new result_call(id, result, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -169,13 +178,13 @@ public class DistributedRPCInvocations { public static class result_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; private String result; - public result_call(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public result_call(String id, String result, AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.result = result; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("result", org.apache.thrift.protocol.TMessageType.CALL, 0)); result_args args = new result_args(); args.set_id(id); @@ -184,8 +193,8 @@ public class DistributedRPCInvocations { prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws AuthorizationException, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); @@ -194,7 +203,7 @@ public class DistributedRPCInvocations { } } - public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void fetchRequest(String functionName, AsyncMethodCallback resultHandler) throws TException { checkReady(); fetchRequest_call method_call = new fetchRequest_call(functionName, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -203,12 +212,12 @@ public class DistributedRPCInvocations { public static class fetchRequest_call extends org.apache.thrift.async.TAsyncMethodCall { private String functionName; - public fetchRequest_call(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public fetchRequest_call(String functionName, AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.functionName = functionName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fetchRequest", org.apache.thrift.protocol.TMessageType.CALL, 0)); fetchRequest_args args = new fetchRequest_args(); args.set_functionName(functionName); @@ -216,8 +225,8 @@ public class DistributedRPCInvocations { prot.writeMessageEnd(); } - public DRPCRequest getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public DRPCRequest getResult() throws AuthorizationException, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); @@ -226,7 +235,7 @@ public class DistributedRPCInvocations { } } - public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void failRequest(String id, AsyncMethodCallback resultHandler) throws TException { checkReady(); failRequest_call method_call = new failRequest_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -235,12 +244,12 @@ public class DistributedRPCInvocations { public static class failRequest_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public failRequest_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public failRequest_call(String id, AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("failRequest", org.apache.thrift.protocol.TMessageType.CALL, 0)); failRequest_args args = new failRequest_args(); args.set_id(id); @@ -248,8 +257,8 @@ public class DistributedRPCInvocations { prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws AuthorizationException, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); @@ -290,9 +299,13 @@ public class DistributedRPCInvocations { return false; } - public result_result getResult(I iface, result_args args) throws org.apache.thrift.TException { + public result_result getResult(I iface, result_args args) throws TException { result_result result = new result_result(); - iface.result(args.id, args.result); + try { + iface.result(args.id, args.result); + } catch (AuthorizationException aze) { + result.aze = aze; + } return result; } } @@ -310,9 +323,13 @@ public class DistributedRPCInvocations { return false; } - public fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift.TException { + public fetchRequest_result getResult(I iface, fetchRequest_args args) throws TException { fetchRequest_result result = new fetchRequest_result(); - result.success = iface.fetchRequest(args.functionName); + try { + result.success = iface.fetchRequest(args.functionName); + } catch (AuthorizationException aze) { + result.aze = aze; + } return result; } } @@ -330,9 +347,13 @@ public class DistributedRPCInvocations { return false; } - public failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift.TException { + public failRequest_result getResult(I iface, failRequest_args args) throws TException { failRequest_result result = new failRequest_result(); - iface.failRequest(args.id); + try { + iface.failRequest(args.id); + } catch (AuthorizationException aze) { + result.aze = aze; + } return result; } } @@ -382,6 +403,12 @@ public class DistributedRPCInvocations { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TBase msg; result_result result = new result_result(); + if (e instanceof AuthorizationException) { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } + else { msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); @@ -401,7 +428,7 @@ public class DistributedRPCInvocations { return false; } - public void start(I iface, result_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { + public void start(I iface, result_args args, AsyncMethodCallback<Void> resultHandler) throws TException { iface.result(args.id, args.result,resultHandler); } } @@ -433,6 +460,12 @@ public class DistributedRPCInvocations { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TBase msg; fetchRequest_result result = new fetchRequest_result(); + if (e instanceof AuthorizationException) { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } + else { msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); @@ -452,7 +485,7 @@ public class DistributedRPCInvocations { return false; } - public void start(I iface, fetchRequest_args args, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws TException { + public void start(I iface, fetchRequest_args args, AsyncMethodCallback<DRPCRequest> resultHandler) throws TException { iface.fetchRequest(args.functionName,resultHandler); } } @@ -483,6 +516,12 @@ public class DistributedRPCInvocations { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TBase msg; failRequest_result result = new failRequest_result(); + if (e instanceof AuthorizationException) { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } + else { msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); @@ -502,7 +541,7 @@ public class DistributedRPCInvocations { return false; } - public void start(I iface, failRequest_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { + public void start(I iface, failRequest_args args, AsyncMethodCallback<Void> resultHandler) throws TException { iface.failRequest(args.id,resultHandler); } } @@ -811,11 +850,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -843,7 +882,7 @@ public class DistributedRPCInvocations { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } @@ -851,7 +890,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -859,7 +898,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -872,7 +911,7 @@ public class DistributedRPCInvocations { private static class result_argsStandardScheme extends StandardScheme<result_args> { - public void read(org.apache.thrift.protocol.TProtocol iprot, result_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, result_args struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -907,7 +946,7 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, result_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, result_args struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -936,7 +975,7 @@ public class DistributedRPCInvocations { private static class result_argsTupleScheme extends TupleScheme<result_args> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.is_set_id()) { @@ -955,7 +994,7 @@ public class DistributedRPCInvocations { } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { @@ -974,6 +1013,7 @@ public class DistributedRPCInvocations { public static class result_result implements org.apache.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable, Comparable<result_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_result"); + private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -981,10 +1021,11 @@ public class DistributedRPCInvocations { schemes.put(TupleScheme.class, new result_resultTupleSchemeFactory()); } + private AuthorizationException aze; // 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 { -; + AZE((short)1, "aze"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -999,6 +1040,8 @@ public class DistributedRPCInvocations { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // AZE + return AZE; default: return null; } @@ -1037,9 +1080,13 @@ public class DistributedRPCInvocations { return _fieldName; } } + + // isset id assignments public static final 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.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_result.class, metaDataMap); } @@ -1047,10 +1094,20 @@ public class DistributedRPCInvocations { public result_result() { } + public result_result( + AuthorizationException aze) + { + this(); + this.aze = aze; + } + /** * Performs a deep copy on <i>other</i>. */ public result_result(result_result other) { + if (other.is_set_aze()) { + this.aze = new AuthorizationException(other.aze); + } } public result_result deepCopy() { @@ -1059,15 +1116,50 @@ public class DistributedRPCInvocations { @Override public void clear() { + this.aze = null; + } + + public AuthorizationException get_aze() { + return this.aze; + } + + public void set_aze(AuthorizationException aze) { + this.aze = aze; + } + + public void unset_aze() { + this.aze = null; + } + + /** Returns true if field aze is set (has been assigned a value) and false otherwise */ + public boolean is_set_aze() { + return this.aze != null; + } + + public void set_aze_isSet(boolean value) { + if (!value) { + this.aze = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case AZE: + if (value == null) { + unset_aze(); + } else { + set_aze((AuthorizationException)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case AZE: + return get_aze(); + } throw new IllegalStateException(); } @@ -1079,6 +1171,8 @@ public class DistributedRPCInvocations { } switch (field) { + case AZE: + return is_set_aze(); } throw new IllegalStateException(); } @@ -1096,6 +1190,15 @@ public class DistributedRPCInvocations { if (that == null) return false; + boolean this_present_aze = true && this.is_set_aze(); + boolean that_present_aze = true && that.is_set_aze(); + if (this_present_aze || that_present_aze) { + if (!(this_present_aze && that_present_aze)) + return false; + if (!this.aze.equals(that.aze)) + return false; + } + return true; } @@ -1103,6 +1206,11 @@ public class DistributedRPCInvocations { public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_aze = true && (is_set_aze()); + list.add(present_aze); + if (present_aze) + list.add(aze); + return list.hashCode(); } @@ -1114,6 +1222,16 @@ public class DistributedRPCInvocations { int lastComparison = 0; + lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_aze()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1121,11 +1239,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -1134,11 +1252,18 @@ public class DistributedRPCInvocations { StringBuilder sb = new StringBuilder("result_result("); boolean first = true; + sb.append("aze:"); + if (this.aze == null) { + sb.append("null"); + } else { + sb.append(this.aze); + } + first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } @@ -1146,7 +1271,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1154,7 +1279,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1167,7 +1292,7 @@ public class DistributedRPCInvocations { private static class result_resultStandardScheme extends StandardScheme<result_result> { - public void read(org.apache.thrift.protocol.TProtocol iprot, result_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, result_result struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -1177,6 +1302,15 @@ public class DistributedRPCInvocations { break; } switch (schemeField.id) { + case 1: // AZE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1186,10 +1320,15 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, result_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, result_result struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.aze != null) { + oprot.writeFieldBegin(AZE_FIELD_DESC); + struct.aze.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1205,13 +1344,27 @@ public class DistributedRPCInvocations { private static class result_resultTupleScheme extends TupleScheme<result_result> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.is_set_aze()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.is_set_aze()) { + struct.aze.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } } } @@ -1446,11 +1599,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -1470,7 +1623,7 @@ public class DistributedRPCInvocations { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } @@ -1478,7 +1631,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1486,7 +1639,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1499,7 +1652,7 @@ public class DistributedRPCInvocations { private static class fetchRequest_argsStandardScheme extends StandardScheme<fetchRequest_args> { - public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_args struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -1526,7 +1679,7 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_args struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1550,7 +1703,7 @@ public class DistributedRPCInvocations { private static class fetchRequest_argsTupleScheme extends TupleScheme<fetchRequest_args> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.is_set_functionName()) { @@ -1563,7 +1716,7 @@ public class DistributedRPCInvocations { } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { @@ -1579,6 +1732,7 @@ public class DistributedRPCInvocations { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -1587,10 +1741,12 @@ public class DistributedRPCInvocations { } private DRPCRequest success; // required + private AuthorizationException aze; // 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 { - SUCCESS((short)0, "success"); + SUCCESS((short)0, "success"), + AZE((short)1, "aze"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -1607,6 +1763,8 @@ public class DistributedRPCInvocations { switch(fieldId) { case 0: // SUCCESS return SUCCESS; + case 1: // AZE + return AZE; default: return null; } @@ -1652,6 +1810,8 @@ public class DistributedRPCInvocations { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DRPCRequest.class))); + tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_result.class, metaDataMap); } @@ -1660,10 +1820,12 @@ public class DistributedRPCInvocations { } public fetchRequest_result( - DRPCRequest success) + DRPCRequest success, + AuthorizationException aze) { this(); this.success = success; + this.aze = aze; } /** @@ -1673,6 +1835,9 @@ public class DistributedRPCInvocations { if (other.is_set_success()) { this.success = new DRPCRequest(other.success); } + if (other.is_set_aze()) { + this.aze = new AuthorizationException(other.aze); + } } public fetchRequest_result deepCopy() { @@ -1682,6 +1847,7 @@ public class DistributedRPCInvocations { @Override public void clear() { this.success = null; + this.aze = null; } public DRPCRequest get_success() { @@ -1707,6 +1873,29 @@ public class DistributedRPCInvocations { } } + public AuthorizationException get_aze() { + return this.aze; + } + + public void set_aze(AuthorizationException aze) { + this.aze = aze; + } + + public void unset_aze() { + this.aze = null; + } + + /** Returns true if field aze is set (has been assigned a value) and false otherwise */ + public boolean is_set_aze() { + return this.aze != null; + } + + public void set_aze_isSet(boolean value) { + if (!value) { + this.aze = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case SUCCESS: @@ -1717,6 +1906,14 @@ public class DistributedRPCInvocations { } break; + case AZE: + if (value == null) { + unset_aze(); + } else { + set_aze((AuthorizationException)value); + } + break; + } } @@ -1725,6 +1922,9 @@ public class DistributedRPCInvocations { case SUCCESS: return get_success(); + case AZE: + return get_aze(); + } throw new IllegalStateException(); } @@ -1738,6 +1938,8 @@ public class DistributedRPCInvocations { switch (field) { case SUCCESS: return is_set_success(); + case AZE: + return is_set_aze(); } throw new IllegalStateException(); } @@ -1764,6 +1966,15 @@ public class DistributedRPCInvocations { return false; } + boolean this_present_aze = true && this.is_set_aze(); + boolean that_present_aze = true && that.is_set_aze(); + if (this_present_aze || that_present_aze) { + if (!(this_present_aze && that_present_aze)) + return false; + if (!this.aze.equals(that.aze)) + return false; + } + return true; } @@ -1776,6 +1987,11 @@ public class DistributedRPCInvocations { if (present_success) list.add(success); + boolean present_aze = true && (is_set_aze()); + list.add(present_aze); + if (present_aze) + list.add(aze); + return list.hashCode(); } @@ -1797,6 +2013,16 @@ public class DistributedRPCInvocations { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_aze()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1804,11 +2030,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -1824,11 +2050,19 @@ public class DistributedRPCInvocations { sb.append(this.success); } first = false; + if (!first) sb.append(", "); + sb.append("aze:"); + if (this.aze == null) { + sb.append("null"); + } else { + sb.append(this.aze); + } + first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity if (success != null) { @@ -1839,7 +2073,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1847,7 +2081,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -1860,7 +2094,7 @@ public class DistributedRPCInvocations { private static class fetchRequest_resultStandardScheme extends StandardScheme<fetchRequest_result> { - public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_result struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -1879,6 +2113,15 @@ public class DistributedRPCInvocations { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 1: // AZE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1888,7 +2131,7 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_result struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1897,6 +2140,11 @@ public class DistributedRPCInvocations { struct.success.write(oprot); oprot.writeFieldEnd(); } + if (struct.aze != null) { + oprot.writeFieldBegin(AZE_FIELD_DESC); + struct.aze.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1912,27 +2160,38 @@ public class DistributedRPCInvocations { private static class fetchRequest_resultTupleScheme extends TupleScheme<fetchRequest_result> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.is_set_success()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.is_set_aze()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.is_set_success()) { struct.success.write(oprot); } + if (struct.is_set_aze()) { + struct.aze.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = new DRPCRequest(); struct.success.read(iprot); struct.set_success_isSet(true); } + if (incoming.get(1)) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } } } @@ -2167,11 +2426,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -2191,7 +2450,7 @@ public class DistributedRPCInvocations { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } @@ -2199,7 +2458,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -2207,7 +2466,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -2220,7 +2479,7 @@ public class DistributedRPCInvocations { private static class failRequest_argsStandardScheme extends StandardScheme<failRequest_args> { - public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_args struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -2247,7 +2506,7 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, failRequest_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, failRequest_args struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2271,7 +2530,7 @@ public class DistributedRPCInvocations { private static class failRequest_argsTupleScheme extends TupleScheme<failRequest_args> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.is_set_id()) { @@ -2284,7 +2543,7 @@ public class DistributedRPCInvocations { } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { @@ -2299,6 +2558,7 @@ public class DistributedRPCInvocations { public static class failRequest_result implements org.apache.thrift.TBase<failRequest_result, failRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<failRequest_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("failRequest_result"); + private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -2306,10 +2566,11 @@ public class DistributedRPCInvocations { schemes.put(TupleScheme.class, new failRequest_resultTupleSchemeFactory()); } + private AuthorizationException aze; // 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 { -; + AZE((short)1, "aze"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -2324,6 +2585,8 @@ public class DistributedRPCInvocations { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // AZE + return AZE; default: return null; } @@ -2362,9 +2625,13 @@ public class DistributedRPCInvocations { return _fieldName; } } + + // isset id assignments public static final 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.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(failRequest_result.class, metaDataMap); } @@ -2372,10 +2639,20 @@ public class DistributedRPCInvocations { public failRequest_result() { } + public failRequest_result( + AuthorizationException aze) + { + this(); + this.aze = aze; + } + /** * Performs a deep copy on <i>other</i>. */ public failRequest_result(failRequest_result other) { + if (other.is_set_aze()) { + this.aze = new AuthorizationException(other.aze); + } } public failRequest_result deepCopy() { @@ -2384,15 +2661,50 @@ public class DistributedRPCInvocations { @Override public void clear() { + this.aze = null; + } + + public AuthorizationException get_aze() { + return this.aze; + } + + public void set_aze(AuthorizationException aze) { + this.aze = aze; + } + + public void unset_aze() { + this.aze = null; + } + + /** Returns true if field aze is set (has been assigned a value) and false otherwise */ + public boolean is_set_aze() { + return this.aze != null; + } + + public void set_aze_isSet(boolean value) { + if (!value) { + this.aze = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case AZE: + if (value == null) { + unset_aze(); + } else { + set_aze((AuthorizationException)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case AZE: + return get_aze(); + } throw new IllegalStateException(); } @@ -2404,6 +2716,8 @@ public class DistributedRPCInvocations { } switch (field) { + case AZE: + return is_set_aze(); } throw new IllegalStateException(); } @@ -2421,6 +2735,15 @@ public class DistributedRPCInvocations { if (that == null) return false; + boolean this_present_aze = true && this.is_set_aze(); + boolean that_present_aze = true && that.is_set_aze(); + if (this_present_aze || that_present_aze) { + if (!(this_present_aze && that_present_aze)) + return false; + if (!this.aze.equals(that.aze)) + return false; + } + return true; } @@ -2428,6 +2751,11 @@ public class DistributedRPCInvocations { public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_aze = true && (is_set_aze()); + list.add(present_aze); + if (present_aze) + list.add(aze); + return list.hashCode(); } @@ -2439,6 +2767,16 @@ public class DistributedRPCInvocations { int lastComparison = 0; + lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_aze()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -2446,11 +2784,11 @@ public class DistributedRPCInvocations { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -2459,11 +2797,18 @@ public class DistributedRPCInvocations { StringBuilder sb = new StringBuilder("failRequest_result("); boolean first = true; + sb.append("aze:"); + if (this.aze == null) { + sb.append("null"); + } else { + sb.append(this.aze); + } + first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } @@ -2471,7 +2816,7 @@ public class DistributedRPCInvocations { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -2479,7 +2824,7 @@ public class DistributedRPCInvocations { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -2492,7 +2837,7 @@ public class DistributedRPCInvocations { private static class failRequest_resultStandardScheme extends StandardScheme<failRequest_result> { - public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_result struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -2502,6 +2847,15 @@ public class DistributedRPCInvocations { break; } switch (schemeField.id) { + case 1: // AZE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2511,10 +2865,15 @@ public class DistributedRPCInvocations { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, failRequest_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, failRequest_result struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.aze != null) { + oprot.writeFieldBegin(AZE_FIELD_DESC); + struct.aze.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2530,13 +2889,27 @@ public class DistributedRPCInvocations { private static class failRequest_resultTupleScheme extends TupleScheme<failRequest_result> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.is_set_aze()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.is_set_aze()) { + struct.aze.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.aze = new AuthorizationException(); + struct.aze.read(iprot); + struct.set_aze_isSet(true); + } } }
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/ErrorInfo.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/ErrorInfo.java b/jstorm-core/src/main/java/backtype/storm/generated/ErrorInfo.java index f52e526..f99797b 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/ErrorInfo.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/ErrorInfo.java @@ -34,12 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo"); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("error_time_secs", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("errorTimeSecs", org.apache.thrift.protocol.TType.I32, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -48,12 +48,12 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ } private String error; // required - private int error_time_secs; // required + private int errorTimeSecs; // 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 { ERROR((short)1, "error"), - ERROR_TIME_SECS((short)2, "error_time_secs"); + ERROR_TIME_SECS((short)2, "errorTimeSecs"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -112,14 +112,14 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ } // isset id assignments - private static final int __ERROR_TIME_SECS_ISSET_ID = 0; + private static final int __ERRORTIMESECS_ISSET_ID = 0; private byte __isset_bitfield = 0; public static final 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.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("error_time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("errorTimeSecs", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ErrorInfo.class, metaDataMap); @@ -130,12 +130,12 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ public ErrorInfo( String error, - int error_time_secs) + int errorTimeSecs) { this(); this.error = error; - this.error_time_secs = error_time_secs; - set_error_time_secs_isSet(true); + this.errorTimeSecs = errorTimeSecs; + set_errorTimeSecs_isSet(true); } /** @@ -146,7 +146,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ if (other.is_set_error()) { this.error = other.error; } - this.error_time_secs = other.error_time_secs; + this.errorTimeSecs = other.errorTimeSecs; } public ErrorInfo deepCopy() { @@ -156,8 +156,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ @Override public void clear() { this.error = null; - set_error_time_secs_isSet(false); - this.error_time_secs = 0; + set_errorTimeSecs_isSet(false); + this.errorTimeSecs = 0; } public String get_error() { @@ -183,26 +183,26 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ } } - public int get_error_time_secs() { - return this.error_time_secs; + public int get_errorTimeSecs() { + return this.errorTimeSecs; } - public void set_error_time_secs(int error_time_secs) { - this.error_time_secs = error_time_secs; - set_error_time_secs_isSet(true); + public void set_errorTimeSecs(int errorTimeSecs) { + this.errorTimeSecs = errorTimeSecs; + set_errorTimeSecs_isSet(true); } - public void unset_error_time_secs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID); + public void unset_errorTimeSecs() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ERRORTIMESECS_ISSET_ID); } - /** Returns true if field error_time_secs is set (has been assigned a value) and false otherwise */ - public boolean is_set_error_time_secs() { - return EncodingUtils.testBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID); + /** Returns true if field errorTimeSecs is set (has been assigned a value) and false otherwise */ + public boolean is_set_errorTimeSecs() { + return EncodingUtils.testBit(__isset_bitfield, __ERRORTIMESECS_ISSET_ID); } - public void set_error_time_secs_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID, value); + public void set_errorTimeSecs_isSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ERRORTIMESECS_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -217,9 +217,9 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ case ERROR_TIME_SECS: if (value == null) { - unset_error_time_secs(); + unset_errorTimeSecs(); } else { - set_error_time_secs((Integer)value); + set_errorTimeSecs((Integer)value); } break; @@ -232,7 +232,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ return get_error(); case ERROR_TIME_SECS: - return Integer.valueOf(get_error_time_secs()); + return Integer.valueOf(get_errorTimeSecs()); } throw new IllegalStateException(); @@ -248,7 +248,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ case ERROR: return is_set_error(); case ERROR_TIME_SECS: - return is_set_error_time_secs(); + return is_set_errorTimeSecs(); } throw new IllegalStateException(); } @@ -275,12 +275,12 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ return false; } - boolean this_present_error_time_secs = true; - boolean that_present_error_time_secs = true; - if (this_present_error_time_secs || that_present_error_time_secs) { - if (!(this_present_error_time_secs && that_present_error_time_secs)) + boolean this_present_errorTimeSecs = true; + boolean that_present_errorTimeSecs = true; + if (this_present_errorTimeSecs || that_present_errorTimeSecs) { + if (!(this_present_errorTimeSecs && that_present_errorTimeSecs)) return false; - if (this.error_time_secs != that.error_time_secs) + if (this.errorTimeSecs != that.errorTimeSecs) return false; } @@ -296,10 +296,10 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ if (present_error) list.add(error); - boolean present_error_time_secs = true; - list.add(present_error_time_secs); - if (present_error_time_secs) - list.add(error_time_secs); + boolean present_errorTimeSecs = true; + list.add(present_errorTimeSecs); + if (present_errorTimeSecs) + list.add(errorTimeSecs); return list.hashCode(); } @@ -322,12 +322,12 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_error_time_secs()).compareTo(other.is_set_error_time_secs()); + lastComparison = Boolean.valueOf(is_set_errorTimeSecs()).compareTo(other.is_set_errorTimeSecs()); if (lastComparison != 0) { return lastComparison; } - if (is_set_error_time_secs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error_time_secs, other.error_time_secs); + if (is_set_errorTimeSecs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errorTimeSecs, other.errorTimeSecs); if (lastComparison != 0) { return lastComparison; } @@ -339,11 +339,11 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -360,21 +360,21 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ } first = false; if (!first) sb.append(", "); - sb.append("error_time_secs:"); - sb.append(this.error_time_secs); + sb.append("errorTimeSecs:"); + sb.append(this.errorTimeSecs); first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_error()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'error' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'error' is unset! Struct:" + toString()); } - if (!is_set_error_time_secs()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString()); + if (!is_set_errorTimeSecs()) { + throw new TProtocolException("Required field 'errorTimeSecs' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -383,7 +383,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -393,7 +393,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ // 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; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -406,7 +406,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ private static class ErrorInfoStandardScheme extends StandardScheme<ErrorInfo> { - public void read(org.apache.thrift.protocol.TProtocol iprot, ErrorInfo struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, ErrorInfo struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -426,8 +426,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ break; case 2: // ERROR_TIME_SECS if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.error_time_secs = iprot.readI32(); - struct.set_error_time_secs_isSet(true); + struct.errorTimeSecs = iprot.readI32(); + struct.set_errorTimeSecs_isSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -441,7 +441,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, ErrorInfo struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, ErrorInfo struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -451,7 +451,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ oprot.writeFieldEnd(); } oprot.writeFieldBegin(ERROR_TIME_SECS_FIELD_DESC); - oprot.writeI32(struct.error_time_secs); + oprot.writeI32(struct.errorTimeSecs); oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); @@ -468,19 +468,19 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._ private static class ErrorInfoTupleScheme extends TupleScheme<ErrorInfo> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.error); - oprot.writeI32(struct.error_time_secs); + oprot.writeI32(struct.errorTimeSecs); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.error = iprot.readString(); struct.set_error_isSet(true); - struct.error_time_secs = iprot.readI32(); - struct.set_error_time_secs_isSet(true); + struct.errorTimeSecs = iprot.readI32(); + struct.set_errorTimeSecs_isSet(true); } } http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/GlobalStreamId.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/GlobalStreamId.java b/jstorm-core/src/main/java/backtype/storm/generated/GlobalStreamId.java index 490a81d..65f5bfd 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/GlobalStreamId.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/GlobalStreamId.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId"); @@ -337,11 +337,11 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -369,14 +369,14 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_componentId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'componentId' is unset! Struct:" + toString()); } if (!is_set_streamId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'streamId' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -385,7 +385,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -393,7 +393,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -406,7 +406,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G private static class GlobalStreamIdStandardScheme extends StandardScheme<GlobalStreamId> { - public void read(org.apache.thrift.protocol.TProtocol iprot, GlobalStreamId struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, GlobalStreamId struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -441,7 +441,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -470,14 +470,14 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G private static class GlobalStreamIdTupleScheme extends TupleScheme<GlobalStreamId> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.componentId); oprot.writeString(struct.streamId); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.componentId = iprot.readString(); struct.set_componentId_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/Grouping.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/Grouping.java b/jstorm-core/src/main/java/backtype/storm/generated/Grouping.java index bc60a06..1ef2fe3 100755 --- a/jstorm-core/src/main/java/backtype/storm/generated/Grouping.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/Grouping.java @@ -284,7 +284,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field } @Override - protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { + protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { @@ -396,7 +396,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field } @Override - protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws TException { switch (setField_) { case FIELDS: List<String> fields = (List<String>)value_; @@ -447,7 +447,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field } @Override - protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException { + protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws TException { _Fields setField = _Fields.findByThriftId(fieldID); if (setField != null) { switch (setField) { @@ -513,7 +513,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field } @Override - protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws TException { switch (setField_) { case FIELDS: List<String> fields = (List<String>)value_; @@ -826,7 +826,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -835,7 +835,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } }
