http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java index d4df3d3..c90b213 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java @@ -15,42 +15,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.accumulo.core.data.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 TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, java.io.Serializable, Cloneable, Comparable<TRange> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRange"); @@ -61,11 +34,8 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, private static final org.apache.thrift.protocol.TField INFINITE_START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("infiniteStartKey", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.protocol.TField INFINITE_STOP_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("infiniteStopKey", org.apache.thrift.protocol.TType.BOOL, (short)6); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new TRangeStandardSchemeFactory()); - schemes.put(TupleScheme.class, new TRangeTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TRangeStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TRangeTupleSchemeFactory(); public TKey start; // required public TKey stop; // required @@ -83,10 +53,10 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, INFINITE_START_KEY((short)5, "infiniteStartKey"), INFINITE_STOP_KEY((short)6, "infiniteStopKey"); - 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); } } @@ -119,21 +89,21 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, */ 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; } @@ -142,7 +112,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -153,9 +123,9 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, private static final int __INFINITESTARTKEY_ISSET_ID = 2; private static final int __INFINITESTOPKEY_ISSET_ID = 3; 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, TKey.class))); tmpMap.put(_Fields.STOP, new org.apache.thrift.meta_data.FieldMetaData("stop", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -168,7 +138,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.INFINITE_STOP_KEY, new org.apache.thrift.meta_data.FieldMetaData("infiniteStopKey", 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(TRange.class, metaDataMap); } @@ -290,16 +260,16 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } public void unsetStartKeyInclusive() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID); } /** Returns true if field startKeyInclusive is set (has been assigned a value) and false otherwise */ public boolean isSetStartKeyInclusive() { - return EncodingUtils.testBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID); } public void setStartKeyInclusiveIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID, value); } public boolean isStopKeyInclusive() { @@ -313,16 +283,16 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } public void unsetStopKeyInclusive() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID); } /** Returns true if field stopKeyInclusive is set (has been assigned a value) and false otherwise */ public boolean isSetStopKeyInclusive() { - return EncodingUtils.testBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID); } public void setStopKeyInclusiveIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID, value); } public boolean isInfiniteStartKey() { @@ -336,16 +306,16 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } public void unsetInfiniteStartKey() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID); } /** Returns true if field infiniteStartKey is set (has been assigned a value) and false otherwise */ public boolean isSetInfiniteStartKey() { - return EncodingUtils.testBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID); } public void setInfiniteStartKeyIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID, value); } public boolean isInfiniteStopKey() { @@ -359,19 +329,19 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } public void unsetInfiniteStopKey() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID); } /** Returns true if field infiniteStopKey is set (has been assigned a value) and false otherwise */ public boolean isSetInfiniteStopKey() { - return EncodingUtils.testBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID); } public void setInfiniteStopKeyIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INFINITESTOPKEY_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) { @@ -393,7 +363,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, if (value == null) { unsetStartKeyInclusive(); } else { - setStartKeyInclusive((Boolean)value); + setStartKeyInclusive((java.lang.Boolean)value); } break; @@ -401,7 +371,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, if (value == null) { unsetStopKeyInclusive(); } else { - setStopKeyInclusive((Boolean)value); + setStopKeyInclusive((java.lang.Boolean)value); } break; @@ -409,7 +379,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, if (value == null) { unsetInfiniteStartKey(); } else { - setInfiniteStartKey((Boolean)value); + setInfiniteStartKey((java.lang.Boolean)value); } break; @@ -417,14 +387,14 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, if (value == null) { unsetInfiniteStopKey(); } else { - setInfiniteStopKey((Boolean)value); + setInfiniteStopKey((java.lang.Boolean)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case START: return getStart(); @@ -445,13 +415,13 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return isInfiniteStopKey(); } - 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) { @@ -468,11 +438,11 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, case INFINITE_STOP_KEY: return isSetInfiniteStopKey(); } - 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 TRange) @@ -483,6 +453,8 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, public boolean equals(TRange 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(); @@ -543,39 +515,25 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, @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_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_startKeyInclusive = true; - list.add(present_startKeyInclusive); - if (present_startKeyInclusive) - list.add(startKeyInclusive); + hashCode = hashCode * 8191 + ((startKeyInclusive) ? 131071 : 524287); - boolean present_stopKeyInclusive = true; - list.add(present_stopKeyInclusive); - if (present_stopKeyInclusive) - list.add(stopKeyInclusive); + hashCode = hashCode * 8191 + ((stopKeyInclusive) ? 131071 : 524287); - boolean present_infiniteStartKey = true; - list.add(present_infiniteStartKey); - if (present_infiniteStartKey) - list.add(infiniteStartKey); + hashCode = hashCode * 8191 + ((infiniteStartKey) ? 131071 : 524287); - boolean present_infiniteStopKey = true; - list.add(present_infiniteStopKey); - if (present_infiniteStopKey) - list.add(infiniteStopKey); + hashCode = hashCode * 8191 + ((infiniteStopKey) ? 131071 : 524287); - return list.hashCode(); + return hashCode; } @Override @@ -586,7 +544,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart()); + lastComparison = java.lang.Boolean.valueOf(isSetStart()).compareTo(other.isSetStart()); if (lastComparison != 0) { return lastComparison; } @@ -596,7 +554,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop()); + lastComparison = java.lang.Boolean.valueOf(isSetStop()).compareTo(other.isSetStop()); if (lastComparison != 0) { return lastComparison; } @@ -606,7 +564,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStartKeyInclusive()).compareTo(other.isSetStartKeyInclusive()); + lastComparison = java.lang.Boolean.valueOf(isSetStartKeyInclusive()).compareTo(other.isSetStartKeyInclusive()); if (lastComparison != 0) { return lastComparison; } @@ -616,7 +574,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStopKeyInclusive()).compareTo(other.isSetStopKeyInclusive()); + lastComparison = java.lang.Boolean.valueOf(isSetStopKeyInclusive()).compareTo(other.isSetStopKeyInclusive()); if (lastComparison != 0) { return lastComparison; } @@ -626,7 +584,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInfiniteStartKey()).compareTo(other.isSetInfiniteStartKey()); + lastComparison = java.lang.Boolean.valueOf(isSetInfiniteStartKey()).compareTo(other.isSetInfiniteStartKey()); if (lastComparison != 0) { return lastComparison; } @@ -636,7 +594,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInfiniteStopKey()).compareTo(other.isSetInfiniteStopKey()); + lastComparison = java.lang.Boolean.valueOf(isSetInfiniteStopKey()).compareTo(other.isSetInfiniteStopKey()); if (lastComparison != 0) { return lastComparison; } @@ -654,16 +612,16 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } 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("TRange("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("TRange("); boolean first = true; sb.append("start:"); @@ -720,7 +678,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } } - 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; @@ -730,13 +688,13 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } } - private static class TRangeStandardSchemeFactory implements SchemeFactory { + private static class TRangeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TRangeStandardScheme getScheme() { return new TRangeStandardScheme(); } } - private static class TRangeStandardScheme extends StandardScheme<TRange> { + private static class TRangeStandardScheme extends org.apache.thrift.scheme.StandardScheme<TRange> { public void read(org.apache.thrift.protocol.TProtocol iprot, TRange struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -841,18 +799,18 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } - private static class TRangeTupleSchemeFactory implements SchemeFactory { + private static class TRangeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TRangeTupleScheme getScheme() { return new TRangeTupleScheme(); } } - private static class TRangeTupleScheme extends TupleScheme<TRange> { + private static class TRangeTupleScheme extends org.apache.thrift.scheme.TupleScheme<TRange> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, TRange 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); } @@ -894,8 +852,8 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, @Override public void read(org.apache.thrift.protocol.TProtocol prot, TRange struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.start = new TKey(); struct.start.read(iprot); @@ -925,5 +883,9 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, } } + 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/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java index f3da03f..3a37af2 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java @@ -15,42 +15,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.accumulo.core.data.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 UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, UpdateErrors._Fields>, java.io.Serializable, Cloneable, Comparable<UpdateErrors> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateErrors"); @@ -58,15 +31,12 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat private static final org.apache.thrift.protocol.TField VIOLATION_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("violationSummaries", org.apache.thrift.protocol.TType.LIST, (short)2); private static final org.apache.thrift.protocol.TField AUTHORIZATION_FAILURES_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizationFailures", org.apache.thrift.protocol.TType.MAP, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new UpdateErrorsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new UpdateErrorsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UpdateErrorsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UpdateErrorsTupleSchemeFactory(); - public Map<TKeyExtent,Long> failedExtents; // required - public List<TConstraintViolationSummary> violationSummaries; // required - public Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures; // required + public java.util.Map<TKeyExtent,java.lang.Long> failedExtents; // required + public java.util.List<TConstraintViolationSummary> violationSummaries; // required + public java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures; // 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 { @@ -74,10 +44,10 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat VIOLATION_SUMMARIES((short)2, "violationSummaries"), AUTHORIZATION_FAILURES((short)3, "authorizationFailures"); - 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); } } @@ -104,21 +74,21 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat */ 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; } @@ -127,15 +97,15 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat 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.FAILED_EXTENTS, new org.apache.thrift.meta_data.FieldMetaData("failedExtents", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TKeyExtent.class), @@ -147,7 +117,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TKeyExtent.class), new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UpdateErrors.class, metaDataMap); } @@ -155,9 +125,9 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } public UpdateErrors( - Map<TKeyExtent,Long> failedExtents, - List<TConstraintViolationSummary> violationSummaries, - Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures) + java.util.Map<TKeyExtent,java.lang.Long> failedExtents, + java.util.List<TConstraintViolationSummary> violationSummaries, + java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures) { this(); this.failedExtents = failedExtents; @@ -170,30 +140,30 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat */ public UpdateErrors(UpdateErrors other) { if (other.isSetFailedExtents()) { - Map<TKeyExtent,Long> __this__failedExtents = new HashMap<TKeyExtent,Long>(other.failedExtents.size()); - for (Map.Entry<TKeyExtent, Long> other_element : other.failedExtents.entrySet()) { + java.util.Map<TKeyExtent,java.lang.Long> __this__failedExtents = new java.util.HashMap<TKeyExtent,java.lang.Long>(other.failedExtents.size()); + for (java.util.Map.Entry<TKeyExtent, java.lang.Long> other_element : other.failedExtents.entrySet()) { TKeyExtent other_element_key = other_element.getKey(); - Long other_element_value = other_element.getValue(); + java.lang.Long other_element_value = other_element.getValue(); TKeyExtent __this__failedExtents_copy_key = new TKeyExtent(other_element_key); - Long __this__failedExtents_copy_value = other_element_value; + java.lang.Long __this__failedExtents_copy_value = other_element_value; __this__failedExtents.put(__this__failedExtents_copy_key, __this__failedExtents_copy_value); } this.failedExtents = __this__failedExtents; } if (other.isSetViolationSummaries()) { - List<TConstraintViolationSummary> __this__violationSummaries = new ArrayList<TConstraintViolationSummary>(other.violationSummaries.size()); + java.util.List<TConstraintViolationSummary> __this__violationSummaries = new java.util.ArrayList<TConstraintViolationSummary>(other.violationSummaries.size()); for (TConstraintViolationSummary other_element : other.violationSummaries) { __this__violationSummaries.add(new TConstraintViolationSummary(other_element)); } this.violationSummaries = __this__violationSummaries; } if (other.isSetAuthorizationFailures()) { - Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> __this__authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(other.authorizationFailures.size()); - for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> other_element : other.authorizationFailures.entrySet()) { + java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> __this__authorizationFailures = new java.util.HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(other.authorizationFailures.size()); + for (java.util.Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> other_element : other.authorizationFailures.entrySet()) { TKeyExtent other_element_key = other_element.getKey(); org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode other_element_value = other_element.getValue(); @@ -225,16 +195,16 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat public void putToFailedExtents(TKeyExtent key, long val) { if (this.failedExtents == null) { - this.failedExtents = new HashMap<TKeyExtent,Long>(); + this.failedExtents = new java.util.HashMap<TKeyExtent,java.lang.Long>(); } this.failedExtents.put(key, val); } - public Map<TKeyExtent,Long> getFailedExtents() { + public java.util.Map<TKeyExtent,java.lang.Long> getFailedExtents() { return this.failedExtents; } - public UpdateErrors setFailedExtents(Map<TKeyExtent,Long> failedExtents) { + public UpdateErrors setFailedExtents(java.util.Map<TKeyExtent,java.lang.Long> failedExtents) { this.failedExtents = failedExtents; return this; } @@ -264,16 +234,16 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat public void addToViolationSummaries(TConstraintViolationSummary elem) { if (this.violationSummaries == null) { - this.violationSummaries = new ArrayList<TConstraintViolationSummary>(); + this.violationSummaries = new java.util.ArrayList<TConstraintViolationSummary>(); } this.violationSummaries.add(elem); } - public List<TConstraintViolationSummary> getViolationSummaries() { + public java.util.List<TConstraintViolationSummary> getViolationSummaries() { return this.violationSummaries; } - public UpdateErrors setViolationSummaries(List<TConstraintViolationSummary> violationSummaries) { + public UpdateErrors setViolationSummaries(java.util.List<TConstraintViolationSummary> violationSummaries) { this.violationSummaries = violationSummaries; return this; } @@ -299,16 +269,16 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat public void putToAuthorizationFailures(TKeyExtent key, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode val) { if (this.authorizationFailures == null) { - this.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(); + this.authorizationFailures = new java.util.HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(); } this.authorizationFailures.put(key, val); } - public Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> getAuthorizationFailures() { + public java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> getAuthorizationFailures() { return this.authorizationFailures; } - public UpdateErrors setAuthorizationFailures(Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures) { + public UpdateErrors setAuthorizationFailures(java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures) { this.authorizationFailures = authorizationFailures; return this; } @@ -328,13 +298,13 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case FAILED_EXTENTS: if (value == null) { unsetFailedExtents(); } else { - setFailedExtents((Map<TKeyExtent,Long>)value); + setFailedExtents((java.util.Map<TKeyExtent,java.lang.Long>)value); } break; @@ -342,7 +312,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (value == null) { unsetViolationSummaries(); } else { - setViolationSummaries((List<TConstraintViolationSummary>)value); + setViolationSummaries((java.util.List<TConstraintViolationSummary>)value); } break; @@ -350,14 +320,14 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (value == null) { unsetAuthorizationFailures(); } else { - setAuthorizationFailures((Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>)value); + setAuthorizationFailures((java.util.Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case FAILED_EXTENTS: return getFailedExtents(); @@ -369,13 +339,13 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat return getAuthorizationFailures(); } - 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) { @@ -386,11 +356,11 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat case AUTHORIZATION_FAILURES: return isSetAuthorizationFailures(); } - 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 UpdateErrors) @@ -401,6 +371,8 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat public boolean equals(UpdateErrors that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_failedExtents = true && this.isSetFailedExtents(); boolean that_present_failedExtents = true && that.isSetFailedExtents(); @@ -434,24 +406,21 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_failedExtents = true && (isSetFailedExtents()); - list.add(present_failedExtents); - if (present_failedExtents) - list.add(failedExtents); + hashCode = hashCode * 8191 + ((isSetFailedExtents()) ? 131071 : 524287); + if (isSetFailedExtents()) + hashCode = hashCode * 8191 + failedExtents.hashCode(); - boolean present_violationSummaries = true && (isSetViolationSummaries()); - list.add(present_violationSummaries); - if (present_violationSummaries) - list.add(violationSummaries); + hashCode = hashCode * 8191 + ((isSetViolationSummaries()) ? 131071 : 524287); + if (isSetViolationSummaries()) + hashCode = hashCode * 8191 + violationSummaries.hashCode(); - boolean present_authorizationFailures = true && (isSetAuthorizationFailures()); - list.add(present_authorizationFailures); - if (present_authorizationFailures) - list.add(authorizationFailures); + hashCode = hashCode * 8191 + ((isSetAuthorizationFailures()) ? 131071 : 524287); + if (isSetAuthorizationFailures()) + hashCode = hashCode * 8191 + authorizationFailures.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -462,7 +431,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetFailedExtents()).compareTo(other.isSetFailedExtents()); + lastComparison = java.lang.Boolean.valueOf(isSetFailedExtents()).compareTo(other.isSetFailedExtents()); if (lastComparison != 0) { return lastComparison; } @@ -472,7 +441,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat return lastComparison; } } - lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries()); + lastComparison = java.lang.Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries()); if (lastComparison != 0) { return lastComparison; } @@ -482,7 +451,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizationFailures()).compareTo(other.isSetAuthorizationFailures()); + lastComparison = java.lang.Boolean.valueOf(isSetAuthorizationFailures()).compareTo(other.isSetAuthorizationFailures()); if (lastComparison != 0) { return lastComparison; } @@ -500,16 +469,16 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } 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("UpdateErrors("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("UpdateErrors("); boolean first = true; sb.append("failedExtents:"); @@ -552,7 +521,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } } - 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) { @@ -560,13 +529,13 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } } - private static class UpdateErrorsStandardSchemeFactory implements SchemeFactory { + private static class UpdateErrorsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UpdateErrorsStandardScheme getScheme() { return new UpdateErrorsStandardScheme(); } } - private static class UpdateErrorsStandardScheme extends StandardScheme<UpdateErrors> { + private static class UpdateErrorsStandardScheme extends org.apache.thrift.scheme.StandardScheme<UpdateErrors> { public void read(org.apache.thrift.protocol.TProtocol iprot, UpdateErrors struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -582,7 +551,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin(); - struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map58.size); + struct.failedExtents = new java.util.HashMap<TKeyExtent,java.lang.Long>(2*_map58.size); TKeyExtent _key59; long _val60; for (int _i61 = 0; _i61 < _map58.size; ++_i61) @@ -603,7 +572,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list62 = iprot.readListBegin(); - struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list62.size); + struct.violationSummaries = new java.util.ArrayList<TConstraintViolationSummary>(_list62.size); TConstraintViolationSummary _elem63; for (int _i64 = 0; _i64 < _list62.size; ++_i64) { @@ -622,7 +591,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin(); - struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map65.size); + struct.authorizationFailures = new java.util.HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map65.size); TKeyExtent _key66; org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val67; for (int _i68 = 0; _i68 < _map65.size; ++_i68) @@ -658,7 +627,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat oprot.writeFieldBegin(FAILED_EXTENTS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, struct.failedExtents.size())); - for (Map.Entry<TKeyExtent, Long> _iter69 : struct.failedExtents.entrySet()) + for (java.util.Map.Entry<TKeyExtent, java.lang.Long> _iter69 : struct.failedExtents.entrySet()) { _iter69.getKey().write(oprot); oprot.writeI64(_iter69.getValue()); @@ -683,7 +652,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat oprot.writeFieldBegin(AUTHORIZATION_FAILURES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, struct.authorizationFailures.size())); - for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter71 : struct.authorizationFailures.entrySet()) + for (java.util.Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter71 : struct.authorizationFailures.entrySet()) { _iter71.getKey().write(oprot); oprot.writeI32(_iter71.getValue().getValue()); @@ -698,18 +667,18 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } - private static class UpdateErrorsTupleSchemeFactory implements SchemeFactory { + private static class UpdateErrorsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UpdateErrorsTupleScheme getScheme() { return new UpdateErrorsTupleScheme(); } } - private static class UpdateErrorsTupleScheme extends TupleScheme<UpdateErrors> { + private static class UpdateErrorsTupleScheme extends org.apache.thrift.scheme.TupleScheme<UpdateErrors> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, UpdateErrors 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.isSetFailedExtents()) { optionals.set(0); } @@ -723,7 +692,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (struct.isSetFailedExtents()) { { oprot.writeI32(struct.failedExtents.size()); - for (Map.Entry<TKeyExtent, Long> _iter72 : struct.failedExtents.entrySet()) + for (java.util.Map.Entry<TKeyExtent, java.lang.Long> _iter72 : struct.failedExtents.entrySet()) { _iter72.getKey().write(oprot); oprot.writeI64(_iter72.getValue()); @@ -742,7 +711,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (struct.isSetAuthorizationFailures()) { { oprot.writeI32(struct.authorizationFailures.size()); - for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter74 : struct.authorizationFailures.entrySet()) + for (java.util.Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter74 : struct.authorizationFailures.entrySet()) { _iter74.getKey().write(oprot); oprot.writeI32(_iter74.getValue().getValue()); @@ -753,12 +722,12 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat @Override public void read(org.apache.thrift.protocol.TProtocol prot, UpdateErrors struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { org.apache.thrift.protocol.TMap _map75 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map75.size); + struct.failedExtents = new java.util.HashMap<TKeyExtent,java.lang.Long>(2*_map75.size); TKeyExtent _key76; long _val77; for (int _i78 = 0; _i78 < _map75.size; ++_i78) @@ -774,7 +743,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (incoming.get(1)) { { org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list79.size); + struct.violationSummaries = new java.util.ArrayList<TConstraintViolationSummary>(_list79.size); TConstraintViolationSummary _elem80; for (int _i81 = 0; _i81 < _list79.size; ++_i81) { @@ -788,7 +757,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat if (incoming.get(2)) { { org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map82.size); + struct.authorizationFailures = new java.util.HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map82.size); TKeyExtent _key83; org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val84; for (int _i85 = 0; _i85 < _map82.size; ++_i85) @@ -804,5 +773,9 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat } } + 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() {} }
