http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java index db1a380..a8148d2 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java @@ -15,63 +15,33 @@ * 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.proxy.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)") -public class NamespaceExistsException extends TException implements org.apache.thrift.TBase<NamespaceExistsException, NamespaceExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceExistsException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class NamespaceExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceExistsException, NamespaceExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceExistsException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceExistsException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 NamespaceExistsExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new NamespaceExistsExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NamespaceExistsExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NamespaceExistsExceptionTupleSchemeFactory(); - public String msg; // required + public java.lang.String msg; // 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 { MSG((short)1, "msg"); - 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); } } @@ -94,21 +64,21 @@ public class NamespaceExistsException extends TException implements org.apache.t */ 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; } @@ -117,18 +87,18 @@ public class NamespaceExistsException extends TException implements org.apache.t 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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(NamespaceExistsException.class, metaDataMap); } @@ -136,7 +106,7 @@ public class NamespaceExistsException extends TException implements org.apache.t } public NamespaceExistsException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -160,11 +130,11 @@ public class NamespaceExistsException extends TException implements org.apache.t this.msg = null; } - public String getMsg() { + public java.lang.String getMsg() { return this.msg; } - public NamespaceExistsException setMsg(String msg) { + public NamespaceExistsException setMsg(java.lang.String msg) { this.msg = msg; return this; } @@ -184,43 +154,43 @@ public class NamespaceExistsException extends TException implements org.apache.t } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case MSG: if (value == null) { unsetMsg(); } else { - setMsg((String)value); + setMsg((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case MSG: return getMsg(); } - 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 MSG: return isSetMsg(); } - 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 NamespaceExistsException) @@ -231,6 +201,8 @@ public class NamespaceExistsException extends TException implements org.apache.t public boolean equals(NamespaceExistsException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_msg = true && this.isSetMsg(); boolean that_present_msg = true && that.isSetMsg(); @@ -246,14 +218,13 @@ public class NamespaceExistsException extends TException implements org.apache.t @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_msg = true && (isSetMsg()); - list.add(present_msg); - if (present_msg) - list.add(msg); + hashCode = hashCode * 8191 + ((isSetMsg()) ? 131071 : 524287); + if (isSetMsg()) + hashCode = hashCode * 8191 + msg.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class NamespaceExistsException extends TException implements org.apache.t int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); + lastComparison = java.lang.Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class NamespaceExistsException extends TException implements org.apache.t } 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("NamespaceExistsException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("NamespaceExistsException("); boolean first = true; sb.append("msg:"); @@ -318,7 +289,7 @@ public class NamespaceExistsException extends TException implements org.apache.t } } - 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) { @@ -326,13 +297,13 @@ public class NamespaceExistsException extends TException implements org.apache.t } } - private static class NamespaceExistsExceptionStandardSchemeFactory implements SchemeFactory { + private static class NamespaceExistsExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceExistsExceptionStandardScheme getScheme() { return new NamespaceExistsExceptionStandardScheme(); } } - private static class NamespaceExistsExceptionStandardScheme extends StandardScheme<NamespaceExistsException> { + private static class NamespaceExistsExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NamespaceExistsException> { public void read(org.apache.thrift.protocol.TProtocol iprot, NamespaceExistsException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -378,18 +349,18 @@ public class NamespaceExistsException extends TException implements org.apache.t } - private static class NamespaceExistsExceptionTupleSchemeFactory implements SchemeFactory { + private static class NamespaceExistsExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceExistsExceptionTupleScheme getScheme() { return new NamespaceExistsExceptionTupleScheme(); } } - private static class NamespaceExistsExceptionTupleScheme extends TupleScheme<NamespaceExistsException> { + private static class NamespaceExistsExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<NamespaceExistsException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, NamespaceExistsException 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.isSetMsg()) { optionals.set(0); } @@ -401,8 +372,8 @@ public class NamespaceExistsException extends TException implements org.apache.t @Override public void read(org.apache.thrift.protocol.TProtocol prot, NamespaceExistsException 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.msg = iprot.readString(); struct.setMsgIsSet(true); @@ -410,5 +381,9 @@ public class NamespaceExistsException extends TException implements org.apache.t } } + 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() {} }
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java index f22320e..1927347 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java @@ -15,63 +15,33 @@ * 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.proxy.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)") -public class NamespaceNotEmptyException extends TException implements org.apache.thrift.TBase<NamespaceNotEmptyException, NamespaceNotEmptyException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotEmptyException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class NamespaceNotEmptyException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotEmptyException, NamespaceNotEmptyException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotEmptyException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotEmptyException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 NamespaceNotEmptyExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new NamespaceNotEmptyExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NamespaceNotEmptyExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NamespaceNotEmptyExceptionTupleSchemeFactory(); - public String msg; // required + public java.lang.String msg; // 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 { MSG((short)1, "msg"); - 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); } } @@ -94,21 +64,21 @@ public class NamespaceNotEmptyException extends TException implements org.apache */ 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; } @@ -117,18 +87,18 @@ public class NamespaceNotEmptyException extends TException implements org.apache 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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(NamespaceNotEmptyException.class, metaDataMap); } @@ -136,7 +106,7 @@ public class NamespaceNotEmptyException extends TException implements org.apache } public NamespaceNotEmptyException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -160,11 +130,11 @@ public class NamespaceNotEmptyException extends TException implements org.apache this.msg = null; } - public String getMsg() { + public java.lang.String getMsg() { return this.msg; } - public NamespaceNotEmptyException setMsg(String msg) { + public NamespaceNotEmptyException setMsg(java.lang.String msg) { this.msg = msg; return this; } @@ -184,43 +154,43 @@ public class NamespaceNotEmptyException extends TException implements org.apache } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case MSG: if (value == null) { unsetMsg(); } else { - setMsg((String)value); + setMsg((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case MSG: return getMsg(); } - 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 MSG: return isSetMsg(); } - 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 NamespaceNotEmptyException) @@ -231,6 +201,8 @@ public class NamespaceNotEmptyException extends TException implements org.apache public boolean equals(NamespaceNotEmptyException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_msg = true && this.isSetMsg(); boolean that_present_msg = true && that.isSetMsg(); @@ -246,14 +218,13 @@ public class NamespaceNotEmptyException extends TException implements org.apache @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_msg = true && (isSetMsg()); - list.add(present_msg); - if (present_msg) - list.add(msg); + hashCode = hashCode * 8191 + ((isSetMsg()) ? 131071 : 524287); + if (isSetMsg()) + hashCode = hashCode * 8191 + msg.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class NamespaceNotEmptyException extends TException implements org.apache int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); + lastComparison = java.lang.Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class NamespaceNotEmptyException extends TException implements org.apache } 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("NamespaceNotEmptyException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("NamespaceNotEmptyException("); boolean first = true; sb.append("msg:"); @@ -318,7 +289,7 @@ public class NamespaceNotEmptyException extends TException implements org.apache } } - 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) { @@ -326,13 +297,13 @@ public class NamespaceNotEmptyException extends TException implements org.apache } } - private static class NamespaceNotEmptyExceptionStandardSchemeFactory implements SchemeFactory { + private static class NamespaceNotEmptyExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceNotEmptyExceptionStandardScheme getScheme() { return new NamespaceNotEmptyExceptionStandardScheme(); } } - private static class NamespaceNotEmptyExceptionStandardScheme extends StandardScheme<NamespaceNotEmptyException> { + private static class NamespaceNotEmptyExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NamespaceNotEmptyException> { public void read(org.apache.thrift.protocol.TProtocol iprot, NamespaceNotEmptyException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -378,18 +349,18 @@ public class NamespaceNotEmptyException extends TException implements org.apache } - private static class NamespaceNotEmptyExceptionTupleSchemeFactory implements SchemeFactory { + private static class NamespaceNotEmptyExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceNotEmptyExceptionTupleScheme getScheme() { return new NamespaceNotEmptyExceptionTupleScheme(); } } - private static class NamespaceNotEmptyExceptionTupleScheme extends TupleScheme<NamespaceNotEmptyException> { + private static class NamespaceNotEmptyExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<NamespaceNotEmptyException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, NamespaceNotEmptyException 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.isSetMsg()) { optionals.set(0); } @@ -401,8 +372,8 @@ public class NamespaceNotEmptyException extends TException implements org.apache @Override public void read(org.apache.thrift.protocol.TProtocol prot, NamespaceNotEmptyException 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.msg = iprot.readString(); struct.setMsgIsSet(true); @@ -410,5 +381,9 @@ public class NamespaceNotEmptyException extends TException implements org.apache } } + 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() {} } http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java index 9e31e48..894e0afb 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java @@ -15,63 +15,33 @@ * 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.proxy.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)") -public class NamespaceNotFoundException extends TException implements org.apache.thrift.TBase<NamespaceNotFoundException, NamespaceNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotFoundException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class NamespaceNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotFoundException, NamespaceNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotFoundException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 NamespaceNotFoundExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new NamespaceNotFoundExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NamespaceNotFoundExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NamespaceNotFoundExceptionTupleSchemeFactory(); - public String msg; // required + public java.lang.String msg; // 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 { MSG((short)1, "msg"); - 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); } } @@ -94,21 +64,21 @@ public class NamespaceNotFoundException extends TException implements org.apache */ 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; } @@ -117,18 +87,18 @@ public class NamespaceNotFoundException extends TException implements org.apache 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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(NamespaceNotFoundException.class, metaDataMap); } @@ -136,7 +106,7 @@ public class NamespaceNotFoundException extends TException implements org.apache } public NamespaceNotFoundException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -160,11 +130,11 @@ public class NamespaceNotFoundException extends TException implements org.apache this.msg = null; } - public String getMsg() { + public java.lang.String getMsg() { return this.msg; } - public NamespaceNotFoundException setMsg(String msg) { + public NamespaceNotFoundException setMsg(java.lang.String msg) { this.msg = msg; return this; } @@ -184,43 +154,43 @@ public class NamespaceNotFoundException extends TException implements org.apache } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case MSG: if (value == null) { unsetMsg(); } else { - setMsg((String)value); + setMsg((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case MSG: return getMsg(); } - 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 MSG: return isSetMsg(); } - 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 NamespaceNotFoundException) @@ -231,6 +201,8 @@ public class NamespaceNotFoundException extends TException implements org.apache public boolean equals(NamespaceNotFoundException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_msg = true && this.isSetMsg(); boolean that_present_msg = true && that.isSetMsg(); @@ -246,14 +218,13 @@ public class NamespaceNotFoundException extends TException implements org.apache @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_msg = true && (isSetMsg()); - list.add(present_msg); - if (present_msg) - list.add(msg); + hashCode = hashCode * 8191 + ((isSetMsg()) ? 131071 : 524287); + if (isSetMsg()) + hashCode = hashCode * 8191 + msg.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class NamespaceNotFoundException extends TException implements org.apache int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); + lastComparison = java.lang.Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class NamespaceNotFoundException extends TException implements org.apache } 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("NamespaceNotFoundException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("NamespaceNotFoundException("); boolean first = true; sb.append("msg:"); @@ -318,7 +289,7 @@ public class NamespaceNotFoundException extends TException implements org.apache } } - 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) { @@ -326,13 +297,13 @@ public class NamespaceNotFoundException extends TException implements org.apache } } - private static class NamespaceNotFoundExceptionStandardSchemeFactory implements SchemeFactory { + private static class NamespaceNotFoundExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceNotFoundExceptionStandardScheme getScheme() { return new NamespaceNotFoundExceptionStandardScheme(); } } - private static class NamespaceNotFoundExceptionStandardScheme extends StandardScheme<NamespaceNotFoundException> { + private static class NamespaceNotFoundExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NamespaceNotFoundException> { public void read(org.apache.thrift.protocol.TProtocol iprot, NamespaceNotFoundException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -378,18 +349,18 @@ public class NamespaceNotFoundException extends TException implements org.apache } - private static class NamespaceNotFoundExceptionTupleSchemeFactory implements SchemeFactory { + private static class NamespaceNotFoundExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NamespaceNotFoundExceptionTupleScheme getScheme() { return new NamespaceNotFoundExceptionTupleScheme(); } } - private static class NamespaceNotFoundExceptionTupleScheme extends TupleScheme<NamespaceNotFoundException> { + private static class NamespaceNotFoundExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<NamespaceNotFoundException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, NamespaceNotFoundException 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.isSetMsg()) { optionals.set(0); } @@ -401,8 +372,8 @@ public class NamespaceNotFoundException extends TException implements org.apache @Override public void read(org.apache.thrift.protocol.TProtocol prot, NamespaceNotFoundException 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.msg = iprot.readString(); struct.setMsgIsSet(true); @@ -410,5 +381,9 @@ public class NamespaceNotFoundException extends TException implements org.apache } } + 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() {} } http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java index 6d790f6..9a831a4 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java @@ -15,7 +15,7 @@ * 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 @@ -23,11 +23,8 @@ package org.apache.accumulo.proxy.thrift; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; -@SuppressWarnings({"unused"}) public enum NamespacePermission implements org.apache.thrift.TEnum { +public enum NamespacePermission implements org.apache.thrift.TEnum { READ(0), WRITE(1), ALTER_NAMESPACE(2), http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java index 182277a..f28e747 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java @@ -15,63 +15,33 @@ * 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.proxy.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)") -public class NoMoreEntriesException extends TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable, Comparable<NoMoreEntriesException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class NoMoreEntriesException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable, Comparable<NoMoreEntriesException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoMoreEntriesException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 NoMoreEntriesExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new NoMoreEntriesExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NoMoreEntriesExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NoMoreEntriesExceptionTupleSchemeFactory(); - public String msg; // required + public java.lang.String msg; // 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 { MSG((short)1, "msg"); - 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); } } @@ -94,21 +64,21 @@ public class NoMoreEntriesException extends TException implements org.apache.thr */ 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; } @@ -117,18 +87,18 @@ public class NoMoreEntriesException extends TException implements org.apache.thr 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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(NoMoreEntriesException.class, metaDataMap); } @@ -136,7 +106,7 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } public NoMoreEntriesException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -160,11 +130,11 @@ public class NoMoreEntriesException extends TException implements org.apache.thr this.msg = null; } - public String getMsg() { + public java.lang.String getMsg() { return this.msg; } - public NoMoreEntriesException setMsg(String msg) { + public NoMoreEntriesException setMsg(java.lang.String msg) { this.msg = msg; return this; } @@ -184,43 +154,43 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case MSG: if (value == null) { unsetMsg(); } else { - setMsg((String)value); + setMsg((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case MSG: return getMsg(); } - 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 MSG: return isSetMsg(); } - 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 NoMoreEntriesException) @@ -231,6 +201,8 @@ public class NoMoreEntriesException extends TException implements org.apache.thr public boolean equals(NoMoreEntriesException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_msg = true && this.isSetMsg(); boolean that_present_msg = true && that.isSetMsg(); @@ -246,14 +218,13 @@ public class NoMoreEntriesException extends TException implements org.apache.thr @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_msg = true && (isSetMsg()); - list.add(present_msg); - if (present_msg) - list.add(msg); + hashCode = hashCode * 8191 + ((isSetMsg()) ? 131071 : 524287); + if (isSetMsg()) + hashCode = hashCode * 8191 + msg.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -264,7 +235,7 @@ public class NoMoreEntriesException extends TException implements org.apache.thr int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); + lastComparison = java.lang.Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } @@ -282,16 +253,16 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } 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("NoMoreEntriesException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("NoMoreEntriesException("); boolean first = true; sb.append("msg:"); @@ -318,7 +289,7 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } } - 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) { @@ -326,13 +297,13 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } } - private static class NoMoreEntriesExceptionStandardSchemeFactory implements SchemeFactory { + private static class NoMoreEntriesExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NoMoreEntriesExceptionStandardScheme getScheme() { return new NoMoreEntriesExceptionStandardScheme(); } } - private static class NoMoreEntriesExceptionStandardScheme extends StandardScheme<NoMoreEntriesException> { + private static class NoMoreEntriesExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NoMoreEntriesException> { public void read(org.apache.thrift.protocol.TProtocol iprot, NoMoreEntriesException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -378,18 +349,18 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } - private static class NoMoreEntriesExceptionTupleSchemeFactory implements SchemeFactory { + private static class NoMoreEntriesExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public NoMoreEntriesExceptionTupleScheme getScheme() { return new NoMoreEntriesExceptionTupleScheme(); } } - private static class NoMoreEntriesExceptionTupleScheme extends TupleScheme<NoMoreEntriesException> { + private static class NoMoreEntriesExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<NoMoreEntriesException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, NoMoreEntriesException 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.isSetMsg()) { optionals.set(0); } @@ -401,8 +372,8 @@ public class NoMoreEntriesException extends TException implements org.apache.thr @Override public void read(org.apache.thrift.protocol.TProtocol prot, NoMoreEntriesException 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.msg = iprot.readString(); struct.setMsgIsSet(true); @@ -410,5 +381,9 @@ public class NoMoreEntriesException extends TException implements org.apache.thr } } + 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() {} } http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java index b03eae9..11be665 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java @@ -15,7 +15,7 @@ * 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 @@ -23,11 +23,8 @@ package org.apache.accumulo.proxy.thrift; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; -@SuppressWarnings({"unused"}) public enum PartialKey implements org.apache.thrift.TEnum { +public enum PartialKey implements org.apache.thrift.TEnum { ROW(0), ROW_COLFAM(1), ROW_COLFAM_COLQUAL(2), http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java index db8fe8e..92c6172 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.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.proxy.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 Range implements org.apache.thrift.TBase<Range, Range._Fields>, java.io.Serializable, Cloneable, Comparable<Range> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Range"); @@ -59,11 +32,8 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav private static final org.apache.thrift.protocol.TField STOP_FIELD_DESC = new org.apache.thrift.protocol.TField("stop", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField STOP_INCLUSIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("stopInclusive", org.apache.thrift.protocol.TType.BOOL, (short)4); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new RangeStandardSchemeFactory()); - schemes.put(TupleScheme.class, new RangeTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RangeStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RangeTupleSchemeFactory(); public Key start; // required public boolean startInclusive; // required @@ -77,10 +47,10 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav STOP((short)3, "stop"), STOP_INCLUSIVE((short)4, "stopInclusive"); - 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); } } @@ -109,21 +79,21 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav */ 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; } @@ -132,7 +102,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -141,9 +111,9 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav private static final int __STARTINCLUSIVE_ISSET_ID = 0; private static final int __STOPINCLUSIVE_ISSET_ID = 1; 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.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Key.class))); tmpMap.put(_Fields.START_INCLUSIVE, new org.apache.thrift.meta_data.FieldMetaData("startInclusive", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -152,7 +122,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Key.class))); tmpMap.put(_Fields.STOP_INCLUSIVE, new org.apache.thrift.meta_data.FieldMetaData("stopInclusive", 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(Range.class, metaDataMap); } @@ -238,16 +208,16 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } public void unsetStartInclusive() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID); } /** Returns true if field startInclusive is set (has been assigned a value) and false otherwise */ public boolean isSetStartInclusive() { - return EncodingUtils.testBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID); } public void setStartInclusiveIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTINCLUSIVE_ISSET_ID, value); } public Key getStop() { @@ -285,19 +255,19 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } public void unsetStopInclusive() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID); } /** Returns true if field stopInclusive is set (has been assigned a value) and false otherwise */ public boolean isSetStopInclusive() { - return EncodingUtils.testBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID); } public void setStopInclusiveIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STOPINCLUSIVE_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case START: if (value == null) { @@ -311,7 +281,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav if (value == null) { unsetStartInclusive(); } else { - setStartInclusive((Boolean)value); + setStartInclusive((java.lang.Boolean)value); } break; @@ -327,14 +297,14 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav if (value == null) { unsetStopInclusive(); } else { - setStopInclusive((Boolean)value); + setStopInclusive((java.lang.Boolean)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case START: return getStart(); @@ -349,13 +319,13 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav return isStopInclusive(); } - 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) { @@ -368,11 +338,11 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav case STOP_INCLUSIVE: return isSetStopInclusive(); } - 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 Range) @@ -383,6 +353,8 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav public boolean equals(Range that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_start = true && this.isSetStart(); boolean that_present_start = true && that.isSetStart(); @@ -425,29 +397,21 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_start = true && (isSetStart()); - list.add(present_start); - if (present_start) - list.add(start); + hashCode = hashCode * 8191 + ((isSetStart()) ? 131071 : 524287); + if (isSetStart()) + hashCode = hashCode * 8191 + start.hashCode(); - boolean present_startInclusive = true; - list.add(present_startInclusive); - if (present_startInclusive) - list.add(startInclusive); + hashCode = hashCode * 8191 + ((startInclusive) ? 131071 : 524287); - boolean present_stop = true && (isSetStop()); - list.add(present_stop); - if (present_stop) - list.add(stop); + hashCode = hashCode * 8191 + ((isSetStop()) ? 131071 : 524287); + if (isSetStop()) + hashCode = hashCode * 8191 + stop.hashCode(); - boolean present_stopInclusive = true; - list.add(present_stopInclusive); - if (present_stopInclusive) - list.add(stopInclusive); + hashCode = hashCode * 8191 + ((stopInclusive) ? 131071 : 524287); - return list.hashCode(); + return hashCode; } @Override @@ -458,7 +422,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart()); + lastComparison = java.lang.Boolean.valueOf(isSetStart()).compareTo(other.isSetStart()); if (lastComparison != 0) { return lastComparison; } @@ -468,7 +432,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStartInclusive()).compareTo(other.isSetStartInclusive()); + lastComparison = java.lang.Boolean.valueOf(isSetStartInclusive()).compareTo(other.isSetStartInclusive()); if (lastComparison != 0) { return lastComparison; } @@ -478,7 +442,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop()); + lastComparison = java.lang.Boolean.valueOf(isSetStop()).compareTo(other.isSetStop()); if (lastComparison != 0) { return lastComparison; } @@ -488,7 +452,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStopInclusive()).compareTo(other.isSetStopInclusive()); + lastComparison = java.lang.Boolean.valueOf(isSetStopInclusive()).compareTo(other.isSetStopInclusive()); if (lastComparison != 0) { return lastComparison; } @@ -506,16 +470,16 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } 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("Range("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("Range("); boolean first = true; sb.append("start:"); @@ -564,7 +528,7 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } } - 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; @@ -574,13 +538,13 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } } - private static class RangeStandardSchemeFactory implements SchemeFactory { + private static class RangeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public RangeStandardScheme getScheme() { return new RangeStandardScheme(); } } - private static class RangeStandardScheme extends StandardScheme<Range> { + private static class RangeStandardScheme extends org.apache.thrift.scheme.StandardScheme<Range> { public void read(org.apache.thrift.protocol.TProtocol iprot, Range struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -663,18 +627,18 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } - private static class RangeTupleSchemeFactory implements SchemeFactory { + private static class RangeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public RangeTupleScheme getScheme() { return new RangeTupleScheme(); } } - private static class RangeTupleScheme extends TupleScheme<Range> { + private static class RangeTupleScheme extends org.apache.thrift.scheme.TupleScheme<Range> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, Range 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.isSetStart()) { optionals.set(0); } @@ -704,8 +668,8 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav @Override public void read(org.apache.thrift.protocol.TProtocol prot, Range struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.start = new Key(); struct.start.read(iprot); @@ -727,5 +691,9 @@ public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, jav } } + 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() {} }