http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java index f77a908..7ac823d 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.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 AccumuloSecurityException extends TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class AccumuloSecurityException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloSecurityException"); 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 AccumuloSecurityExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new AccumuloSecurityExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccumuloSecurityExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccumuloSecurityExceptionTupleSchemeFactory(); - 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 AccumuloSecurityException 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 AccumuloSecurityException 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(AccumuloSecurityException.class, metaDataMap); } @@ -136,7 +106,7 @@ public class AccumuloSecurityException extends TException implements org.apache. } public AccumuloSecurityException( - String msg) + java.lang.String msg) { this(); this.msg = msg; @@ -160,11 +130,11 @@ public class AccumuloSecurityException extends TException implements org.apache. this.msg = null; } - public String getMsg() { + public java.lang.String getMsg() { return this.msg; } - public AccumuloSecurityException setMsg(String msg) { + public AccumuloSecurityException setMsg(java.lang.String msg) { this.msg = msg; return this; } @@ -184,43 +154,43 @@ public class AccumuloSecurityException 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 AccumuloSecurityException) @@ -231,6 +201,8 @@ public class AccumuloSecurityException extends TException implements org.apache. public boolean equals(AccumuloSecurityException 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 AccumuloSecurityException 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 AccumuloSecurityException 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 AccumuloSecurityException 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("AccumuloSecurityException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("AccumuloSecurityException("); boolean first = true; sb.append("msg:"); @@ -318,7 +289,7 @@ public class AccumuloSecurityException 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 AccumuloSecurityException extends TException implements org.apache. } } - private static class AccumuloSecurityExceptionStandardSchemeFactory implements SchemeFactory { + private static class AccumuloSecurityExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AccumuloSecurityExceptionStandardScheme getScheme() { return new AccumuloSecurityExceptionStandardScheme(); } } - private static class AccumuloSecurityExceptionStandardScheme extends StandardScheme<AccumuloSecurityException> { + private static class AccumuloSecurityExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AccumuloSecurityException> { public void read(org.apache.thrift.protocol.TProtocol iprot, AccumuloSecurityException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -378,18 +349,18 @@ public class AccumuloSecurityException extends TException implements org.apache. } - private static class AccumuloSecurityExceptionTupleSchemeFactory implements SchemeFactory { + private static class AccumuloSecurityExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public AccumuloSecurityExceptionTupleScheme getScheme() { return new AccumuloSecurityExceptionTupleScheme(); } } - private static class AccumuloSecurityExceptionTupleScheme extends TupleScheme<AccumuloSecurityException> { + private static class AccumuloSecurityExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<AccumuloSecurityException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, AccumuloSecurityException 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 AccumuloSecurityException extends TException implements org.apache. @Override public void read(org.apache.thrift.protocol.TProtocol prot, AccumuloSecurityException 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 AccumuloSecurityException 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/ActiveCompaction.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java index 986b68c..8ef3a9d 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.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 ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction"); @@ -65,16 +38,13 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio private static final org.apache.thrift.protocol.TField ENTRIES_WRITTEN_FIELD_DESC = new org.apache.thrift.protocol.TField("entriesWritten", org.apache.thrift.protocol.TType.I64, (short)9); private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.LIST, (short)10); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ActiveCompactionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ActiveCompactionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ActiveCompactionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ActiveCompactionTupleSchemeFactory(); public KeyExtent extent; // required public long age; // required - public List<String> inputFiles; // required - public String outputFile; // required + public java.util.List<java.lang.String> inputFiles; // required + public java.lang.String outputFile; // required /** * * @see CompactionType @@ -85,10 +55,10 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio * @see CompactionReason */ public CompactionReason reason; // required - public String localityGroup; // required + public java.lang.String localityGroup; // required public long entriesRead; // required public long entriesWritten; // required - public List<IteratorSetting> iterators; // required + public java.util.List<IteratorSetting> iterators; // 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 { @@ -111,10 +81,10 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio ENTRIES_WRITTEN((short)9, "entriesWritten"), ITERATORS((short)10, "iterators"); - 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); } } @@ -155,21 +125,21 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio */ 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; } @@ -178,7 +148,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -188,9 +158,9 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio private static final int __ENTRIESREAD_ISSET_ID = 1; private static final int __ENTRIESWRITTEN_ISSET_ID = 2; 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.EXTENT, new org.apache.thrift.meta_data.FieldMetaData("extent", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, KeyExtent.class))); tmpMap.put(_Fields.AGE, new org.apache.thrift.meta_data.FieldMetaData("age", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -213,7 +183,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio tmpMap.put(_Fields.ITERATORS, new org.apache.thrift.meta_data.FieldMetaData("iterators", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IteratorSetting.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ActiveCompaction.class, metaDataMap); } @@ -223,14 +193,14 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio public ActiveCompaction( KeyExtent extent, long age, - List<String> inputFiles, - String outputFile, + java.util.List<java.lang.String> inputFiles, + java.lang.String outputFile, CompactionType type, CompactionReason reason, - String localityGroup, + java.lang.String localityGroup, long entriesRead, long entriesWritten, - List<IteratorSetting> iterators) + java.util.List<IteratorSetting> iterators) { this(); this.extent = extent; @@ -258,7 +228,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } this.age = other.age; if (other.isSetInputFiles()) { - List<String> __this__inputFiles = new ArrayList<String>(other.inputFiles); + java.util.List<java.lang.String> __this__inputFiles = new java.util.ArrayList<java.lang.String>(other.inputFiles); this.inputFiles = __this__inputFiles; } if (other.isSetOutputFile()) { @@ -276,7 +246,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio this.entriesRead = other.entriesRead; this.entriesWritten = other.entriesWritten; if (other.isSetIterators()) { - List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size()); + java.util.List<IteratorSetting> __this__iterators = new java.util.ArrayList<IteratorSetting>(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } @@ -340,38 +310,38 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } public void unsetAge() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGE_ISSET_ID); } /** Returns true if field age is set (has been assigned a value) and false otherwise */ public boolean isSetAge() { - return EncodingUtils.testBit(__isset_bitfield, __AGE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGE_ISSET_ID); } public void setAgeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGE_ISSET_ID, value); } public int getInputFilesSize() { return (this.inputFiles == null) ? 0 : this.inputFiles.size(); } - public java.util.Iterator<String> getInputFilesIterator() { + public java.util.Iterator<java.lang.String> getInputFilesIterator() { return (this.inputFiles == null) ? null : this.inputFiles.iterator(); } - public void addToInputFiles(String elem) { + public void addToInputFiles(java.lang.String elem) { if (this.inputFiles == null) { - this.inputFiles = new ArrayList<String>(); + this.inputFiles = new java.util.ArrayList<java.lang.String>(); } this.inputFiles.add(elem); } - public List<String> getInputFiles() { + public java.util.List<java.lang.String> getInputFiles() { return this.inputFiles; } - public ActiveCompaction setInputFiles(List<String> inputFiles) { + public ActiveCompaction setInputFiles(java.util.List<java.lang.String> inputFiles) { this.inputFiles = inputFiles; return this; } @@ -391,11 +361,11 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } - public String getOutputFile() { + public java.lang.String getOutputFile() { return this.outputFile; } - public ActiveCompaction setOutputFile(String outputFile) { + public ActiveCompaction setOutputFile(java.lang.String outputFile) { this.outputFile = outputFile; return this; } @@ -479,11 +449,11 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } - public String getLocalityGroup() { + public java.lang.String getLocalityGroup() { return this.localityGroup; } - public ActiveCompaction setLocalityGroup(String localityGroup) { + public ActiveCompaction setLocalityGroup(java.lang.String localityGroup) { this.localityGroup = localityGroup; return this; } @@ -514,16 +484,16 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } public void unsetEntriesRead() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID); } /** Returns true if field entriesRead is set (has been assigned a value) and false otherwise */ public boolean isSetEntriesRead() { - return EncodingUtils.testBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID); } public void setEntriesReadIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENTRIESREAD_ISSET_ID, value); } public long getEntriesWritten() { @@ -537,16 +507,16 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } public void unsetEntriesWritten() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID); } /** Returns true if field entriesWritten is set (has been assigned a value) and false otherwise */ public boolean isSetEntriesWritten() { - return EncodingUtils.testBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID); } public void setEntriesWrittenIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENTRIESWRITTEN_ISSET_ID, value); } public int getIteratorsSize() { @@ -559,16 +529,16 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio public void addToIterators(IteratorSetting elem) { if (this.iterators == null) { - this.iterators = new ArrayList<IteratorSetting>(); + this.iterators = new java.util.ArrayList<IteratorSetting>(); } this.iterators.add(elem); } - public List<IteratorSetting> getIterators() { + public java.util.List<IteratorSetting> getIterators() { return this.iterators; } - public ActiveCompaction setIterators(List<IteratorSetting> iterators) { + public ActiveCompaction setIterators(java.util.List<IteratorSetting> iterators) { this.iterators = iterators; return this; } @@ -588,7 +558,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case EXTENT: if (value == null) { @@ -602,7 +572,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetAge(); } else { - setAge((Long)value); + setAge((java.lang.Long)value); } break; @@ -610,7 +580,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetInputFiles(); } else { - setInputFiles((List<String>)value); + setInputFiles((java.util.List<java.lang.String>)value); } break; @@ -618,7 +588,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetOutputFile(); } else { - setOutputFile((String)value); + setOutputFile((java.lang.String)value); } break; @@ -642,7 +612,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetLocalityGroup(); } else { - setLocalityGroup((String)value); + setLocalityGroup((java.lang.String)value); } break; @@ -650,7 +620,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetEntriesRead(); } else { - setEntriesRead((Long)value); + setEntriesRead((java.lang.Long)value); } break; @@ -658,7 +628,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetEntriesWritten(); } else { - setEntriesWritten((Long)value); + setEntriesWritten((java.lang.Long)value); } break; @@ -666,14 +636,14 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetIterators(); } else { - setIterators((List<IteratorSetting>)value); + setIterators((java.util.List<IteratorSetting>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case EXTENT: return getExtent(); @@ -706,13 +676,13 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return getIterators(); } - 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) { @@ -737,11 +707,11 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio case ITERATORS: return isSetIterators(); } - 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 ActiveCompaction) @@ -752,6 +722,8 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio public boolean equals(ActiveCompaction that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_extent = true && this.isSetExtent(); boolean that_present_extent = true && that.isSetExtent(); @@ -848,59 +820,43 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_extent = true && (isSetExtent()); - list.add(present_extent); - if (present_extent) - list.add(extent); + hashCode = hashCode * 8191 + ((isSetExtent()) ? 131071 : 524287); + if (isSetExtent()) + hashCode = hashCode * 8191 + extent.hashCode(); - boolean present_age = true; - list.add(present_age); - if (present_age) - list.add(age); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(age); - boolean present_inputFiles = true && (isSetInputFiles()); - list.add(present_inputFiles); - if (present_inputFiles) - list.add(inputFiles); + hashCode = hashCode * 8191 + ((isSetInputFiles()) ? 131071 : 524287); + if (isSetInputFiles()) + hashCode = hashCode * 8191 + inputFiles.hashCode(); - boolean present_outputFile = true && (isSetOutputFile()); - list.add(present_outputFile); - if (present_outputFile) - list.add(outputFile); + hashCode = hashCode * 8191 + ((isSetOutputFile()) ? 131071 : 524287); + if (isSetOutputFile()) + hashCode = hashCode * 8191 + outputFile.hashCode(); - boolean present_type = true && (isSetType()); - list.add(present_type); - if (present_type) - list.add(type.getValue()); + hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287); + if (isSetType()) + hashCode = hashCode * 8191 + type.getValue(); - boolean present_reason = true && (isSetReason()); - list.add(present_reason); - if (present_reason) - list.add(reason.getValue()); + hashCode = hashCode * 8191 + ((isSetReason()) ? 131071 : 524287); + if (isSetReason()) + hashCode = hashCode * 8191 + reason.getValue(); - boolean present_localityGroup = true && (isSetLocalityGroup()); - list.add(present_localityGroup); - if (present_localityGroup) - list.add(localityGroup); + hashCode = hashCode * 8191 + ((isSetLocalityGroup()) ? 131071 : 524287); + if (isSetLocalityGroup()) + hashCode = hashCode * 8191 + localityGroup.hashCode(); - boolean present_entriesRead = true; - list.add(present_entriesRead); - if (present_entriesRead) - list.add(entriesRead); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(entriesRead); - boolean present_entriesWritten = true; - list.add(present_entriesWritten); - if (present_entriesWritten) - list.add(entriesWritten); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(entriesWritten); - boolean present_iterators = true && (isSetIterators()); - list.add(present_iterators); - if (present_iterators) - list.add(iterators); + hashCode = hashCode * 8191 + ((isSetIterators()) ? 131071 : 524287); + if (isSetIterators()) + hashCode = hashCode * 8191 + iterators.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -911,7 +867,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent()); + lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent()); if (lastComparison != 0) { return lastComparison; } @@ -921,7 +877,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAge()).compareTo(other.isSetAge()); + lastComparison = java.lang.Boolean.valueOf(isSetAge()).compareTo(other.isSetAge()); if (lastComparison != 0) { return lastComparison; } @@ -931,7 +887,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInputFiles()).compareTo(other.isSetInputFiles()); + lastComparison = java.lang.Boolean.valueOf(isSetInputFiles()).compareTo(other.isSetInputFiles()); if (lastComparison != 0) { return lastComparison; } @@ -941,7 +897,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOutputFile()).compareTo(other.isSetOutputFile()); + lastComparison = java.lang.Boolean.valueOf(isSetOutputFile()).compareTo(other.isSetOutputFile()); if (lastComparison != 0) { return lastComparison; } @@ -951,7 +907,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); + lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType()); if (lastComparison != 0) { return lastComparison; } @@ -961,7 +917,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReason()).compareTo(other.isSetReason()); + lastComparison = java.lang.Boolean.valueOf(isSetReason()).compareTo(other.isSetReason()); if (lastComparison != 0) { return lastComparison; } @@ -971,7 +927,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLocalityGroup()).compareTo(other.isSetLocalityGroup()); + lastComparison = java.lang.Boolean.valueOf(isSetLocalityGroup()).compareTo(other.isSetLocalityGroup()); if (lastComparison != 0) { return lastComparison; } @@ -981,7 +937,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEntriesRead()).compareTo(other.isSetEntriesRead()); + lastComparison = java.lang.Boolean.valueOf(isSetEntriesRead()).compareTo(other.isSetEntriesRead()); if (lastComparison != 0) { return lastComparison; } @@ -991,7 +947,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEntriesWritten()).compareTo(other.isSetEntriesWritten()); + lastComparison = java.lang.Boolean.valueOf(isSetEntriesWritten()).compareTo(other.isSetEntriesWritten()); if (lastComparison != 0) { return lastComparison; } @@ -1001,7 +957,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); + lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } @@ -1019,16 +975,16 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } 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("ActiveCompaction("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ActiveCompaction("); boolean first = true; sb.append("extent:"); @@ -1118,7 +1074,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } - 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; @@ -1128,13 +1084,13 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } - private static class ActiveCompactionStandardSchemeFactory implements SchemeFactory { + private static class ActiveCompactionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ActiveCompactionStandardScheme getScheme() { return new ActiveCompactionStandardScheme(); } } - private static class ActiveCompactionStandardScheme extends StandardScheme<ActiveCompaction> { + private static class ActiveCompactionStandardScheme extends org.apache.thrift.scheme.StandardScheme<ActiveCompaction> { public void read(org.apache.thrift.protocol.TProtocol iprot, ActiveCompaction struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1167,8 +1123,8 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list138 = iprot.readListBegin(); - struct.inputFiles = new ArrayList<String>(_list138.size); - String _elem139; + struct.inputFiles = new java.util.ArrayList<java.lang.String>(_list138.size); + java.lang.String _elem139; for (int _i140 = 0; _i140 < _list138.size; ++_i140) { _elem139 = iprot.readString(); @@ -1233,7 +1189,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list141 = iprot.readListBegin(); - struct.iterators = new ArrayList<IteratorSetting>(_list141.size); + struct.iterators = new java.util.ArrayList<IteratorSetting>(_list141.size); IteratorSetting _elem142; for (int _i143 = 0; _i143 < _list141.size; ++_i143) { @@ -1275,7 +1231,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio oprot.writeFieldBegin(INPUT_FILES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.inputFiles.size())); - for (String _iter144 : struct.inputFiles) + for (java.lang.String _iter144 : struct.inputFiles) { oprot.writeString(_iter144); } @@ -1327,18 +1283,18 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } - private static class ActiveCompactionTupleSchemeFactory implements SchemeFactory { + private static class ActiveCompactionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ActiveCompactionTupleScheme getScheme() { return new ActiveCompactionTupleScheme(); } } - private static class ActiveCompactionTupleScheme extends TupleScheme<ActiveCompaction> { + private static class ActiveCompactionTupleScheme extends org.apache.thrift.scheme.TupleScheme<ActiveCompaction> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ActiveCompaction 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.isSetExtent()) { optionals.set(0); } @@ -1379,7 +1335,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (struct.isSetInputFiles()) { { oprot.writeI32(struct.inputFiles.size()); - for (String _iter146 : struct.inputFiles) + for (java.lang.String _iter146 : struct.inputFiles) { oprot.writeString(_iter146); } @@ -1416,8 +1372,8 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio @Override public void read(org.apache.thrift.protocol.TProtocol prot, ActiveCompaction struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(10); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(10); if (incoming.get(0)) { struct.extent = new KeyExtent(); struct.extent.read(iprot); @@ -1430,8 +1386,8 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (incoming.get(2)) { { org.apache.thrift.protocol.TList _list148 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.inputFiles = new ArrayList<String>(_list148.size); - String _elem149; + struct.inputFiles = new java.util.ArrayList<java.lang.String>(_list148.size); + java.lang.String _elem149; for (int _i150 = 0; _i150 < _list148.size; ++_i150) { _elem149 = iprot.readString(); @@ -1467,7 +1423,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (incoming.get(9)) { { org.apache.thrift.protocol.TList _list151 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.iterators = new ArrayList<IteratorSetting>(_list151.size); + struct.iterators = new java.util.ArrayList<IteratorSetting>(_list151.size); IteratorSetting _elem152; for (int _i153 = 0; _i153 < _list151.size; ++_i153) { @@ -1481,5 +1437,9 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio } } + 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/ActiveScan.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java index 9f4d892..66c8cc8 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.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 ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan"); @@ -66,15 +39,12 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.LIST, (short)10); private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.LIST, (short)11); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ActiveScanStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ActiveScanTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ActiveScanStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ActiveScanTupleSchemeFactory(); - public String client; // required - public String user; // required - public String table; // required + public java.lang.String client; // required + public java.lang.String user; // required + public java.lang.String table; // required public long age; // required public long idleTime; // required /** @@ -88,9 +58,9 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca */ public ScanState state; // required public KeyExtent extent; // required - public List<Column> columns; // required - public List<IteratorSetting> iterators; // required - public List<ByteBuffer> authorizations; // required + public java.util.List<Column> columns; // required + public java.util.List<IteratorSetting> iterators; // required + public java.util.List<java.nio.ByteBuffer> authorizations; // 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 { @@ -114,10 +84,10 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca ITERATORS((short)10, "iterators"), AUTHORIZATIONS((short)11, "authorizations"); - 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); } } @@ -160,21 +130,21 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca */ 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; } @@ -183,7 +153,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -192,9 +162,9 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca private static final int __AGE_ISSET_ID = 0; private static final int __IDLETIME_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.CLIENT, new org.apache.thrift.meta_data.FieldMetaData("client", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -220,7 +190,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca tmpMap.put(_Fields.AUTHORIZATIONS, new org.apache.thrift.meta_data.FieldMetaData("authorizations", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ActiveScan.class, metaDataMap); } @@ -228,17 +198,17 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } public ActiveScan( - String client, - String user, - String table, + java.lang.String client, + java.lang.String user, + java.lang.String table, long age, long idleTime, ScanType type, ScanState state, KeyExtent extent, - List<Column> columns, - List<IteratorSetting> iterators, - List<ByteBuffer> authorizations) + java.util.List<Column> columns, + java.util.List<IteratorSetting> iterators, + java.util.List<java.nio.ByteBuffer> authorizations) { this(); this.client = client; @@ -282,21 +252,21 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca this.extent = new KeyExtent(other.extent); } if (other.isSetColumns()) { - List<Column> __this__columns = new ArrayList<Column>(other.columns.size()); + java.util.List<Column> __this__columns = new java.util.ArrayList<Column>(other.columns.size()); for (Column other_element : other.columns) { __this__columns.add(new Column(other_element)); } this.columns = __this__columns; } if (other.isSetIterators()) { - List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size()); + java.util.List<IteratorSetting> __this__iterators = new java.util.ArrayList<IteratorSetting>(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } this.iterators = __this__iterators; } if (other.isSetAuthorizations()) { - List<ByteBuffer> __this__authorizations = new ArrayList<ByteBuffer>(other.authorizations); + java.util.List<java.nio.ByteBuffer> __this__authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(other.authorizations); this.authorizations = __this__authorizations; } } @@ -322,11 +292,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca this.authorizations = null; } - public String getClient() { + public java.lang.String getClient() { return this.client; } - public ActiveScan setClient(String client) { + public ActiveScan setClient(java.lang.String client) { this.client = client; return this; } @@ -346,11 +316,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - public String getUser() { + public java.lang.String getUser() { return this.user; } - public ActiveScan setUser(String user) { + public ActiveScan setUser(java.lang.String user) { this.user = user; return this; } @@ -370,11 +340,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - public String getTable() { + public java.lang.String getTable() { return this.table; } - public ActiveScan setTable(String table) { + public ActiveScan setTable(java.lang.String table) { this.table = table; return this; } @@ -405,16 +375,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } public void unsetAge() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AGE_ISSET_ID); } /** Returns true if field age is set (has been assigned a value) and false otherwise */ public boolean isSetAge() { - return EncodingUtils.testBit(__isset_bitfield, __AGE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AGE_ISSET_ID); } public void setAgeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AGE_ISSET_ID, value); } public long getIdleTime() { @@ -428,16 +398,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } public void unsetIdleTime() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __IDLETIME_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __IDLETIME_ISSET_ID); } /** Returns true if field idleTime is set (has been assigned a value) and false otherwise */ public boolean isSetIdleTime() { - return EncodingUtils.testBit(__isset_bitfield, __IDLETIME_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __IDLETIME_ISSET_ID); } public void setIdleTimeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __IDLETIME_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __IDLETIME_ISSET_ID, value); } /** @@ -538,16 +508,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca public void addToColumns(Column elem) { if (this.columns == null) { - this.columns = new ArrayList<Column>(); + this.columns = new java.util.ArrayList<Column>(); } this.columns.add(elem); } - public List<Column> getColumns() { + public java.util.List<Column> getColumns() { return this.columns; } - public ActiveScan setColumns(List<Column> columns) { + public ActiveScan setColumns(java.util.List<Column> columns) { this.columns = columns; return this; } @@ -577,16 +547,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca public void addToIterators(IteratorSetting elem) { if (this.iterators == null) { - this.iterators = new ArrayList<IteratorSetting>(); + this.iterators = new java.util.ArrayList<IteratorSetting>(); } this.iterators.add(elem); } - public List<IteratorSetting> getIterators() { + public java.util.List<IteratorSetting> getIterators() { return this.iterators; } - public ActiveScan setIterators(List<IteratorSetting> iterators) { + public ActiveScan setIterators(java.util.List<IteratorSetting> iterators) { this.iterators = iterators; return this; } @@ -610,22 +580,22 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return (this.authorizations == null) ? 0 : this.authorizations.size(); } - public java.util.Iterator<ByteBuffer> getAuthorizationsIterator() { + public java.util.Iterator<java.nio.ByteBuffer> getAuthorizationsIterator() { return (this.authorizations == null) ? null : this.authorizations.iterator(); } - public void addToAuthorizations(ByteBuffer elem) { + public void addToAuthorizations(java.nio.ByteBuffer elem) { if (this.authorizations == null) { - this.authorizations = new ArrayList<ByteBuffer>(); + this.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(); } this.authorizations.add(elem); } - public List<ByteBuffer> getAuthorizations() { + public java.util.List<java.nio.ByteBuffer> getAuthorizations() { return this.authorizations; } - public ActiveScan setAuthorizations(List<ByteBuffer> authorizations) { + public ActiveScan setAuthorizations(java.util.List<java.nio.ByteBuffer> authorizations) { this.authorizations = authorizations; return this; } @@ -645,13 +615,13 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case CLIENT: if (value == null) { unsetClient(); } else { - setClient((String)value); + setClient((java.lang.String)value); } break; @@ -659,7 +629,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetUser(); } else { - setUser((String)value); + setUser((java.lang.String)value); } break; @@ -667,7 +637,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetTable(); } else { - setTable((String)value); + setTable((java.lang.String)value); } break; @@ -675,7 +645,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetAge(); } else { - setAge((Long)value); + setAge((java.lang.Long)value); } break; @@ -683,7 +653,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetIdleTime(); } else { - setIdleTime((Long)value); + setIdleTime((java.lang.Long)value); } break; @@ -715,7 +685,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetColumns(); } else { - setColumns((List<Column>)value); + setColumns((java.util.List<Column>)value); } break; @@ -723,7 +693,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetIterators(); } else { - setIterators((List<IteratorSetting>)value); + setIterators((java.util.List<IteratorSetting>)value); } break; @@ -731,14 +701,14 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetAuthorizations(); } else { - setAuthorizations((List<ByteBuffer>)value); + setAuthorizations((java.util.List<java.nio.ByteBuffer>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case CLIENT: return getClient(); @@ -774,13 +744,13 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return getAuthorizations(); } - 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) { @@ -807,11 +777,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca case AUTHORIZATIONS: return isSetAuthorizations(); } - 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 ActiveScan) @@ -822,6 +792,8 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca public boolean equals(ActiveScan that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_client = true && this.isSetClient(); boolean that_present_client = true && that.isSetClient(); @@ -927,64 +899,49 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_client = true && (isSetClient()); - list.add(present_client); - if (present_client) - list.add(client); - - boolean present_user = true && (isSetUser()); - list.add(present_user); - if (present_user) - list.add(user); - - boolean present_table = true && (isSetTable()); - list.add(present_table); - if (present_table) - list.add(table); - - boolean present_age = true; - list.add(present_age); - if (present_age) - list.add(age); - - boolean present_idleTime = true; - list.add(present_idleTime); - if (present_idleTime) - list.add(idleTime); - - boolean present_type = true && (isSetType()); - list.add(present_type); - if (present_type) - list.add(type.getValue()); - - boolean present_state = true && (isSetState()); - list.add(present_state); - if (present_state) - list.add(state.getValue()); - - boolean present_extent = true && (isSetExtent()); - list.add(present_extent); - if (present_extent) - list.add(extent); - - boolean present_columns = true && (isSetColumns()); - list.add(present_columns); - if (present_columns) - list.add(columns); - - boolean present_iterators = true && (isSetIterators()); - list.add(present_iterators); - if (present_iterators) - list.add(iterators); - - boolean present_authorizations = true && (isSetAuthorizations()); - list.add(present_authorizations); - if (present_authorizations) - list.add(authorizations); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((isSetClient()) ? 131071 : 524287); + if (isSetClient()) + hashCode = hashCode * 8191 + client.hashCode(); + + hashCode = hashCode * 8191 + ((isSetUser()) ? 131071 : 524287); + if (isSetUser()) + hashCode = hashCode * 8191 + user.hashCode(); + + hashCode = hashCode * 8191 + ((isSetTable()) ? 131071 : 524287); + if (isSetTable()) + hashCode = hashCode * 8191 + table.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(age); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(idleTime); + + hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287); + if (isSetType()) + hashCode = hashCode * 8191 + type.getValue(); + + hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287); + if (isSetState()) + hashCode = hashCode * 8191 + state.getValue(); + + hashCode = hashCode * 8191 + ((isSetExtent()) ? 131071 : 524287); + if (isSetExtent()) + hashCode = hashCode * 8191 + extent.hashCode(); + + hashCode = hashCode * 8191 + ((isSetColumns()) ? 131071 : 524287); + if (isSetColumns()) + hashCode = hashCode * 8191 + columns.hashCode(); + + hashCode = hashCode * 8191 + ((isSetIterators()) ? 131071 : 524287); + if (isSetIterators()) + hashCode = hashCode * 8191 + iterators.hashCode(); + + hashCode = hashCode * 8191 + ((isSetAuthorizations()) ? 131071 : 524287); + if (isSetAuthorizations()) + hashCode = hashCode * 8191 + authorizations.hashCode(); + + return hashCode; } @Override @@ -995,7 +952,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetClient()).compareTo(other.isSetClient()); + lastComparison = java.lang.Boolean.valueOf(isSetClient()).compareTo(other.isSetClient()); if (lastComparison != 0) { return lastComparison; } @@ -1005,7 +962,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); + lastComparison = java.lang.Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); if (lastComparison != 0) { return lastComparison; } @@ -1015,7 +972,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable()); + lastComparison = java.lang.Boolean.valueOf(isSetTable()).compareTo(other.isSetTable()); if (lastComparison != 0) { return lastComparison; } @@ -1025,7 +982,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAge()).compareTo(other.isSetAge()); + lastComparison = java.lang.Boolean.valueOf(isSetAge()).compareTo(other.isSetAge()); if (lastComparison != 0) { return lastComparison; } @@ -1035,7 +992,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIdleTime()).compareTo(other.isSetIdleTime()); + lastComparison = java.lang.Boolean.valueOf(isSetIdleTime()).compareTo(other.isSetIdleTime()); if (lastComparison != 0) { return lastComparison; } @@ -1045,7 +1002,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); + lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType()); if (lastComparison != 0) { return lastComparison; } @@ -1055,7 +1012,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState()); + lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState()); if (lastComparison != 0) { return lastComparison; } @@ -1065,7 +1022,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent()); + lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent()); if (lastComparison != 0) { return lastComparison; } @@ -1075,7 +1032,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); + lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } @@ -1085,7 +1042,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); + lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } @@ -1095,7 +1052,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); + lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } @@ -1113,16 +1070,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } 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("ActiveScan("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ActiveScan("); boolean first = true; sb.append("client:"); @@ -1224,7 +1181,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - 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; @@ -1234,13 +1191,13 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - private static class ActiveScanStandardSchemeFactory implements SchemeFactory { + private static class ActiveScanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ActiveScanStandardScheme getScheme() { return new ActiveScanStandardScheme(); } } - private static class ActiveScanStandardScheme extends StandardScheme<ActiveScan> { + private static class ActiveScanStandardScheme extends org.apache.thrift.scheme.StandardScheme<ActiveScan> { public void read(org.apache.thrift.protocol.TProtocol iprot, ActiveScan struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1321,7 +1278,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list114 = iprot.readListBegin(); - struct.columns = new ArrayList<Column>(_list114.size); + struct.columns = new java.util.ArrayList<Column>(_list114.size); Column _elem115; for (int _i116 = 0; _i116 < _list114.size; ++_i116) { @@ -1340,7 +1297,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list117 = iprot.readListBegin(); - struct.iterators = new ArrayList<IteratorSetting>(_list117.size); + struct.iterators = new java.util.ArrayList<IteratorSetting>(_list117.size); IteratorSetting _elem118; for (int _i119 = 0; _i119 < _list117.size; ++_i119) { @@ -1359,8 +1316,8 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list120 = iprot.readListBegin(); - struct.authorizations = new ArrayList<ByteBuffer>(_list120.size); - ByteBuffer _elem121; + struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list120.size); + java.nio.ByteBuffer _elem121; for (int _i122 = 0; _i122 < _list120.size; ++_i122) { _elem121 = iprot.readBinary(); @@ -1452,7 +1409,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size())); - for (ByteBuffer _iter125 : struct.authorizations) + for (java.nio.ByteBuffer _iter125 : struct.authorizations) { oprot.writeBinary(_iter125); } @@ -1466,18 +1423,18 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } - private static class ActiveScanTupleSchemeFactory implements SchemeFactory { + private static class ActiveScanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ActiveScanTupleScheme getScheme() { return new ActiveScanTupleScheme(); } } - private static class ActiveScanTupleScheme extends TupleScheme<ActiveScan> { + private static class ActiveScanTupleScheme extends org.apache.thrift.scheme.TupleScheme<ActiveScan> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ActiveScan 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.isSetClient()) { optionals.set(0); } @@ -1557,7 +1514,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (struct.isSetAuthorizations()) { { oprot.writeI32(struct.authorizations.size()); - for (ByteBuffer _iter128 : struct.authorizations) + for (java.nio.ByteBuffer _iter128 : struct.authorizations) { oprot.writeBinary(_iter128); } @@ -1567,8 +1524,8 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca @Override public void read(org.apache.thrift.protocol.TProtocol prot, ActiveScan struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(11); if (incoming.get(0)) { struct.client = iprot.readString(); struct.setClientIsSet(true); @@ -1605,7 +1562,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(8)) { { org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.columns = new ArrayList<Column>(_list129.size); + struct.columns = new java.util.ArrayList<Column>(_list129.size); Column _elem130; for (int _i131 = 0; _i131 < _list129.size; ++_i131) { @@ -1619,7 +1576,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(9)) { { org.apache.thrift.protocol.TList _list132 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.iterators = new ArrayList<IteratorSetting>(_list132.size); + struct.iterators = new java.util.ArrayList<IteratorSetting>(_list132.size); IteratorSetting _elem133; for (int _i134 = 0; _i134 < _list132.size; ++_i134) { @@ -1633,8 +1590,8 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(10)) { { org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.authorizations = new ArrayList<ByteBuffer>(_list135.size); - ByteBuffer _elem136; + struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list135.size); + java.nio.ByteBuffer _elem136; for (int _i137 = 0; _i137 < _list135.size; ++_i137) { _elem136 = iprot.readBinary(); @@ -1646,5 +1603,9 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } + 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() {} }