http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
----------------------------------------------------------------------
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
index aa828d4..a8ec8c9 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
@@ -15,42 +15,15 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.accumulo.core.client.impl.thrift;
-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", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler
(0.10.0)")
public class ThriftTest {
public interface Iface {
@@ -65,15 +38,15 @@ public class ThriftTest {
public interface AsyncIface {
- public void success(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException;
+ public void
success(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException;
- public void fails(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException;
+ public void
fails(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException;
- public void throwsError(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException;
+ public void
throwsError(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException;
}
- public static class Client extends org.apache.thrift.TServiceClient
implements Iface {
+ public static class Client extends
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
public static class Factory implements
org.apache.thrift.TServiceClientFactory<Client> {
public Factory() {}
public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -180,15 +153,15 @@ public class ThriftTest {
super(protocolFactory, clientManager, transport);
}
- public void success(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException {
+ public void
success(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException {
checkReady();
success_call method_call = new success_call(resultHandler, this,
___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class success_call extends
org.apache.thrift.async.TAsyncMethodCall {
- public success_call(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 success_call extends
org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+ public
success_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
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);
}
@@ -199,9 +172,9 @@ public class ThriftTest {
prot.writeMessageEnd();
}
- public boolean getResult() throws org.apache.thrift.TException {
+ public java.lang.Boolean getResult() throws 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);
@@ -209,15 +182,15 @@ public class ThriftTest {
}
}
- public void fails(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException {
+ public void
fails(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException {
checkReady();
fails_call method_call = new fails_call(resultHandler, this,
___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class fails_call extends
org.apache.thrift.async.TAsyncMethodCall {
- public fails_call(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 fails_call extends
org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+ public
fails_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
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);
}
@@ -228,9 +201,9 @@ public class ThriftTest {
prot.writeMessageEnd();
}
- public boolean getResult() throws org.apache.thrift.TException {
+ public java.lang.Boolean getResult() throws 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);
@@ -238,15 +211,15 @@ public class ThriftTest {
}
}
- public void throwsError(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException {
+ public void
throwsError(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
resultHandler) throws org.apache.thrift.TException {
checkReady();
throwsError_call method_call = new throwsError_call(resultHandler, this,
___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class throwsError_call extends
org.apache.thrift.async.TAsyncMethodCall {
- public throwsError_call(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 throwsError_call extends
org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+ public
throwsError_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
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);
}
@@ -257,9 +230,9 @@ public class ThriftTest {
prot.writeMessageEnd();
}
- public boolean getResult() throws ThriftSecurityException,
org.apache.thrift.TException {
+ public java.lang.Boolean getResult() throws ThriftSecurityException,
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);
@@ -270,16 +243,16 @@ public class ThriftTest {
}
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("success", new success());
processMap.put("fails", new fails());
processMap.put("throwsError", new throwsError());
@@ -356,23 +329,23 @@ public class ThriftTest {
}
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("success", new success());
processMap.put("fails", new fails());
processMap.put("throwsError", new throwsError());
return processMap;
}
- public static class success<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, success_args, Boolean> {
+ public static class success<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, success_args, java.lang.Boolean> {
public success() {
super("success");
}
@@ -381,36 +354,46 @@ public class ThriftTest {
return new success_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final
AsyncFrameBuffer fb, final int seqid) {
+ public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
getResultHandler(final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() {
+ public void onComplete(java.lang.Boolean o) {
success_result result = new success_result();
result.success = o;
result.setSuccessIsSet(true);
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;
success_result result = new success_result();
- {
+ 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.TApplicationException)e;
+ } else {
+ _LOGGER.error("Exception 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 = 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();
}
};
}
@@ -419,12 +402,12 @@ public class ThriftTest {
return false;
}
- public void start(I iface, success_args args,
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws
TException {
+ public void start(I iface, success_args args,
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler)
throws org.apache.thrift.TException {
iface.success(resultHandler);
}
}
- public static class fails<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, fails_args, Boolean> {
+ public static class fails<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, fails_args, java.lang.Boolean> {
public fails() {
super("fails");
}
@@ -433,36 +416,46 @@ public class ThriftTest {
return new fails_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final
AsyncFrameBuffer fb, final int seqid) {
+ public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
getResultHandler(final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() {
+ public void onComplete(java.lang.Boolean o) {
fails_result result = new fails_result();
result.success = o;
result.setSuccessIsSet(true);
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;
fails_result result = new fails_result();
- {
+ 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.TApplicationException)e;
+ } else {
+ _LOGGER.error("Exception 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 = 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();
}
};
}
@@ -471,12 +464,12 @@ public class ThriftTest {
return false;
}
- public void start(I iface, fails_args args,
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws
TException {
+ public void start(I iface, fails_args args,
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler)
throws org.apache.thrift.TException {
iface.fails(resultHandler);
}
}
- public static class throwsError<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, throwsError_args, Boolean> {
+ public static class throwsError<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, throwsError_args, java.lang.Boolean> {
public throwsError() {
super("throwsError");
}
@@ -485,42 +478,50 @@ public class ThriftTest {
return new throwsError_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final
AsyncFrameBuffer fb, final int seqid) {
+ public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>
getResultHandler(final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() {
+ public void onComplete(java.lang.Boolean o) {
throwsError_result result = new throwsError_result();
result.success = o;
result.setSuccessIsSet(true);
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;
throwsError_result result = new throwsError_result();
if (e instanceof ThriftSecurityException) {
- result.ex = (ThriftSecurityException) e;
- result.setExIsSet(true);
- msg = result;
- }
- else
- {
+ result.ex = (ThriftSecurityException) e;
+ result.setExIsSet(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();
}
};
}
@@ -529,7 +530,7 @@ public class ThriftTest {
return false;
}
- public void start(I iface, throwsError_args args,
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws
TException {
+ public void start(I iface, throwsError_args args,
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler)
throws org.apache.thrift.TException {
iface.throwsError(resultHandler);
}
}
@@ -540,21 +541,18 @@ public class ThriftTest {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("success_args");
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new
success_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new success_argsTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new success_argsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new success_argsTupleSchemeFactory();
/** The set of fields this struct contains, along with convenience methods
for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
- 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);
}
}
@@ -575,21 +573,21 @@ public class ThriftTest {
*/
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;
}
@@ -598,14 +596,14 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
- public static final Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap
= new java.util.EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(success_args.class,
metaDataMap);
}
@@ -626,30 +624,30 @@ public class ThriftTest {
public void clear() {
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
}
- 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) {
}
- 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 success_args)
@@ -660,15 +658,17 @@ public class ThriftTest {
public boolean equals(success_args that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
return true;
}
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -687,16 +687,16 @@ public class ThriftTest {
}
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("success_args(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new
java.lang.StringBuilder("success_args(");
boolean first = true;
sb.append(")");
@@ -716,7 +716,7 @@ public class ThriftTest {
}
}
- 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) {
@@ -724,13 +724,13 @@ public class ThriftTest {
}
}
- private static class success_argsStandardSchemeFactory implements
SchemeFactory {
+ private static class success_argsStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public success_argsStandardScheme getScheme() {
return new success_argsStandardScheme();
}
}
- private static class success_argsStandardScheme extends
StandardScheme<success_args> {
+ private static class success_argsStandardScheme extends
org.apache.thrift.scheme.StandardScheme<success_args> {
public void read(org.apache.thrift.protocol.TProtocol iprot,
success_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -763,25 +763,28 @@ public class ThriftTest {
}
- private static class success_argsTupleSchemeFactory implements
SchemeFactory {
+ private static class success_argsTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public success_argsTupleScheme getScheme() {
return new success_argsTupleScheme();
}
}
- private static class success_argsTupleScheme extends
TupleScheme<success_args> {
+ private static class success_argsTupleScheme extends
org.apache.thrift.scheme.TupleScheme<success_args> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot,
success_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, success_args
struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
}
+ 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 success_result implements
org.apache.thrift.TBase<success_result, success_result._Fields>,
java.io.Serializable, Cloneable, Comparable<success_result> {
@@ -789,11 +792,8 @@ public class ThriftTest {
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC
= new org.apache.thrift.protocol.TField("success",
org.apache.thrift.protocol.TType.BOOL, (short)0);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new
success_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new success_resultTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new success_resultStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new success_resultTupleSchemeFactory();
public boolean success; // required
@@ -801,10 +801,10 @@ public class ThriftTest {
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
- 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);
}
}
@@ -827,21 +827,21 @@ public class ThriftTest {
*/
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;
}
@@ -850,7 +850,7 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -858,12 +858,12 @@ public class ThriftTest {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- 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.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(success_result.class,
metaDataMap);
}
@@ -907,55 +907,55 @@ public class ThriftTest {
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and
false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield,
__SUCCESS_ISSET_ID, value);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID,
value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SUCCESS:
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((java.lang.Boolean)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
return isSuccess();
}
- 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 SUCCESS:
return isSetSuccess();
}
- 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 success_result)
@@ -966,6 +966,8 @@ public class ThriftTest {
public boolean equals(success_result that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_success = true;
boolean that_present_success = true;
@@ -981,14 +983,11 @@ public class ThriftTest {
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_success = true;
- list.add(present_success);
- if (present_success)
- list.add(success);
+ hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -999,7 +998,7 @@ public class ThriftTest {
int lastComparison = 0;
- lastComparison =
Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ lastComparison =
java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1017,16 +1016,16 @@ public class ThriftTest {
}
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("success_result(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new
java.lang.StringBuilder("success_result(");
boolean first = true;
sb.append("success:");
@@ -1049,7 +1048,7 @@ public class ThriftTest {
}
}
- private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, java.lang.ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
@@ -1059,13 +1058,13 @@ public class ThriftTest {
}
}
- private static class success_resultStandardSchemeFactory implements
SchemeFactory {
+ private static class success_resultStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public success_resultStandardScheme getScheme() {
return new success_resultStandardScheme();
}
}
- private static class success_resultStandardScheme extends
StandardScheme<success_result> {
+ private static class success_resultStandardScheme extends
org.apache.thrift.scheme.StandardScheme<success_result> {
public void read(org.apache.thrift.protocol.TProtocol iprot,
success_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1111,18 +1110,18 @@ public class ThriftTest {
}
- private static class success_resultTupleSchemeFactory implements
SchemeFactory {
+ private static class success_resultTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public success_resultTupleScheme getScheme() {
return new success_resultTupleScheme();
}
}
- private static class success_resultTupleScheme extends
TupleScheme<success_result> {
+ private static class success_resultTupleScheme extends
org.apache.thrift.scheme.TupleScheme<success_result> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot,
success_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.isSetSuccess()) {
optionals.set(0);
}
@@ -1134,8 +1133,8 @@ public class ThriftTest {
@Override
public void read(org.apache.thrift.protocol.TProtocol prot,
success_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.success = iprot.readBool();
struct.setSuccessIsSet(true);
@@ -1143,27 +1142,27 @@ public class ThriftTest {
}
}
+ 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 fails_args implements
org.apache.thrift.TBase<fails_args, fails_args._Fields>, java.io.Serializable,
Cloneable, Comparable<fails_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("fails_args");
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new fails_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new fails_argsTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new fails_argsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new fails_argsTupleSchemeFactory();
/** The set of fields this struct contains, along with convenience methods
for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
- 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);
}
}
@@ -1184,21 +1183,21 @@ public class ThriftTest {
*/
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;
}
@@ -1207,14 +1206,14 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
- public static final Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap
= new java.util.EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fails_args.class,
metaDataMap);
}
@@ -1235,30 +1234,30 @@ public class ThriftTest {
public void clear() {
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
}
- 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) {
}
- 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 fails_args)
@@ -1269,15 +1268,17 @@ public class ThriftTest {
public boolean equals(fails_args that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
return true;
}
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -1296,16 +1297,16 @@ public class ThriftTest {
}
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("fails_args(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("fails_args(");
boolean first = true;
sb.append(")");
@@ -1325,7 +1326,7 @@ public class ThriftTest {
}
}
- 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) {
@@ -1333,13 +1334,13 @@ public class ThriftTest {
}
}
- private static class fails_argsStandardSchemeFactory implements
SchemeFactory {
+ private static class fails_argsStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public fails_argsStandardScheme getScheme() {
return new fails_argsStandardScheme();
}
}
- private static class fails_argsStandardScheme extends
StandardScheme<fails_args> {
+ private static class fails_argsStandardScheme extends
org.apache.thrift.scheme.StandardScheme<fails_args> {
public void read(org.apache.thrift.protocol.TProtocol iprot, fails_args
struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1372,25 +1373,28 @@ public class ThriftTest {
}
- private static class fails_argsTupleSchemeFactory implements SchemeFactory
{
+ private static class fails_argsTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public fails_argsTupleScheme getScheme() {
return new fails_argsTupleScheme();
}
}
- private static class fails_argsTupleScheme extends TupleScheme<fails_args>
{
+ private static class fails_argsTupleScheme extends
org.apache.thrift.scheme.TupleScheme<fails_args> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, fails_args
struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, fails_args
struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
}
+ 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 fails_result implements
org.apache.thrift.TBase<fails_result, fails_result._Fields>,
java.io.Serializable, Cloneable, Comparable<fails_result> {
@@ -1398,11 +1402,8 @@ public class ThriftTest {
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC
= new org.apache.thrift.protocol.TField("success",
org.apache.thrift.protocol.TType.BOOL, (short)0);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new
fails_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new fails_resultTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new fails_resultStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new fails_resultTupleSchemeFactory();
public boolean success; // required
@@ -1410,10 +1411,10 @@ public class ThriftTest {
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
- 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);
}
}
@@ -1436,21 +1437,21 @@ public class ThriftTest {
*/
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;
}
@@ -1459,7 +1460,7 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -1467,12 +1468,12 @@ public class ThriftTest {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- 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.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fails_result.class,
metaDataMap);
}
@@ -1516,55 +1517,55 @@ public class ThriftTest {
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and
false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield,
__SUCCESS_ISSET_ID, value);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID,
value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SUCCESS:
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((java.lang.Boolean)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
return isSuccess();
}
- 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 SUCCESS:
return isSetSuccess();
}
- 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 fails_result)
@@ -1575,6 +1576,8 @@ public class ThriftTest {
public boolean equals(fails_result that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_success = true;
boolean that_present_success = true;
@@ -1590,14 +1593,11 @@ public class ThriftTest {
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_success = true;
- list.add(present_success);
- if (present_success)
- list.add(success);
+ hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -1608,7 +1608,7 @@ public class ThriftTest {
int lastComparison = 0;
- lastComparison =
Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ lastComparison =
java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1626,16 +1626,16 @@ public class ThriftTest {
}
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("fails_result(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new
java.lang.StringBuilder("fails_result(");
boolean first = true;
sb.append("success:");
@@ -1658,7 +1658,7 @@ public class ThriftTest {
}
}
- private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, java.lang.ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
@@ -1668,13 +1668,13 @@ public class ThriftTest {
}
}
- private static class fails_resultStandardSchemeFactory implements
SchemeFactory {
+ private static class fails_resultStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public fails_resultStandardScheme getScheme() {
return new fails_resultStandardScheme();
}
}
- private static class fails_resultStandardScheme extends
StandardScheme<fails_result> {
+ private static class fails_resultStandardScheme extends
org.apache.thrift.scheme.StandardScheme<fails_result> {
public void read(org.apache.thrift.protocol.TProtocol iprot,
fails_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1720,18 +1720,18 @@ public class ThriftTest {
}
- private static class fails_resultTupleSchemeFactory implements
SchemeFactory {
+ private static class fails_resultTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public fails_resultTupleScheme getScheme() {
return new fails_resultTupleScheme();
}
}
- private static class fails_resultTupleScheme extends
TupleScheme<fails_result> {
+ private static class fails_resultTupleScheme extends
org.apache.thrift.scheme.TupleScheme<fails_result> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot,
fails_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.isSetSuccess()) {
optionals.set(0);
}
@@ -1743,8 +1743,8 @@ public class ThriftTest {
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, fails_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.success = iprot.readBool();
struct.setSuccessIsSet(true);
@@ -1752,27 +1752,27 @@ public class ThriftTest {
}
}
+ 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 throwsError_args implements
org.apache.thrift.TBase<throwsError_args, throwsError_args._Fields>,
java.io.Serializable, Cloneable, Comparable<throwsError_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("throwsError_args");
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new
throwsError_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new throwsError_argsTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new throwsError_argsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new throwsError_argsTupleSchemeFactory();
/** The set of fields this struct contains, along with convenience methods
for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
- 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);
}
}
@@ -1793,21 +1793,21 @@ public class ThriftTest {
*/
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;
}
@@ -1816,14 +1816,14 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
- public static final Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap
= new java.util.EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(throwsError_args.class,
metaDataMap);
}
@@ -1844,30 +1844,30 @@ public class ThriftTest {
public void clear() {
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
}
- 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) {
}
- 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 throwsError_args)
@@ -1878,15 +1878,17 @@ public class ThriftTest {
public boolean equals(throwsError_args that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
return true;
}
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -1905,16 +1907,16 @@ public class ThriftTest {
}
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("throwsError_args(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new
java.lang.StringBuilder("throwsError_args(");
boolean first = true;
sb.append(")");
@@ -1934,7 +1936,7 @@ public class ThriftTest {
}
}
- 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) {
@@ -1942,13 +1944,13 @@ public class ThriftTest {
}
}
- private static class throwsError_argsStandardSchemeFactory implements
SchemeFactory {
+ private static class throwsError_argsStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public throwsError_argsStandardScheme getScheme() {
return new throwsError_argsStandardScheme();
}
}
- private static class throwsError_argsStandardScheme extends
StandardScheme<throwsError_args> {
+ private static class throwsError_argsStandardScheme extends
org.apache.thrift.scheme.StandardScheme<throwsError_args> {
public void read(org.apache.thrift.protocol.TProtocol iprot,
throwsError_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1981,25 +1983,28 @@ public class ThriftTest {
}
- private static class throwsError_argsTupleSchemeFactory implements
SchemeFactory {
+ private static class throwsError_argsTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public throwsError_argsTupleScheme getScheme() {
return new throwsError_argsTupleScheme();
}
}
- private static class throwsError_argsTupleScheme extends
TupleScheme<throwsError_args> {
+ private static class throwsError_argsTupleScheme extends
org.apache.thrift.scheme.TupleScheme<throwsError_args> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot,
throwsError_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot,
throwsError_args struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
}
}
+ 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 throwsError_result implements
org.apache.thrift.TBase<throwsError_result, throwsError_result._Fields>,
java.io.Serializable, Cloneable, Comparable<throwsError_result> {
@@ -2008,11 +2013,8 @@ public class ThriftTest {
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC
= new org.apache.thrift.protocol.TField("success",
org.apache.thrift.protocol.TType.BOOL, (short)0);
private static final org.apache.thrift.protocol.TField EX_FIELD_DESC = new
org.apache.thrift.protocol.TField("ex",
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
throwsError_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new
throwsError_resultTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new throwsError_resultStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new throwsError_resultTupleSchemeFactory();
public boolean success; // required
public ThriftSecurityException ex; // required
@@ -2022,10 +2024,10 @@ public class ThriftTest {
SUCCESS((short)0, "success"),
EX((short)1, "ex");
- 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);
}
}
@@ -2050,21 +2052,21 @@ public class ThriftTest {
*/
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;
}
@@ -2073,7 +2075,7 @@ public class ThriftTest {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -2081,14 +2083,14 @@ public class ThriftTest {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- 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.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.EX, new
org.apache.thrift.meta_data.FieldMetaData("ex",
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,
ThriftSecurityException.class)));
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(throwsError_result.class,
metaDataMap);
}
@@ -2138,16 +2140,16 @@ public class ThriftTest {
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and
false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield,
__SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield,
__SUCCESS_ISSET_ID, value);
+ __isset_bitfield =
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID,
value);
}
public ThriftSecurityException getEx() {
@@ -2174,13 +2176,13 @@ public class ThriftTest {
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SUCCESS:
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((java.lang.Boolean)value);
}
break;
@@ -2195,7 +2197,7 @@ public class ThriftTest {
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
return isSuccess();
@@ -2204,13 +2206,13 @@ public class ThriftTest {
return getEx();
}
- 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) {
@@ -2219,11 +2221,11 @@ public class ThriftTest {
case EX:
return isSetEx();
}
- 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 throwsError_result)
@@ -2234,6 +2236,8 @@ public class ThriftTest {
public boolean equals(throwsError_result that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_success = true;
boolean that_present_success = true;
@@ -2258,19 +2262,15 @@ public class ThriftTest {
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_success = true;
- list.add(present_success);
- if (present_success)
- list.add(success);
+ hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
- boolean present_ex = true && (isSetEx());
- list.add(present_ex);
- if (present_ex)
- list.add(ex);
+ hashCode = hashCode * 8191 + ((isSetEx()) ? 131071 : 524287);
+ if (isSetEx())
+ hashCode = hashCode * 8191 + ex.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -2281,7 +2281,7 @@ public class ThriftTest {
int lastComparison = 0;
- lastComparison =
Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ lastComparison =
java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
@@ -2291,7 +2291,7 @@ public class ThriftTest {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
+ lastComparison =
java.lang.Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
if (lastComparison != 0) {
return lastComparison;
}
@@ -2309,16 +2309,16 @@ public class ThriftTest {
}
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("throwsError_result(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new
java.lang.StringBuilder("throwsError_result(");
boolean first = true;
sb.append("success:");
@@ -2349,7 +2349,7 @@ public class ThriftTest {
}
}
- private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, java.lang.ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
@@ -2359,13 +2359,13 @@ public class ThriftTest {
}
}
- private static class throwsError_resultStandardSchemeFactory implements
SchemeFactory {
+ private static class throwsError_resultStandardSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public throwsError_resultStandardScheme getScheme() {
return new throwsError_resultStandardScheme();
}
}
- private static class throwsError_resultStandardScheme extends
StandardScheme<throwsError_result> {
+ private static class throwsError_resultStandardScheme extends
org.apache.thrift.scheme.StandardScheme<throwsError_result> {
public void read(org.apache.thrift.protocol.TProtocol iprot,
throwsError_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -2425,18 +2425,18 @@ public class ThriftTest {
}
- private static class throwsError_resultTupleSchemeFactory implements
SchemeFactory {
+ private static class throwsError_resultTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
public throwsError_resultTupleScheme getScheme() {
return new throwsError_resultTupleScheme();
}
}
- private static class throwsError_resultTupleScheme extends
TupleScheme<throwsError_result> {
+ private static class throwsError_resultTupleScheme extends
org.apache.thrift.scheme.TupleScheme<throwsError_result> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot,
throwsError_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.isSetSuccess()) {
optionals.set(0);
}
@@ -2454,8 +2454,8 @@ public class ThriftTest {
@Override
public void read(org.apache.thrift.protocol.TProtocol prot,
throwsError_result struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
+ org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
struct.success = iprot.readBool();
struct.setSuccessIsSet(true);
@@ -2468,6 +2468,10 @@ public class ThriftTest {
}
}
+ 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();
+ }
}
+ private static void unusedMethod() {}
}
