http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java b/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java index 6923e60..f07f9c0 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java +++ b/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java @@ -16,42 +16,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class Supervisor { public interface Iface { @@ -68,7 +41,7 @@ public class Supervisor { * * @param id */ - public Assignment getLocalAssignmentForStorm(String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException; + public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException; /** * Send worker heartbeat to local supervisor @@ -81,11 +54,11 @@ public class Supervisor { public interface AsyncIface { - public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void getLocalAssignmentForStorm(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLocalAssignmentForStorm(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException; - public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; } @@ -132,13 +105,13 @@ public class Supervisor { return; } - public Assignment getLocalAssignmentForStorm(String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException + public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException { send_getLocalAssignmentForStorm(id); return recv_getLocalAssignmentForStorm(); } - public void send_getLocalAssignmentForStorm(String id) throws org.apache.thrift.TException + public void send_getLocalAssignmentForStorm(java.lang.String id) throws org.apache.thrift.TException { getLocalAssignmentForStorm_args args = new getLocalAssignmentForStorm_args(); args.set_id(id); @@ -202,16 +175,16 @@ public class Supervisor { super(protocolFactory, clientManager, transport); } - public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); sendSupervisorAssignments_call method_call = new sendSupervisorAssignments_call(assignments, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class sendSupervisorAssignments_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class sendSupervisorAssignments_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private SupervisorAssignments assignments; - public sendSupervisorAssignments_call(SupervisorAssignments assignments, 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 sendSupervisorAssignments_call(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.assignments = assignments; } @@ -224,26 +197,26 @@ public class Supervisor { prot.writeMessageEnd(); } - public void getResult() throws AuthorizationException, org.apache.thrift.TException { + public Void getResult() throws AuthorizationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - (new Client(prot)).recv_sendSupervisorAssignments(); + return null; } } - public void getLocalAssignmentForStorm(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLocalAssignmentForStorm(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException { checkReady(); getLocalAssignmentForStorm_call method_call = new getLocalAssignmentForStorm_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getLocalAssignmentForStorm_call extends org.apache.thrift.async.TAsyncMethodCall { - private String id; - public getLocalAssignmentForStorm_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 static class getLocalAssignmentForStorm_call extends org.apache.thrift.async.TAsyncMethodCall<Assignment> { + private java.lang.String id; + public getLocalAssignmentForStorm_call(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } @@ -258,7 +231,7 @@ public class Supervisor { public Assignment getResult() throws NotAliveException, AuthorizationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); @@ -266,16 +239,16 @@ public class Supervisor { } } - public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); sendSupervisorWorkerHeartbeat_call method_call = new sendSupervisorWorkerHeartbeat_call(heartbeat, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class sendSupervisorWorkerHeartbeat_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class sendSupervisorWorkerHeartbeat_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private SupervisorWorkerHeartbeat heartbeat; - public sendSupervisorWorkerHeartbeat_call(SupervisorWorkerHeartbeat heartbeat, 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 sendSupervisorWorkerHeartbeat_call(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.heartbeat = heartbeat; } @@ -288,29 +261,29 @@ public class Supervisor { prot.writeMessageEnd(); } - public void getResult() throws AuthorizationException, org.apache.thrift.TException { + public Void getResult() throws AuthorizationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - (new Client(prot)).recv_sendSupervisorWorkerHeartbeat(); + return null; } } } public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor { - private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { - super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>())); + super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>())); } - protected Processor(I iface, Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) { + protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) { super(iface, getProcessMap(processMap)); } - private static <I extends Iface> Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) { + private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) { processMap.put("sendSupervisorAssignments", new sendSupervisorAssignments()); processMap.put("getLocalAssignmentForStorm", new getLocalAssignmentForStorm()); processMap.put("sendSupervisorWorkerHeartbeat", new sendSupervisorWorkerHeartbeat()); @@ -330,6 +303,11 @@ public class Supervisor { return false; } + @Override + protected boolean handleRuntimeExceptions() { + return false; + } + public sendSupervisorAssignments_result getResult(I iface, sendSupervisorAssignments_args args) throws org.apache.thrift.TException { sendSupervisorAssignments_result result = new sendSupervisorAssignments_result(); try { @@ -354,6 +332,11 @@ public class Supervisor { return false; } + @Override + protected boolean handleRuntimeExceptions() { + return false; + } + public getLocalAssignmentForStorm_result getResult(I iface, getLocalAssignmentForStorm_args args) throws org.apache.thrift.TException { getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result(); try { @@ -380,6 +363,11 @@ public class Supervisor { return false; } + @Override + protected boolean handleRuntimeExceptions() { + return false; + } + public sendSupervisorWorkerHeartbeat_result getResult(I iface, sendSupervisorWorkerHeartbeat_args args) throws org.apache.thrift.TException { sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result(); try { @@ -394,16 +382,16 @@ public class Supervisor { } public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> { - private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { - super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>())); + super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>())); } - protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { + protected AsyncProcessor(I iface, java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { super(iface, getProcessMap(processMap)); } - private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { + private static <I extends AsyncIface> java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { processMap.put("sendSupervisorAssignments", new sendSupervisorAssignments()); processMap.put("getLocalAssignmentForStorm", new getLocalAssignmentForStorm()); processMap.put("sendSupervisorWorkerHeartbeat", new sendSupervisorWorkerHeartbeat()); @@ -419,40 +407,48 @@ public class Supervisor { return new sendSupervisorAssignments_args(); } - public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback<Void>() { + return new org.apache.thrift.async.AsyncMethodCallback<Void>() { public void onComplete(Void o) { sendSupervisorAssignments_result result = new sendSupervisorAssignments_result(); try { - fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - return; - } catch (Exception e) { - LOGGER.error("Exception writing to internal frame buffer", e); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; sendSupervisorAssignments_result result = new sendSupervisorAssignments_result(); if (e instanceof AuthorizationException) { - result.aze = (AuthorizationException) e; - result.set_aze_isSet(true); - msg = result; - } - else - { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb,msg,msgType,seqid); - return; - } catch (Exception ex) { - LOGGER.error("Exception writing to internal frame buffer", ex); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -461,7 +457,7 @@ public class Supervisor { return false; } - public void start(I iface, sendSupervisorAssignments_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { + public void start(I iface, sendSupervisorAssignments_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { iface.sendSupervisorAssignments(args.assignments,resultHandler); } } @@ -475,46 +471,53 @@ public class Supervisor { return new getLocalAssignmentForStorm_args(); } - public AsyncMethodCallback<Assignment> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback<Assignment> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback<Assignment>() { + return new org.apache.thrift.async.AsyncMethodCallback<Assignment>() { public void onComplete(Assignment o) { getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result(); result.success = o; try { - fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - return; - } catch (Exception e) { - LOGGER.error("Exception writing to internal frame buffer", e); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result(); if (e instanceof NotAliveException) { - result.e = (NotAliveException) e; - result.set_e_isSet(true); - msg = result; - } - else if (e instanceof AuthorizationException) { - result.aze = (AuthorizationException) e; - result.set_aze_isSet(true); - msg = result; - } - else - { + result.e = (NotAliveException) e; + result.set_e_isSet(true); + msg = result; + } else if (e instanceof AuthorizationException) { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb,msg,msgType,seqid); - return; - } catch (Exception ex) { - LOGGER.error("Exception writing to internal frame buffer", ex); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -523,7 +526,7 @@ public class Supervisor { return false; } - public void start(I iface, getLocalAssignmentForStorm_args args, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws TException { + public void start(I iface, getLocalAssignmentForStorm_args args, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException { iface.getLocalAssignmentForStorm(args.id,resultHandler); } } @@ -537,40 +540,48 @@ public class Supervisor { return new sendSupervisorWorkerHeartbeat_args(); } - public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback<Void>() { + return new org.apache.thrift.async.AsyncMethodCallback<Void>() { public void onComplete(Void o) { sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result(); try { - fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - return; - } catch (Exception e) { - LOGGER.error("Exception writing to internal frame buffer", e); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result(); if (e instanceof AuthorizationException) { - result.aze = (AuthorizationException) e; - result.set_aze_isSet(true); - msg = result; - } - else - { + result.aze = (AuthorizationException) e; + result.set_aze_isSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb,msg,msgType,seqid); - return; - } catch (Exception ex) { - LOGGER.error("Exception writing to internal frame buffer", ex); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -579,7 +590,7 @@ public class Supervisor { return false; } - public void start(I iface, sendSupervisorWorkerHeartbeat_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { + public void start(I iface, sendSupervisorWorkerHeartbeat_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { iface.sendSupervisorWorkerHeartbeat(args.heartbeat,resultHandler); } } @@ -591,11 +602,8 @@ public class Supervisor { private static final org.apache.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("assignments", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new sendSupervisorAssignments_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new sendSupervisorAssignments_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_argsTupleSchemeFactory(); private SupervisorAssignments assignments; // required @@ -603,10 +611,10 @@ public class Supervisor { public enum _Fields implements org.apache.thrift.TFieldIdEnum { ASSIGNMENTS((short)1, "assignments"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -629,21 +637,21 @@ public class Supervisor { */ 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; } @@ -652,18 +660,18 @@ public class Supervisor { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.ASSIGNMENTS, new org.apache.thrift.meta_data.FieldMetaData("assignments", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SupervisorAssignments.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_args.class, metaDataMap); } @@ -718,7 +726,7 @@ public class Supervisor { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case ASSIGNMENTS: if (value == null) { @@ -731,30 +739,30 @@ public class Supervisor { } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case ASSIGNMENTS: return get_assignments(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case ASSIGNMENTS: return is_set_assignments(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof sendSupervisorAssignments_args) @@ -765,6 +773,8 @@ public class Supervisor { public boolean equals(sendSupervisorAssignments_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_assignments = true && this.is_set_assignments(); boolean that_present_assignments = true && that.is_set_assignments(); @@ -780,14 +790,13 @@ public class Supervisor { @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_assignments = true && (is_set_assignments()); - list.add(present_assignments); - if (present_assignments) - list.add(assignments); + hashCode = hashCode * 8191 + ((is_set_assignments()) ? 131071 : 524287); + if (is_set_assignments()) + hashCode = hashCode * 8191 + assignments.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -798,7 +807,7 @@ public class Supervisor { int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments()); + lastComparison = java.lang.Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments()); if (lastComparison != 0) { return lastComparison; } @@ -816,16 +825,16 @@ public class Supervisor { } 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("sendSupervisorAssignments_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("sendSupervisorAssignments_args("); boolean first = true; sb.append("assignments:"); @@ -855,7 +864,7 @@ public class Supervisor { } } - 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) { @@ -863,13 +872,13 @@ public class Supervisor { } } - private static class sendSupervisorAssignments_argsStandardSchemeFactory implements SchemeFactory { + private static class sendSupervisorAssignments_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorAssignments_argsStandardScheme getScheme() { return new sendSupervisorAssignments_argsStandardScheme(); } } - private static class sendSupervisorAssignments_argsStandardScheme extends StandardScheme<sendSupervisorAssignments_args> { + private static class sendSupervisorAssignments_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<sendSupervisorAssignments_args> { public void read(org.apache.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -914,18 +923,18 @@ public class Supervisor { } - private static class sendSupervisorAssignments_argsTupleSchemeFactory implements SchemeFactory { + private static class sendSupervisorAssignments_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorAssignments_argsTupleScheme getScheme() { return new sendSupervisorAssignments_argsTupleScheme(); } } - private static class sendSupervisorAssignments_argsTupleScheme extends TupleScheme<sendSupervisorAssignments_args> { + private static class sendSupervisorAssignments_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<sendSupervisorAssignments_args> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_assignments()) { optionals.set(0); } @@ -937,8 +946,8 @@ public class Supervisor { @Override public void read(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.assignments = new SupervisorAssignments(); struct.assignments.read(iprot); @@ -947,6 +956,9 @@ public class Supervisor { } } + 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(); + } } public static class sendSupervisorAssignments_result implements org.apache.thrift.TBase<sendSupervisorAssignments_result, sendSupervisorAssignments_result._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorAssignments_result> { @@ -954,11 +966,8 @@ public class Supervisor { 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 { - schemes.put(StandardScheme.class, new sendSupervisorAssignments_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new sendSupervisorAssignments_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_resultTupleSchemeFactory(); private AuthorizationException aze; // required @@ -966,10 +975,10 @@ public class Supervisor { public enum _Fields implements org.apache.thrift.TFieldIdEnum { AZE((short)1, "aze"); - 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); } } @@ -992,21 +1001,21 @@ public class Supervisor { */ 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; } @@ -1015,18 +1024,18 @@ public class Supervisor { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_result.class, metaDataMap); } @@ -1081,7 +1090,7 @@ public class Supervisor { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case AZE: if (value == null) { @@ -1094,30 +1103,30 @@ public class Supervisor { } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case AZE: return get_aze(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case AZE: return is_set_aze(); } - 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 sendSupervisorAssignments_result) @@ -1128,6 +1137,8 @@ public class Supervisor { public boolean equals(sendSupervisorAssignments_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_aze = true && this.is_set_aze(); boolean that_present_aze = true && that.is_set_aze(); @@ -1143,14 +1154,13 @@ public class Supervisor { @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_aze = true && (is_set_aze()); - list.add(present_aze); - if (present_aze) - list.add(aze); + hashCode = hashCode * 8191 + ((is_set_aze()) ? 131071 : 524287); + if (is_set_aze()) + hashCode = hashCode * 8191 + aze.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -1161,7 +1171,7 @@ public class Supervisor { int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); + lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); if (lastComparison != 0) { return lastComparison; } @@ -1179,16 +1189,16 @@ public class Supervisor { } 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("sendSupervisorAssignments_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("sendSupervisorAssignments_result("); boolean first = true; sb.append("aze:"); @@ -1215,7 +1225,7 @@ public class Supervisor { } } - 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) { @@ -1223,13 +1233,13 @@ public class Supervisor { } } - private static class sendSupervisorAssignments_resultStandardSchemeFactory implements SchemeFactory { + private static class sendSupervisorAssignments_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorAssignments_resultStandardScheme getScheme() { return new sendSupervisorAssignments_resultStandardScheme(); } } - private static class sendSupervisorAssignments_resultStandardScheme extends StandardScheme<sendSupervisorAssignments_result> { + private static class sendSupervisorAssignments_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<sendSupervisorAssignments_result> { public void read(org.apache.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1274,18 +1284,18 @@ public class Supervisor { } - private static class sendSupervisorAssignments_resultTupleSchemeFactory implements SchemeFactory { + private static class sendSupervisorAssignments_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorAssignments_resultTupleScheme getScheme() { return new sendSupervisorAssignments_resultTupleScheme(); } } - private static class sendSupervisorAssignments_resultTupleScheme extends TupleScheme<sendSupervisorAssignments_result> { + private static class sendSupervisorAssignments_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<sendSupervisorAssignments_result> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_aze()) { optionals.set(0); } @@ -1297,8 +1307,8 @@ public class Supervisor { @Override public void read(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.aze = new AuthorizationException(); struct.aze.read(iprot); @@ -1307,6 +1317,9 @@ public class Supervisor { } } + 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(); + } } public static class getLocalAssignmentForStorm_args implements org.apache.thrift.TBase<getLocalAssignmentForStorm_args, getLocalAssignmentForStorm_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_args> { @@ -1314,22 +1327,19 @@ public class Supervisor { private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getLocalAssignmentForStorm_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getLocalAssignmentForStorm_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsTupleSchemeFactory(); - private String id; // required + private java.lang.String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1352,21 +1362,21 @@ public class Supervisor { */ 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; } @@ -1375,18 +1385,18 @@ public class Supervisor { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 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(getLocalAssignmentForStorm_args.class, metaDataMap); } @@ -1394,7 +1404,7 @@ public class Supervisor { } public getLocalAssignmentForStorm_args( - String id) + java.lang.String id) { this(); this.id = id; @@ -1418,11 +1428,11 @@ public class Supervisor { this.id = null; } - public String get_id() { + public java.lang.String get_id() { return this.id; } - public void set_id(String id) { + public void set_id(java.lang.String id) { this.id = id; } @@ -1441,43 +1451,43 @@ public class Supervisor { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case ID: if (value == null) { unset_id(); } else { - set_id((String)value); + set_id((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case ID: return get_id(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case ID: return is_set_id(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof getLocalAssignmentForStorm_args) @@ -1488,6 +1498,8 @@ public class Supervisor { public boolean equals(getLocalAssignmentForStorm_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_id = true && this.is_set_id(); boolean that_present_id = true && that.is_set_id(); @@ -1503,14 +1515,13 @@ public class Supervisor { @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_id = true && (is_set_id()); - list.add(present_id); - if (present_id) - list.add(id); + hashCode = hashCode * 8191 + ((is_set_id()) ? 131071 : 524287); + if (is_set_id()) + hashCode = hashCode * 8191 + id.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -1521,7 +1532,7 @@ public class Supervisor { int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_id()).compareTo(other.is_set_id()); if (lastComparison != 0) { return lastComparison; } @@ -1539,16 +1550,16 @@ public class Supervisor { } 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("getLocalAssignmentForStorm_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getLocalAssignmentForStorm_args("); boolean first = true; sb.append("id:"); @@ -1575,7 +1586,7 @@ public class Supervisor { } } - 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) { @@ -1583,13 +1594,13 @@ public class Supervisor { } } - private static class getLocalAssignmentForStorm_argsStandardSchemeFactory implements SchemeFactory { + private static class getLocalAssignmentForStorm_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getLocalAssignmentForStorm_argsStandardScheme getScheme() { return new getLocalAssignmentForStorm_argsStandardScheme(); } } - private static class getLocalAssignmentForStorm_argsStandardScheme extends StandardScheme<getLocalAssignmentForStorm_args> { + private static class getLocalAssignmentForStorm_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_args> { public void read(org.apache.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1633,18 +1644,18 @@ public class Supervisor { } - private static class getLocalAssignmentForStorm_argsTupleSchemeFactory implements SchemeFactory { + private static class getLocalAssignmentForStorm_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getLocalAssignmentForStorm_argsTupleScheme getScheme() { return new getLocalAssignmentForStorm_argsTupleScheme(); } } - private static class getLocalAssignmentForStorm_argsTupleScheme extends TupleScheme<getLocalAssignmentForStorm_args> { + private static class getLocalAssignmentForStorm_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLocalAssignmentForStorm_args> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_id()) { optionals.set(0); } @@ -1656,8 +1667,8 @@ public class Supervisor { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.id = iprot.readString(); struct.set_id_isSet(true); @@ -1665,6 +1676,9 @@ public class Supervisor { } } + 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(); + } } public static class getLocalAssignmentForStorm_result implements org.apache.thrift.TBase<getLocalAssignmentForStorm_result, getLocalAssignmentForStorm_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_result> { @@ -1674,11 +1688,8 @@ public class Supervisor { private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); 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)2); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getLocalAssignmentForStorm_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getLocalAssignmentForStorm_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultTupleSchemeFactory(); private Assignment success; // required private NotAliveException e; // required @@ -1690,10 +1701,10 @@ public class Supervisor { E((short)1, "e"), AZE((short)2, "aze"); - 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); } } @@ -1720,21 +1731,21 @@ public class Supervisor { */ 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; } @@ -1743,22 +1754,22 @@ public class Supervisor { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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, Assignment.class))); tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NotAliveException.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); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocalAssignmentForStorm_result.class, metaDataMap); } @@ -1871,7 +1882,7 @@ public class Supervisor { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -1900,7 +1911,7 @@ public class Supervisor { } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return get_success(); @@ -1912,13 +1923,13 @@ public class Supervisor { return get_aze(); } - 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) { @@ -1929,11 +1940,11 @@ public class Supervisor { case AZE: return is_set_aze(); } - 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 getLocalAssignmentForStorm_result) @@ -1944,6 +1955,8 @@ public class Supervisor { public boolean equals(getLocalAssignmentForStorm_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.is_set_success(); boolean that_present_success = true && that.is_set_success(); @@ -1977,24 +1990,21 @@ public class Supervisor { @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_success = true && (is_set_success()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((is_set_success()) ? 131071 : 524287); + if (is_set_success()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_e = true && (is_set_e()); - list.add(present_e); - if (present_e) - list.add(e); + hashCode = hashCode * 8191 + ((is_set_e()) ? 131071 : 524287); + if (is_set_e()) + hashCode = hashCode * 8191 + e.hashCode(); - boolean present_aze = true && (is_set_aze()); - list.add(present_aze); - if (present_aze) - list.add(aze); + hashCode = hashCode * 8191 + ((is_set_aze()) ? 131071 : 524287); + if (is_set_aze()) + hashCode = hashCode * 8191 + aze.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -2005,7 +2015,7 @@ public class Supervisor { int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_success()).compareTo(other.is_set_success()); + lastComparison = java.lang.Boolean.valueOf(is_set_success()).compareTo(other.is_set_success()); if (lastComparison != 0) { return lastComparison; } @@ -2015,7 +2025,7 @@ public class Supervisor { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_e()).compareTo(other.is_set_e()); + lastComparison = java.lang.Boolean.valueOf(is_set_e()).compareTo(other.is_set_e()); if (lastComparison != 0) { return lastComparison; } @@ -2025,7 +2035,7 @@ public class Supervisor { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); + lastComparison = java.lang.Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze()); if (lastComparison != 0) { return lastComparison; } @@ -2043,16 +2053,16 @@ public class Supervisor { } 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("getLocalAssignmentForStorm_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getLocalAssignmentForStorm_result("); boolean first = true; sb.append("success:"); @@ -2098,7 +2108,7 @@ public class Supervisor { } } - 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) { @@ -2106,13 +2116,13 @@ public class Supervisor { } } - private static class getLocalAssignmentForStorm_resultStandardSchemeFactory implements SchemeFactory { + private static class getLocalAssignmentForStorm_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getLocalAssignmentForStorm_resultStandardScheme getScheme() { return new getLocalAssignmentForStorm_resultStandardScheme(); } } - private static class getLocalAssignmentForStorm_resultStandardScheme extends StandardScheme<getLocalAssignmentForStorm_result> { + private static class getLocalAssignmentForStorm_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_result> { public void read(org.apache.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -2185,18 +2195,18 @@ public class Supervisor { } - private static class getLocalAssignmentForStorm_resultTupleSchemeFactory implements SchemeFactory { + private static class getLocalAssignmentForStorm_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getLocalAssignmentForStorm_resultTupleScheme getScheme() { return new getLocalAssignmentForStorm_resultTupleScheme(); } } - private static class getLocalAssignmentForStorm_resultTupleScheme extends TupleScheme<getLocalAssignmentForStorm_result> { + private static class getLocalAssignmentForStorm_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLocalAssignmentForStorm_result> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_success()) { optionals.set(0); } @@ -2220,8 +2230,8 @@ public class Supervisor { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = new Assignment(); struct.success.read(iprot); @@ -2240,6 +2250,9 @@ public class Supervisor { } } + 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(); + } } public static class sendSupervisorWorkerHeartbeat_args implements org.apache.thrift.TBase<sendSupervisorWorkerHeartbeat_args, sendSupervisorWorkerHeartbeat_args._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorWorkerHeartbeat_args> { @@ -2247,11 +2260,8 @@ public class Supervisor { private static final org.apache.thrift.protocol.TField HEARTBEAT_FIELD_DESC = new org.apache.thrift.protocol.TField("heartbeat", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new sendSupervisorWorkerHeartbeat_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new sendSupervisorWorkerHeartbeat_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorWorkerHeartbeat_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorWorkerHeartbeat_argsTupleSchemeFactory(); private SupervisorWorkerHeartbeat heartbeat; // required @@ -2259,10 +2269,10 @@ public class Supervisor { public enum _Fields implements org.apache.thrift.TFieldIdEnum { HEARTBEAT((short)1, "heartbeat"); - 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); } } @@ -2285,21 +2295,21 @@ public class Supervisor { */ 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; } @@ -2308,18 +2318,18 @@ public class Supervisor { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.HEARTBEAT, new org.apache.thrift.meta_data.FieldMetaData("heartbeat", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SupervisorWorkerHeartbeat.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorWorkerHeartbeat_args.class, metaDataMap); } @@ -2374,7 +2384,7 @@ public class Supervisor { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case HEARTBEAT: if (value == null) { @@ -2387,30 +2397,30 @@ public class Supervisor { } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case HEARTBEAT: return get_heartbeat(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case HEARTBEAT: return is_set_heartbeat(); } - 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 sendSupervisorWorkerHeartbeat_args) @@ -2421,6 +2431,8 @@ public class Supervisor { public boolean equals(sendSupervisorWorkerHeartbeat_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_heartbeat = true && this.is_set_heartbeat(); boolean that_present_heartbeat = true && that.is_set_heartbeat(); @@ -2436,14 +2448,13 @@ public class Supervisor { @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_heartbeat = true && (is_set_heartbeat()); - list.add(present_heartbeat); - if (present_heartbeat) - list.add(heartbeat); + hashCode = hashCode * 8191 + ((is_set_heartbeat()) ? 131071 : 524287); + if (is_set_heartbeat()) + hashCode = hashCode * 8191 + heartbeat.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -2454,7 +2465,7 @@ public class Supervisor { int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_heartbeat()).compareTo(other.is_set_heartbeat()); + lastComparison = java.lang.Boolean.valueOf(is_set_heartbeat()).compareTo(other.is_set_heartbeat()); if (lastComparison != 0) { return lastComparison; } @@ -2472,16 +2483,16 @@ public class Supervisor { } 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("sendSupervisorWorkerHeartbeat_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("sendSupervisorWorkerHeartbeat_args("); boolean first = true; sb.append("heartbeat:"); @@ -2511,7 +2522,7 @@ public class Supervisor { } } - 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) { @@ -2519,13 +2530,13 @@ public class Supervisor { } } - private static class sendSupervisorWorkerHeartbeat_argsStandardSchemeFactory implements SchemeFactory { + private static class sendSupervisorWorkerHeartbeat_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorWorkerHeartbeat_argsStandardScheme getScheme() { return new sendSupervisorWorkerHeartbeat_argsStandardScheme(); } } - private static class sendSupervisorWorkerHeartbeat_argsStandardScheme extends StandardScheme<sendSupervisorWorkerHeartbeat_args> { + private static class sendSupervisorWorkerHeartbeat_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<sendSupervisorWorkerHeartbeat_args> { public void read(org.apache.thrift.protocol.TProtocol iprot, sendSupervisorWorkerHeartbeat_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -2570,18 +2581,18 @@ public class Supervisor { } - private static class sendSupervisorWorkerHeartbeat_argsTupleSchemeFactory implements SchemeFactory { + private static class sendSupervisorWorkerHeartbeat_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public sendSupervisorWorkerHeartbeat_argsTupleScheme getScheme() { return new sendSupervisorWorkerHeartbeat_argsTupleScheme(); } } - private static class sendSupervisorWorkerHeartbeat_argsTupleScheme extends TupleScheme<sendSupervisorWorkerHeartbeat_args> { + private static class sendSupervisorWorkerHeartbeat_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<sendSupervisorWorkerHeartbeat_args> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, sendSupervisorWorkerHeartbeat_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_heartbeat()) { optionals.set(0); } @@ -2593,8 +2604,8 @@ public class Supervisor { @Override public void read(org.apache.thrift.protocol.TProtocol prot, sendSupervisorWorkerHeartbeat_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.heartbeat = new SupervisorWorkerHeartbeat(); struct.heartbeat.read(iprot); @@ -2603,6 +2614,9 @@ public class Supervisor { } } + 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(); + } } public static class sendSupervisorWorkerHeartbeat_result implements org.apache.thrift.TBase<sendSupervisorWorkerHeartbeat_result, sendSupervisorWorkerHeartbeat_result._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorWorkerHeartbeat_result> { @@ -2610,11 +2624,8 @@ public class Supervisor { private stat
<TRUNCATED>
